报表获取最大交易日用于日期查询

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/CommonController.java

@@ -102,7 +102,6 @@ public class CommonController {
     @ApiOperation("机构下拉查询加载 会员、经纪人")
     @RequestMapping(method = RequestMethod.GET, value = "/queryOrganSelect")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    @ResponseBody
     public AjaxResult<OrganSelectResult> queryOrganSelect(OrganSelectParam vo, HttpServletRequest request) {
         try {
            Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
@@ -155,7 +154,6 @@ public class CommonController {
     @ApiOperation("子机构开户下拉查询推荐人 / 出入金（交易商列表查询）")
     @RequestMapping(method = RequestMethod.GET, value = "/queryInvestorSelect")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    @ResponseBody
     private AjaxResult<InvestorSelectResult> queryInvestorSelect(HttpServletRequest request, InvestorSelectParam investorSelectParam) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         investorSelectParam.setAccountStatus(4);
@@ -271,7 +269,7 @@ public class CommonController {
         return iCommonService.queryBooleanForAmount(cusbankid, extendbiztype, usabletype);
     }
 
-    @ApiOperation("通用枚举判断信息展示查询")
+    @ApiOperation("菜单通用信息查询")
     @RequestMapping(method = RequestMethod.GET, value = "/queryCommonFlag")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     private AjaxResult<CommonResult> queryCommonFlag(CommonParam commonParam) {
@@ -286,7 +284,6 @@ public class CommonController {
     }
 
     @ApiOperation("子机构管理-->获取机构及所有子机构")
-    @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/getAreaAndAllChilds")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     private AjaxResult<UserAccountVo> getAreaAndAllChilds(HttpServletRequest request) {

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/CommonServiceImpl.java

@@ -456,15 +456,20 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public AjaxResult<CommonResult> queryCommonFlag(CommonParam commonParam) {
         CommonResult commonResult = new CommonResult();
-        //获取资金管理银行签约账户类型控制枚举
-        Taaccount ta = iTaaccountMapper.selectOne(new QueryWrapper<Taaccount>().eq("accountid", commonParam.getAccountid()));
-        // 客户信息放条件外 -- 20231009 对未签约信息修改时，若修改了用户信息，证件号等还是会取未签约里的内容
-        Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", ta.getUserid()));
-        commonResult.setCardnum(ui.getCardnum());
-        commonResult.setCardtypeid(ui.getCardtypeid());
-        commonResult.setUserinfotype(ui.getUserinfotype());
-        commonResult.setCustomername(ui.getCustomername());
-        commonResult.setMobile(ui.getMobile());
+        if(commonParam.getAccountid() != null){
+            //获取资金管理银行签约账户类型控制枚举
+            Taaccount ta = iTaaccountMapper.selectOne(new QueryWrapper<Taaccount>().eq("accountid", commonParam.getAccountid()));
+            // 客户信息放条件外 -- 20231009 对未签约信息修改时，若修改了用户信息，证件号等还是会取未签约里的内容
+            Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", ta.getUserid()));
+            commonResult.setCardnum(ui.getCardnum());
+            commonResult.setCardtypeid(ui.getCardtypeid());
+            commonResult.setUserinfotype(ui.getUserinfotype());
+            commonResult.setCustomername(ui.getCustomername());
+            commonResult.setMobile(ui.getMobile());
+        }
+        //获取市场交易日期
+        Marketrun mr = iMarketrunMapper.selectOne(new QueryWrapper<Marketrun>().eq("marketid", 0L));
+        commonResult.setTradedate(mr.getTradedate());
         return AjaxResult.success(Constants.Success_Code_Design, Constants.Deal_Success_Message, commonResult);
     }
 }

mtp3-common/src/main/java/com/muchinfo/mtp3common/vo/AjaxResult.java

@@ -12,7 +12,7 @@ public class AjaxResult<T> {
     private boolean success = true;
 
     // 默认成功的状态码为0
-    private Integer code = 0;
+    private Integer code = 200;
 
     // 返回的消息,默认成功
     private String message = "操作成功!";

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/common/CommonResult.java

@@ -33,4 +33,7 @@ public class CommonResult {
 
     @ApiModelProperty(value = "出入金可出金额")
     private BigDecimal money;
+
+    @ApiModelProperty(value = "报表查询日期")
+    private String tradedate;
 }