Parcourir la source

查询流程状态

qitz il y a 2 ans
Parent
révision
3dcf07881a

+ 2
- 0
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java Voir le fichier

@@ -3,6 +3,7 @@ package com.ruoyi;
3 3
 import org.springframework.boot.SpringApplication;
4 4
 import org.springframework.boot.autoconfigure.SpringBootApplication;
5 5
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
6
+import org.springframework.scheduling.annotation.EnableScheduling;
6 7
 
7 8
 /**
8 9
  * 启动程序
@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
10 11
  * @author ruoyi
11 12
  */
12 13
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
14
+@EnableScheduling
13 15
 public class RuoYiApplication
14 16
 {
15 17
     public static void main(String[] args)

+ 22
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Voir le fichier

@@ -6,7 +6,9 @@ import com.ruoyi.common.core.controller.BaseController;
6 6
 import com.ruoyi.common.core.domain.AjaxResult;
7 7
 import com.ruoyi.common.core.page.TableDataInfo;
8 8
 import com.ruoyi.common.enums.BusinessType;
9
+import com.ruoyi.common.exception.EsignDemoException;
9 10
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
11
+import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
10 12
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
11 13
 import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
12 14
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,6 +97,26 @@ public class CaseApplicationController extends BaseController {
95 97
         return success(caseApplicationselect);
96 98
     }
97 99
 
100
+    /**
101
+     * 查询签名链接
102
+     */
103
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
104
+    @PostMapping("/selectSignUrl")
105
+    public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
106
+        SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication);
107
+        return success(sealSignRecordselect);
108
+    }
109
+
110
+    /**
111
+     * 查询用印链接
112
+     */
113
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')")
114
+    @PostMapping("/selectSealUrl")
115
+    public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
116
+        SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);
117
+        return success(sealUrlRecordselect);
118
+    }
119
+
98 120
     /**
99 121
      * 立案申请导入模板下载
100 122
      */

ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/SealSignRecord.java → ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealSignRecord.java Voir le fichier

@@ -1,4 +1,4 @@
1
-package com.ruoyi.common.utils.bean;
1
+package com.ruoyi.wisdomarbitrate.domain;
2 2
 
3 3
 import com.ruoyi.common.core.domain.BaseEntity;
4 4
 
@@ -30,6 +30,38 @@ public class SealSignRecord extends BaseEntity {
30 30
     /** 用印状态 */
31 31
     private Integer orgsignStatus;
32 32
 
33
+    /** 签名链接 */
34
+    private String signUrl;
35
+
36
+    public String getSignUrl() {
37
+        return signUrl;
38
+    }
39
+
40
+    public void setSignUrl(String signUrl) {
41
+        this.signUrl = signUrl;
42
+    }
43
+
44
+    public String getSealUrl() {
45
+        return sealUrl;
46
+    }
47
+
48
+    public void setSealUrl(String sealUrl) {
49
+        this.sealUrl = sealUrl;
50
+    }
51
+
52
+    /** 用印链接 */
53
+    private String sealUrl;
54
+
55
+    private Long caseAppliId;
56
+
57
+    public Long getCaseAppliId() {
58
+        return caseAppliId;
59
+    }
60
+
61
+    public void setCaseAppliId(Long caseAppliId) {
62
+        this.caseAppliId = caseAppliId;
63
+    }
64
+
33 65
     public Integer getPsnsignStatus() {
34 66
         return psnsignStatus;
35 67
     }

+ 10
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SealSignRecordMapper.java Voir le fichier

@@ -1,6 +1,16 @@
1 1
 package com.ruoyi.wisdomarbitrate.mapper;
2 2
 
3
+import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
4
+
5
+import java.util.List;
6
+
3 7
 public interface SealSignRecordMapper {
8
+    List<SealSignRecord> selectSealSignRecord(SealSignRecord sealSignRecord);
9
+
10
+    List<SealSignRecord> selectSealSignRecordbyStat(SealSignRecord sealSignRecord);
11
+
12
+    int updataSealSignRecord(SealSignRecord sealSignRecord);
13
+    
4 14
 
5 15
 
6 16
 }

+ 6
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java Voir le fichier

@@ -1,6 +1,8 @@
1 1
 package com.ruoyi.wisdomarbitrate.service;
2 2
 
3
+import com.ruoyi.common.exception.EsignDemoException;
3 4
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
5
+import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
4 6
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
5 7
 
6 8
 import java.util.List;
@@ -40,4 +42,8 @@ public interface ICaseApplicationService {
40 42
     CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication);
41 43
 
42 44
     String sendRoomNoMessage(SendRoomNoMessageVO messageVO);
45
+
46
+    SealSignRecord selectSignUrl(CaseApplication caseApplication) throws EsignDemoException;
47
+
48
+    SealSignRecord selectSealUrl(CaseApplication caseApplication) throws EsignDemoException;
43 49
 }

