hejinbo 2 years ago
parent
commit
cbc1a23715

+ 3
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java View File

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

+ 7
- 5
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java View File

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

+ 3
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java View File

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

+ 1
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java View File

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