Merge branch 'qtz' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -59,6 +59,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         BigDecimal feePayable  = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2,BigDecimal.ROUND_HALF_UP);
         caseApplication.setFeePayable(feePayable);
 
+        String caseNum = generateCaseNum();
+        caseApplication.setCaseNum(caseNum);
+
         int rows = caseApplicationMapper.insertCaseApplication(caseApplication);
         List<CaseAffiliate> caseAffiliates = caseApplication.getCaseAffiliates();
         if(caseAffiliates!=null&&caseAffiliates.size()>0){
@@ -80,6 +83,20 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         return rows;
     }
 
+    private String generateCaseNum() {
+        String currentday = DateUtils.dateTime();
+        String caseNum = "zc"+ currentday;
+        //查询出当天的案件编号的最大值 ,如等于1
+        Integer caseNumMax = 1;
+        if(caseNumMax!=null){
+            //根据查询到的caseNumMax拼接一个案件编号
+        }else {
+            caseNum += "001";
+        }
+        return caseNum;
+
+    }
+
     @Override
     public int selectCaseApplicationCount(CaseApplication caseApplication) {
         return caseApplicationMapper.selectCaseApplicationCount(caseApplication);

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java

@@ -123,7 +123,7 @@ public class IdentityAuthenticationServiceImpl  implements IdentityAuthenticatio
 
 //                reqest.setInfoType("1");
 //                reqest.setInfoType("13");
-                reqest.setInfoType("2");
+//                reqest.setInfoType("2");
 
                 //获得身份认证结果
                 GetEidResultResponse respIdenAuth = clientIdenAuth.GetEidResult(reqest);