测试文档问题修改

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-riskcenter(催收措施申请) <br/>
  * File: LoanBeCollectionApplyQuery.java <br/>
@@ -64,7 +66,7 @@ public class LoanBeCollectionApplyQuery implements Query {
     @ApiModelProperty("办结结束日期")
     private String modifyEndTime;
     @ApiModelProperty("催收措施")
-    private String collMeasure;
+    private List<String> collMeasure;
 
     private String userSid;
     private String orgPath;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -206,8 +206,11 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')"
                 );
-        if (StringUtils.isNotBlank(query.getCollMeasure())) {
-            qw.like("collMeasure", query.getCollMeasure());
+        List<String> collMeasure = query.getCollMeasure();
+        if (collMeasure != null && collMeasure.size() > 0) {
+            for (String s : collMeasure) {
+                qw.like("collMeasure", s);
+            }
         }
         qw.orderByDesc("createTime");
         IPage<LoanBeCollectionApply> page = PagerUtil.queryToPage(pq);
@@ -257,7 +260,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
             }
             for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) {
                 List<String> collMeasures = dto.getCollMeasures();
-                if (!collMeasures.contains("远程控制")){
+                if (!collMeasures.contains("远程控制")) {
                     loanBeCollectionVehDetail.setLockCarMoney("0");
                 }
                 loanBeCollectionVehDetail.setMainSid(sid);
@@ -371,13 +374,13 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         List<LoanBeCollectionVehDetailsVo> loanBeCollectionVehDetailsVos = loanBeCollectionVehService.selByMainSid(sid);
         for (LoanBeCollectionVehDetailsVo loanBeCollectionVehDetailsVo : loanBeCollectionVehDetailsVos) {
             String lockCarState = loanBeCollectionVehDetailsVo.getLockCarState();
-            if ("0".equals(lockCarState)){
+            if ("0".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("待控制");
-            }else if ("1".equals(lockCarState)){
+            } else if ("1".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("控制成功");
-            }else if ("2".equals(lockCarState)){
+            } else if ("2".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("控制失败");
-            }else if ("3".equals(lockCarState)){
+            } else if ("3".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("已解控");
             }
             List<LoanFile> loanFiles1 = loanFileService.selectByLinkSid(loanBeCollectionVehDetailsVo.getSid(), LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType());
@@ -462,9 +465,9 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
             String parameterValue = sysParameterFeign.fetchByParNo("FK_YCKZSFGZ").getData();
             String[] parameterValues = parameterValue.split(",");
             String cs = parameterValues[3];
-            if (i < Integer.parseInt(cs)){
+            if (i < Integer.parseInt(cs)) {
                 loanBeCollectionVehDetailsVo.setLockCarMoney(parameterValues[i]);
-            }else {
+            } else {
                 loanBeCollectionVehDetailsVo.setLockCarMoney(parameterValues[i]);
                 yckzVinNo = yckzVinNo + loanBeCollectionVehDetailsVo.getVinNo() + ',';
             }
@@ -506,8 +509,8 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
             loanBeCollectionVehDetailsVo.setSids(loanBeCollectionVehFiles);
             loanBeCollectionVehDetailsVos.add(loanBeCollectionVehDetailsVo);
         }
-        if (StringUtils.isNotBlank(yckzVinNo)){
-            loanBeCollectionApplyDetailsVo.setLockCarRemarks("注：车架号" + yckzVinNo.substring(0,yckzVinNo.lastIndexOf(",")) + "已超过制度规定的远程控制次数，应要求客户全部结清车款。");
+        if (StringUtils.isNotBlank(yckzVinNo)) {
+            loanBeCollectionApplyDetailsVo.setLockCarRemarks("注：车架号" + yckzVinNo.substring(0, yckzVinNo.lastIndexOf(",")) + "已超过制度规定的远程控制次数，应要求客户全部结清车款。");
         }
         loanBeCollectionApplyDetailsVo.setLoanBeCollectionVehDetails(loanBeCollectionVehDetailsVos);
         return loanBeCollectionApplyDetailsVo;
@@ -517,10 +520,10 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         ResultBean rb = ResultBean.fireFail();
         List<String> collMeasures = dto.getCollMeasures();
         List<LoanBeCollectionVehDto> loanBeCollectionVehDetails = dto.getLoanBeCollectionVehDetails();
-        if (collMeasures.contains("远程控制")){
+        if (collMeasures.contains("远程控制")) {
             for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) {
                 int i = loanBeCollectionVehService.selKzStateBySaleVehSid(loanBeCollectionVehDetail.getSaleVehSid());
-                if (i > 0){
+                if (i > 0) {
                     return rb.setMsg("车架号" + loanBeCollectionVehDetail.getVinNo() + "已存在审批中(待控制/控制成功)，不可再次勾选远程控制措施。");
                 }
             }