+ 107
- 56
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Voir le fichier

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
5 5
 import cn.hutool.core.util.StrUtil;
6 6
 
7 7
 import com.google.gson.Gson;
8
-import com.google.gson.JsonArray;
9 8
 import com.google.gson.JsonObject;
10 9
 import com.ruoyi.common.annotation.DataScope;
11 10
 import com.ruoyi.common.constant.CaseApplicationConstants;
@@ -13,8 +12,6 @@ import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
13 12
 import com.ruoyi.common.core.domain.entity.SysDept;
14 13
 import com.ruoyi.common.exception.EsignDemoException;
15 14
 import com.ruoyi.common.exception.ServiceException;
16
-import com.ruoyi.common.utils.SignAward;
17
-import com.ruoyi.common.utils.bean.SealSignRecord;
18 15
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
19 16
 import com.ruoyi.common.utils.DateUtils;
20 17
 import com.ruoyi.common.utils.SmsUtils;
@@ -25,6 +22,7 @@ import com.ruoyi.wisdomarbitrate.domain.*;
25 22
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
26 23
 import com.ruoyi.wisdomarbitrate.mapper.*;
27 24
 import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
25
+import com.ruoyi.wisdomarbitrate.utils.SignAward;
28 26
 import org.springframework.beans.factory.annotation.Autowired;
29 27
 import org.springframework.stereotype.Service;
30 28
 import org.springframework.transaction.annotation.Transactional;
@@ -54,6 +52,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
54 52
     private CaseAttachMapper caseAttachMapper;
55 53
     @Autowired
56 54
     private SysDeptMapper sysDeptMapper;
55
+
56
+    @Autowired
57
+    private SealSignRecordMapper sealSignRecordMapper;
57 58
     // 手机号正则
58 59
     private static final Pattern TELEPHONE_REGX =  Pattern.compile("^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
59 60
 
@@ -794,6 +795,43 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
794 795
         return "短信发送成功";
795 796
     }
796 797
 
798
+    @Override
799
+    public SealSignRecord selectSignUrl(CaseApplication caseApplication) throws EsignDemoException {
800
+        SealSignRecord sealSignRecord = new SealSignRecord();
801
+        sealSignRecord.setCaseAppliId(caseApplication.getId());
802
+        Gson gson = new Gson();
803
+        List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecord(sealSignRecord);
804
+        SealSignRecord sealSignRecordReslt = new SealSignRecord();
805
+        if(sealSignRecords!=null&&sealSignRecords.size()>0){
806
+            SealSignRecord sealSignRecordselect = sealSignRecords.get(0);
807
+            EsignHttpResponse signUrl = SignAward.signUrl(sealSignRecordselect);
808
+            JsonObject signUrlJsonObject = gson.fromJson(signUrl.getBody(), JsonObject.class);
809
+            JsonObject signUrlData = signUrlJsonObject.getAsJsonObject("data");
810
+            String url = signUrlData.get("url").getAsString();
811
+            sealSignRecordReslt.setSignUrl(url);
812
+        }
813
+
814
+        return sealSignRecordReslt;
815
+    }
816
+
817
+    @Override
818
+    public SealSignRecord selectSealUrl(CaseApplication caseApplication) throws EsignDemoException {
819
+        SealSignRecord sealSignRecord = new SealSignRecord();
820
+        sealSignRecord.setCaseAppliId(caseApplication.getId());
821
+        Gson gson = new Gson();
822
+        List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecord(sealSignRecord);
823
+        SealSignRecord sealSignRecordReslt = new SealSignRecord();
824
+        if(sealSignRecords!=null&&sealSignRecords.size()>0){
825
+            SealSignRecord sealSignRecordselect = sealSignRecords.get(0);
826
+            EsignHttpResponse signUrl = SignAward.usesealUrl(sealSignRecordselect);
827
+            JsonObject signUrlJsonObject = gson.fromJson(signUrl.getBody(), JsonObject.class);
828
+            JsonObject signUrlData = signUrlJsonObject.getAsJsonObject("data");
829
+            String url = signUrlData.get("url").getAsString();
830
+            sealSignRecordReslt.setSealUrl(url);
831
+        }
832
+        return sealSignRecordReslt;
833
+    }
834
+
797 835
     @Override
