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

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

@@ -112,8 +112,10 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                         String responSex = affiliate.getResponSex();
                         if (responSex.equals("0")) {
                             datas.put("resSex", "男");
-                        } else {
+                        } else if (responSex.equals("1")){
                             datas.put("resSex", "女");
+                        }else {
+                            datas.put("resSex", "未知");
                         }
                         Date responBirth = affiliate.getResponBirth();
                         if (responBirth != null) {

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

@@ -2001,7 +2001,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                                                         sealSignRecord.setSignFlowStatus(1);//待签名
                                                         sealSignRecordMapper.insertSealSignRecord(sealSignRecord);
                                                     } else {
-                                                        throw new ServiceException("发起签署流程失败,请检查参数是否有误");
+                                                        throw new ServiceException(jsonObject3.getString("message"));
                                                     }
                                                 } else {
                                                     return AjaxResult.error();
@@ -2844,15 +2844,15 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             return AjaxResult.error("请选择要上传的文件");
         }
         UUID uuid = UUID.randomUUID();
-        String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile/"+uuid+ "/";
-        //String targetPath = "D:/home/unzip/" + uuid + "/";
+        //String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile/"+uuid+ "/";
+        String targetPath = "D:/home/unzip/" + uuid + "/";
         File zipFile = null;
         InputStream ins = null;
         try {
             ins = file.getInputStream();
             //上传的压缩包保存的路径
-            String savePath = "/home/ruoyi/uploadPath/upload/zipFile/";
-            //String savePath = "D:/home/zipFile/";
+            //String savePath = "/home/ruoyi/uploadPath/upload/zipFile/";
+            String savePath = "D:/home/zipFile/";
             String saveName = uuid + "_" + file.getOriginalFilename();
             zipFile = new File(savePath + saveName);
             inputChangeToFile(ins, zipFile);
@@ -2931,6 +2931,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                         caseAffiliate1.setIdentityNum(map.get("居民身份证号码").get(0));
                         caseAffiliate1.setContactTelphone(map.get("联系电话").get(1));
                         caseAffiliate1.setResidenAffili(map.get("住所").get(1));
+                        //设置默认的性别   2代表未知
+                        caseAffiliate1.setResponSex("2");
                         caseAffiliates.add(caseAffiliate1);
                         caseApplication.setCaseAffiliates(caseAffiliates);
                         this.insertcaseApplication(caseApplication);

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

@@ -242,8 +242,10 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
                         String responSex = affiliate.getResponSex();
                         if (responSex.equals("0")) {
                             datas.put("resSex", "男");
-                        } else {
+                        } else if (responSex.equals("1")){
                             datas.put("resSex", "女");
+                        }else {
+                            datas.put("resSex", "未知");
                         }
                         Date responBirth = affiliate.getResponBirth();
                         if (responBirth != null) {

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java

@@ -30,7 +30,6 @@ public class SignAward {
     public static void main(String[] args) throws EsignDemoException {
         Gson gson = new Gson();
 
-        SealSignRecord sealSignRecord = new SealSignRecord();
 
 
         /* 发起签署*/
@@ -121,7 +120,7 @@ public class SignAward {
 
 //        System.out.println(signFlowDetailJsonObject);
         DeptIdentify deptIdentify = new DeptIdentify();
-        deptIdentify.setAuthFlowId("OF-2b4e8f043408003c");
+        deptIdentify.setAuthFlowId("OF-2b5883bf4508000c");
         EsignHttpResponse deptIdentifyInfo = getDeptIdentifyInfo(deptIdentify);
         System.out.println(deptIdentifyInfo);