Browse Source

优化生成裁决书功能

qitz 2 years ago
parent
commit
5b46ee97b1

+ 18
- 8
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java View File

3
 import com.ruoyi.common.annotation.Excel;
3
 import com.ruoyi.common.annotation.Excel;
4
 import com.ruoyi.common.core.domain.BaseEntity;
4
 import com.ruoyi.common.core.domain.BaseEntity;
5
 
5
 
6
+import java.util.Date;
7
+
6
 public class CaseAffiliate   extends BaseEntity {
8
 public class CaseAffiliate   extends BaseEntity {
7
     private static final long serialVersionUID = 1L;
9
     private static final long serialVersionUID = 1L;
8
     /** ID */
10
     /** ID */
39
     /**
41
     /**
40
      * 被申请人出生年月日
42
      * 被申请人出生年月日
41
      */
43
      */
42
-    private String responBirth;
44
+    private Date responBirth;
45
+
46
+    public Date getResponBirth() {
47
+        return responBirth;
48
+    }
49
+
50
+    public void setResponBirth(Date responBirth) {
51
+        this.responBirth = responBirth;
52
+    }
43
 
53
 
44
     public String getCompLegalPerson() {
54
     public String getCompLegalPerson() {
45
         return compLegalPerson;
55
         return compLegalPerson;
65
         this.responSex = responSex;
75
         this.responSex = responSex;
66
     }
76
     }
67
 
77
 
68
-    public String getResponBirth() {
69
-        return responBirth;
70
-    }
71
-
72
-    public void setResponBirth(String responBirth) {
73
-        this.responBirth = responBirth;
74
-    }
78
+//    public String getResponBirth() {
79
+//        return responBirth;
80
+//    }
81
+//
82
+//    public void setResponBirth(String responBirth) {
83
+//        this.responBirth = responBirth;
84
+//    }
75
 
85
 
76
     /** 身份证号 */
86
     /** 身份证号 */
77
     @Excel(name = "身份证号")
87
     @Excel(name = "身份证号")

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

5
 import com.ruoyi.common.constant.CaseApplicationConstants;
5
 import com.ruoyi.common.constant.CaseApplicationConstants;
6
 import com.ruoyi.common.core.domain.AjaxResult;
6
 import com.ruoyi.common.core.domain.AjaxResult;
7
 import com.ruoyi.common.core.redis.RedisCache;
7
 import com.ruoyi.common.core.redis.RedisCache;
8
+import com.ruoyi.common.utils.DateUtils;
8
 import com.ruoyi.wisdomarbitrate.mapper.*;
9
 import com.ruoyi.wisdomarbitrate.mapper.*;
9
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
10
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
10
 import com.ruoyi.common.utils.EmailOutUtil;
11
 import com.ruoyi.common.utils.EmailOutUtil;
93
                         datas.put("resName", affiliate.getName());
94
                         datas.put("resName", affiliate.getName());
94
                         datas.put("resAddress", affiliate.getContactAddress());
95
                         datas.put("resAddress", affiliate.getContactAddress());
95
                         datas.put("resSex", affiliate.getResponSex());
96
                         datas.put("resSex", affiliate.getResponSex());
96
-                        datas.put("resDateOfBirth", affiliate.getResponBirth());
97
+//                        datas.put("resDateOfBirth", responBirthdatestr);
98
+                        datas.put("resDateOfBirth", "1987-03-05");
97
                         datas.put("resContactAddress", null);
99
                         datas.put("resContactAddress", null);
98
                     }
100
                     }
99
                 }
101
                 }

+ 35
- 28
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java View File

6
 import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
6
 import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
7
 import com.ruoyi.common.enums.EsignRequestType;
7
 import com.ruoyi.common.enums.EsignRequestType;
8
 import com.ruoyi.common.exception.EsignDemoException;
8
 import com.ruoyi.common.exception.EsignDemoException;
9
+import com.ruoyi.common.utils.DateUtils;
9
 import com.ruoyi.common.utils.EsignApplicaConfig;
10
 import com.ruoyi.common.utils.EsignApplicaConfig;
10
 import com.ruoyi.common.utils.EsignHttpHelper;
11
 import com.ruoyi.common.utils.EsignHttpHelper;
11
 import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
12
 import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
12
 
13
 
14
+import java.util.Date;
13
 import java.util.Map;
15
 import java.util.Map;
14
 
16
 
15
 public class SignAward {
17
 public class SignAward {
62
 //        System.out.println("签署短链接:"+sealUrl);
64
 //        System.out.println("签署短链接:"+sealUrl);
63
 
65
 
64
         //查询签署流程详情
66
         //查询签署流程详情
65
-        EsignHttpResponse signFlowDetail = signFlowDetail(sealSignRecord);
66
-        JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
67
-        JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
68
-        JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
69
-        for (int i = 0; i < signersArray.size(); i++) {
70
-            JsonObject signerObject = (JsonObject)signersArray.get(i);
71
-            Integer psnsignStatus ;
72
-            Integer orgsignStatus ;
73
-            if(!(signerObject.get("psnSigner").toString()).equals("null")){
74
-                JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
75
-                if(psnSignerData!=null){
76
-                    psnsignStatus = signerObject.get("signStatus").getAsInt();
77
-                    sealSignRecord.setPsnsignStatus(psnsignStatus);
78
-                }
79
-            }
80
-            if(!(signerObject.get("orgSigner").toString()).equals("null")){
81
-                JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
82
-                if(orgSignerData!=null){
83
-                    orgsignStatus = signerObject.get("signStatus").getAsInt();
84
-                    sealSignRecord.setOrgsignStatus(orgsignStatus);
85
-                }
86
-
87
-            }
88
-        }
89
-
90
-        System.out.println(signFlowDetailJsonObject);
91
-
92
-
67
+//        EsignHttpResponse signFlowDetail = signFlowDetail(sealSignRecord);
68
+//        JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
69
+//        JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
70
+//        JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
71
+//        for (int i = 0; i < signersArray.size(); i++) {
72
+//            JsonObject signerObject = (JsonObject)signersArray.get(i);
73
+//            Integer psnsignStatus ;
74
+//            Integer orgsignStatus ;
75
+//            if(!(signerObject.get("psnSigner").toString()).equals("null")){
76
+//                JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
77
+//                if(psnSignerData!=null){
78
+//                    psnsignStatus = signerObject.get("signStatus").getAsInt();
79
+//                    sealSignRecord.setPsnsignStatus(psnsignStatus);
80
+//                }
81
+//            }
82
+//            if(!(signerObject.get("orgSigner").toString()).equals("null")){
83
+//                JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
84
+//                if(orgSignerData!=null){
85
+//                    orgsignStatus = signerObject.get("signStatus").getAsInt();
86
+//                    sealSignRecord.setOrgsignStatus(orgsignStatus);
87
+//                }
88
+//
89
+//            }
90
+//        }
91
+
92
+//        System.out.println(signFlowDetailJsonObject);
93
+
94
+//        String responBirth = "Wed Feb 03 00:00:00 CST 1988";
95
+        String responBirth = "2023-10-10 05:49:36";
96
+        Date responBirthdate= DateUtils.parseDate(responBirth);
97
+//        String responBirthdatestr= DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,responBirthdate);
98
+        String responBirthdatestr= DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,responBirthdate);
99
+        System.out.println(responBirthdatestr);
93
     }
100
     }
94
 
101
 
95
 
102