798 836
     @Transactional
799 837
     public int pendTralSure(CaseApplication caseApplication) {
@@ -991,62 +1029,75 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
991 1029
         caseApplicationNew.setFeePayable(caseApplicationinsertDiffer.getFeePayable());
992 1030
     }
993 1031
 
994
-    @Transactional
995
-    public void fixExecuteSelectFlowDetailUtils() throws EsignDemoException {
996
-
997
-        Gson gson = new Gson();
998
-
999
-
1000
-
1001
-        SealSignRecord sealSignRecord = new SealSignRecord();
1002
-        sealSignRecord.setSignFlowid("41e6732b48c54c63a91b2379c352212d");
1003
-        EsignHttpResponse signFlowDetail = SignAward.signFlowDetail(sealSignRecord);
1004
-        JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
1005
-        JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
1006
-        JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
1007
-        for (int i = 0; i < signersArray.size(); i++) {
1008
-            JsonObject signerObject = (JsonObject)signersArray.get(i);
1009
-            Integer psnsignStatus ;
1010
-            Integer orgsignStatus ;
1011
-            if(!(signerObject.get("psnSigner").toString()).equals("null")){
1012
-                JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
1013
-                if(psnSignerData!=null){
1014
-                    psnsignStatus = signerObject.get("signStatus").getAsInt();
1015
-                    sealSignRecord.setPsnsignStatus(psnsignStatus);
1016
-
1017
-                    if(psnsignStatus.intValue()==2){
1018
-                        //更新立案申请状态为待用印
1019
-                        CaseApplication caseApplication = new CaseApplication();
1020
-                        caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
1021
-                        caseApplicationMapper.submitCaseApplication(caseApplication);
1022
-
1023
-                        //修改"签署用印记录表"的状态为待用印
1024
-
1025
-                    }
1026
-                }
1027
-            }
1028
-            if(!(signerObject.get("orgSigner").toString()).equals("null")){
1029
-                JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
1030
-                if(orgSignerData!=null){
1031
-                    orgsignStatus = signerObject.get("signStatus").getAsInt();
1032
-                    sealSignRecord.setOrgsignStatus(orgsignStatus);
1033
-                    //更新立案申请状态为待送达
1034
-                    CaseApplication caseApplication = new CaseApplication();
1035
-                    caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY);
1036
-                    caseApplicationMapper.submitCaseApplication(caseApplication);
1037
-
1038
-                    //修改"签署用印记录表"的状态为签署完成
1039
-
1040
-                    //下载审核完成的裁决书,
1041
-//                    SaaSAPIFileUtils.fileDownloadUrl();
1042
-
1043
-                }
1032
+//    @Transactional
1033
+//    public void fixExecuteSelectFlowDetailUtils() throws EsignDemoException {
1034
+//
1035
+//        Gson gson = new Gson();
1036
+//
1037
+//        SealSignRecord sealSignRecordselect = new SealSignRecord();
1038
+//        sealSignRecordselect.setSignFlowStatus(1);
1039
+//
1040
+//        List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecord(sealSignRecordselect);
1041
+//        if(sealSignRecords!=null&&sealSignRecords.size()>0){
1042
+//            for (int i = 0; i < sealSignRecords.size(); i++) {
1043
+//                SealSignRecord sealSignRecord = sealSignRecords.get(i);
1044
+//                EsignHttpResponse signFlowDetail = SignAward.signFlowDetail(sealSignRecord);
1045
+//                JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
1046
+//                JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
1047
+//                JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
1048
+//                for (int j = 0; j < signersArray.size(); j++) {
1049
+//                    JsonObject signerObject = (JsonObject)signersArray.get(j);
1050
+//                    Integer psnsignStatus ;
1051
+//                    Integer orgsignStatus ;
1052
+//                    if(!(signerObject.get("psnSigner").toString()).equals("null")){
1053
+//                        JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
1054
+//                        if(psnSignerData!=null){
1055
+//                            psnsignStatus = signerObject.get("signStatus").getAsInt();
1056
+//                            sealSignRecord.setPsnsignStatus(psnsignStatus);
1057
+//
1058
+//                            if(psnsignStatus.intValue()==2){
1059
+//                                //更新立案申请状态为待用印
1060
+//                                CaseApplication caseApplication = new CaseApplication();
1061
+//                                caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
1062
+//                                caseApplicationMapper.submitCaseApplication(caseApplication);
1063
+//
1064
+//                                //修改"签署用印记录表"的状态为待用印
1065
+//                                sealSignRecord.setSignFlowStatus(2);
1066
+//                                sealSignRecordMapper.updataSealSignRecord(sealSignRecord);
1067
+//
1068
+//                            }
1069
+//                        }
1070
+//                    }
1071
+//                    if(!(signerObject.get("orgSigner").toString()).equals("null")){
1072
+//                        JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
1073
+//                        if(orgSignerData!=null){
1074
+//                            orgsignStatus = signerObject.get("signStatus").getAsInt();
1075
+//                            sealSignRecord.setOrgsignStatus(orgsignStatus);
1076
+//                            //更新立案申请状态为待送达
1077
+//                            CaseApplication caseApplication = new CaseApplication();
1078
+//                            caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY);
1079
+//                            caseApplicationMapper.submitCaseApplication(caseApplication);
1080
+//
1081
+//                            //修改"签署用印记录表"的状态为签署完成
1082
+//                            sealSignRecord.setSignFlowStatus(3);
1083
+//                            sealSignRecordMapper.updataSealSignRecord(sealSignRecord);
1084
+//
1085
+//                            //下载审核完成的裁决书,
1086
+////                    SaaSAPIFileUtils.fileDownloadUrl();
1087
+//
1088
+//                        }
1089
+//
1090
+//                    }
1091
+//
1092
+//                }
1093
+//
1094
+//            }
1095
+//
1096
+//        }
1044 1097
 
1045
-            }
1046 1098
 
1047
-        }
1048 1099
 
1049
-    }
1100
+//    }
1050 1101
 
1051 1102
 
1052 1103
 

+ 110
- 34
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java Voir le fichier

@@ -6,65 +6,141 @@ import com.google.gson.JsonObject;
6 6
 import com.ruoyi.common.constant.CaseApplicationConstants;
7 7
 import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
8 8
 import com.ruoyi.common.exception.EsignDemoException;
9
-import com.ruoyi.common.utils.SignAward;
10
-import com.ruoyi.common.utils.bean.SealSignRecord;
11 9
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
10
+import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
12 11
 import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper;
12
+import com.ruoyi.wisdomarbitrate.mapper.SealSignRecordMapper;
13 13
 import org.springframework.beans.factory.annotation.Autowired;
14
+import org.springframework.scheduling.annotation.Scheduled;
15
+import org.springframework.stereotype.Component;
14 16
 
17
+import java.util.List;
18
+
19
+@Component
15 20
 public class FixSelectFlowDetailUtils {
16 21
 
17 22
     @Autowired
18 23
     private CaseApplicationMapper caseApplicationMapper;
24
+    @Autowired
25
+    private SealSignRecordMapper sealSignRecordMapper;
19 26
 
20
-
27
+    @Scheduled(cron = "0/3 * * * * ?")
21 28
     public void fixExecuteSelectFlowDetailUtils() throws EsignDemoException {
22
-
23 29
         Gson gson = new Gson();
24 30
 
31
+        SealSignRecord sealSignRecordselect = new SealSignRecord();
32
+        sealSignRecordselect.setSignFlowStatus(1);
33
+
34
+        List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecordbyStat(sealSignRecordselect);
35
+        if(sealSignRecords!=null&&sealSignRecords.size()>0){
36
+            for (int i = 0; i < sealSignRecords.size(); i++) {
37
+                SealSignRecord sealSignRecord = sealSignRecords.get(i);
38
+                EsignHttpResponse signFlowDetail = SignAward.signFlowDetail(sealSignRecord);
39
+                JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
40
+                JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
41
+                JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
42
+
43
+                System.out.println("signFlowDetailJsonObject-----------"+signFlowDetailJsonObject.toString());
44
+
45
+                Integer psnsignStatus = null;
46
+                Integer orgsignStatus = null;
47
+                for (int j = 0; j < signersArray.size(); j++) {
48
+                    JsonObject signerObject = (JsonObject)signersArray.get(j);
49
+
50
+                    if(!(signerObject.get("psnSigner").toString()).equals("null")){
51
+                        JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
52
+                        if(psnSignerData!=null){
53
+                            psnsignStatus = signerObject.get("signStatus").getAsInt();
54
+                        }
55
+                    }
56
+                    if(!(signerObject.get("orgSigner").toString()).equals("null")){
57
+                        JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
58
+                        if(orgSignerData!=null){
59
+                            orgsignStatus = signerObject.get("signStatus").getAsInt();
60
+                        }
61
+                    }
25 62
 
63
+                }
26 64
 
27
-        SealSignRecord sealSignRecord = new SealSignRecord();
28
-        sealSignRecord.setSignFlowid("41e6732b48c54c63a91b2379c352212d");
29
-        EsignHttpResponse signFlowDetail = SignAward.signFlowDetail(sealSignRecord);
30
-        JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
31
-        JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
32
-        JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
33
-        for (int i = 0; i < signersArray.size(); i++) {
34
-            JsonObject signerObject = (JsonObject)signersArray.get(i);
35
-            Integer psnsignStatus ;
36
-            Integer orgsignStatus ;
37
-            if(!(signerObject.get("psnSigner").toString()).equals("null")){
38
-                JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
39
-                if(psnSignerData!=null){
40
-                    psnsignStatus = signerObject.get("signStatus").getAsInt();
41
-                    sealSignRecord.setPsnsignStatus(psnsignStatus);
42
-
43
-                    if(psnsignStatus.intValue()==2){
44
-                        //更新立案申请状态为待用印
45
-                        CaseApplication caseApplication = new CaseApplication();
46
-                        caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
47
-                        caseApplicationMapper.submitCaseApplication(caseApplication);
65
+                System.out.println("psnsignStatus-----------"+psnsignStatus);
66
+                System.out.println("orgsignStatus-----------"+orgsignStatus);
48 67
 
68
+                if((psnsignStatus.intValue()==2)&&(orgsignStatus.intValue()==1)){
69
+                    //更新立案申请状态为待用印
70
+                    CaseApplication caseApplication = new CaseApplication();
71
+                    caseApplication.setId(sealSignRecord.getCaseAppliId());
72
+                    caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
73
+                    caseApplicationMapper.submitCaseApplication(caseApplication);
49 74
 
75
+                    //修改"签署用印记录表"的状态为待用印
76
+                    sealSignRecord.setSignFlowStatus(2);
77
+                    sealSignRecordMapper.updataSealSignRecord(sealSignRecord);
78
+                }
79
+                if((psnsignStatus.intValue()==2)&&(orgsignStatus.intValue()==2)){
80
+                    //更新立案申请状态为待送达
81
+                    CaseApplication caseApplication = new CaseApplication();
82
+                    caseApplication.setId(sealSignRecord.getCaseAppliId());
83
+                    caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY);
84
+                    caseApplicationMapper.submitCaseApplication(caseApplication);
50 85
 
51
-                    }
86
+                    //修改"签署用印记录表"的状态为签署完成
87
+                    sealSignRecord.setSignFlowStatus(3);
88
+                    sealSignRecordMapper.updataSealSignRecord(sealSignRecord);
52 89
 
90
+                    //下载审核完成的裁决书,
91
+//                  SaaSAPIFileUtils.fileDownloadUrl();
53 92
 
54 93
 
94
+                    
55 95
                 }
56 96
             }
57
-            if(!(signerObject.get("orgSigner").toString()).equals("null")){
58
-                JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
59
-                if(orgSignerData!=null){
60
-                    orgsignStatus = signerObject.get("signStatus").getAsInt();
61
-                    sealSignRecord.setOrgsignStatus(orgsignStatus);
62
-                }
63
-
64
-            }
65 97
 
66 98
         }
67 99
 
100
+//        Gson gson = new Gson();
101
+//
102
+//        SealSignRecord sealSignRecord = new SealSignRecord();
103
+//        sealSignRecord.setSignFlowid("41e6732b48c54c63a91b2379c352212d");
104
+//        EsignHttpResponse signFlowDetail = SignAward.signFlowDetail(sealSignRecord);
105
+//        JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
106
+//        JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
107
+//        JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
108
+//        for (int i = 0; i < signersArray.size(); i++) {
109
+//            JsonObject signerObject = (JsonObject)signersArray.get(i);
110
+//            Integer psnsignStatus ;
111
+//            Integer orgsignStatus ;
112
+//            if(!(signerObject.get("psnSigner").toString()).equals("null")){
113
+//                JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
114
+//                if(psnSignerData!=null){
115
+//                    psnsignStatus = signerObject.get("signStatus").getAsInt();
116
+//                    sealSignRecord.setPsnsignStatus(psnsignStatus);
117
+//
118
+//                    if(psnsignStatus.intValue()==2){
119
+//                        //更新立案申请状态为待用印
120
+//                        CaseApplication caseApplication = new CaseApplication();
121
+//                        caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
122
+//                        caseApplicationMapper.submitCaseApplication(caseApplication);
123
+//
124
+//
125
+//
126
+//                    }
127
+//
128
+//
129
+//
130
+//                }
131
+//            }
132
+//            if(!(signerObject.get("orgSigner").toString()).equals("null")){
133
+//                JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
134
+//                if(orgSignerData!=null){
135
+//                    orgsignStatus = signerObject.get("signStatus").getAsInt();
136
+//                    sealSignRecord.setOrgsignStatus(orgsignStatus);
137
+//                }
138
+//
139
+//            }
140
+//
141
+//        }
142
+
143
+
68 144
     }
69 145
 
70 146
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/SignAward.java → ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java Voir le fichier

@@ -1,4 +1,4 @@
1
-package com.ruoyi.common.utils;
1
+package com.ruoyi.wisdomarbitrate.utils;
2 2
 
3 3
 import com.google.gson.Gson;
4 4
 import com.google.gson.JsonArray;
@@ -6,9 +6,10 @@ import com.google.gson.JsonObject;
6 6
 import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
7 7
 import com.ruoyi.common.enums.EsignRequestType;
8 8
 import com.ruoyi.common.exception.EsignDemoException;
9
-import com.ruoyi.common.utils.bean.SealSignRecord;
9
+import com.ruoyi.common.utils.EsignApplicaConfig;
10
+import com.ruoyi.common.utils.EsignHttpHelper;
11
+import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
10 12
 
11
-import java.util.HashMap;
12 13
 import java.util.Map;
13 14
 
14 15
 public class SignAward {
@@ -106,8 +107,8 @@ public class SignAward {
106 107
                 }
107 108
 
108 109
             }
109
-
110 110
         }
111
+
111 112
         System.out.println(signFlowDetailJsonObject);
112 113
 
113 114
 

+ 39
- 2
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SealSignRecordMapper.xml Voir le fichier

@@ -4,8 +4,45 @@
4 4
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5 5
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.SealSignRecordMapper">
6 6
 
7
-
8
-
7
+    <resultMap type="SealSignRecord" id="SealSignRecordResult">
8
+        <id     property="id"       column="id"      />
9
+        <result property="caseAppliId"       column="case_appli_id"      />
10
+        <result property="fileid"     column="file_id"    />
11
+        <result property="signFlowid"     column="sign_flow_id"    />
12
+        <result property="signFlowStatus"        column="sign_flow_status"        />
13
+
14
+        <result property="pensonAccount"        column="penson_account"        />
15
+        <result property="orgnizeName"        column="orgnize_name"        />
16
+        <result property="orgnizeNamePsnAccount"        column="orgn_name_psn_acc"        />
17
+
18
+    </resultMap>
19
+
20
+    <select id="selectSealSignRecord" parameterType="SealSignRecord" resultMap="SealSignRecordResult">
21
+        SELECT s.id ,s.case_appli_id ,s.file_id ,s.sign_flow_id,s.penson_account ,s.orgnize_name ,s.orgn_name_psn_acc
22
+        from seal_sign_record s
23
+        <where>
24
+            <if test="signFlowStatus != null ">
25
+                AND s.sign_flow_status  = #{signFlowStatus}
26
+            </if>
27
+            <if test="caseAppliId != null ">
28
+                AND s.case_appli_id  = #{caseAppliId}
29
+            </if>
30
+        </where>
31
+    </select>
32
+
33
+    <select id="selectSealSignRecordbyStat" parameterType="SealSignRecord" resultMap="SealSignRecordResult">
34
+        SELECT s.id ,s.case_appli_id ,s.file_id ,s.sign_flow_id
35
+        from seal_sign_record s
36
+        where s.sign_flow_status  in (1,2)
37
+    </select>
38
+
39
+    <update id="updataSealSignRecord" parameterType="SealSignRecord">
40
+        update seal_sign_record
41
+        <set>
42
+            <if test="signFlowStatus != null">sign_flow_status = #{signFlowStatus}</if>
43
+        </set>
44
+        where id = #{id}
45
+    </update>
9 46
 
10 47
 
11 48