qitz 2 лет назад
Родитель
Сommit
fb36d28f56

+ 51
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java Просмотреть файл

1033
             String orgnNamePsnAcc = sealSignRecordsel.getOrgnNamePsnAcc();
1033
             String orgnNamePsnAcc = sealSignRecordsel.getOrgnNamePsnAcc();
1034
             String pensonAccountRes = sealSignRecordsel.getPensonAccountRes();
1034
             String pensonAccountRes = sealSignRecordsel.getPensonAccountRes();
1035
             String pensonAccountMedi = sealSignRecordsel.getPensonAccountMedi();
1035
             String pensonAccountMedi = sealSignRecordsel.getPensonAccountMedi();
1036
+            String pensonName = sealSignRecordsel.getPensonName();
1037
+            String orgnNamePsnName = sealSignRecordsel.getOrgnNamePsnName();
1038
+            String pensonNameRes = sealSignRecordsel.getPensonNameRes();
1039
+            String pensonNameMedi = sealSignRecordsel.getPensonNameMedi();
1040
+            Date dateOperate = new Date(operateTime);
1036
 
1041
 
1037
             Integer signStatusApply = sealSignRecordsel.getSignStatusApply();
1042
             Integer signStatusApply = sealSignRecordsel.getSignStatusApply();
1038
             Integer signStatusResponse = sealSignRecordsel.getSignStatusResponse();
1043
             Integer signStatusResponse = sealSignRecordsel.getSignStatusResponse();
1042
             Long caseAppliId = sealSignRecordsel.getCaseAppliId();
1047
             Long caseAppliId = sealSignRecordsel.getCaseAppliId();
1043
             MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(caseAppliId);
1048
             MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(caseAppliId);
1044
             Integer mediaResult = caseApplicationselect.getMediaResult();
1049
             Integer mediaResult = caseApplicationselect.getMediaResult();
1050
+            MsCaseFlow currentFlow = caseFlowMapper.selectByPrimaryKey(caseApplicationselect.getCaseFlowId());
1051
+            Integer caseNode = currentFlow.getNodeId();
1052
+            String caseStatusName = currentFlow.getCaseStatusName();
1053
+
1045
 
1054
 
1046
             if("SIGN_MISSON_COMPLETE".equals(action) && signResult==2){
1055
             if("SIGN_MISSON_COMPLETE".equals(action) && signResult==2){
1047
                 if(mediaResult.intValue()==1){
1056
                 if(mediaResult.intValue()==1){
1050
                         //申请人签名
1059
                         //申请人签名
1051
                         sealSignRecordsel.setSignStatusApply(1);
1060
                         sealSignRecordsel.setSignStatusApply(1);
1052
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1061
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1062
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
1063
+                        operLog.setCreateNickName(pensonName);
1064
+                        operLog.setCaseStatusName(caseStatusName);
1065
+                        operLog.setCaseAppliId(caseAppliId);
1066
+                        operLog.setCaseNode(caseNode);
1067
+                        operLog.setCreateTime(dateOperate);
1068
+                        caseLogRecordMapper.insert(operLog);
1053
                         if(signStatusResponse!=null&&signStatusResponse.intValue()==1&&
1069
                         if(signStatusResponse!=null&&signStatusResponse.intValue()==1&&
1054
                                 signStatusMediator!=null&&signStatusMediator.intValue()==1){
1070
                                 signStatusMediator!=null&&signStatusMediator.intValue()==1){
1055
                             // 根据流程id查找下一个流程节点
1071
                             // 根据流程id查找下一个流程节点
1068
                         //被申请人签名
1084
                         //被申请人签名
1069
                         sealSignRecordsel.setSignStatusResponse(1);
1085
                         sealSignRecordsel.setSignStatusResponse(1);
1070
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1086
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1087
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
1088
+                        operLog.setCreateNickName(pensonNameRes);
1089
+                        operLog.setCaseStatusName(caseStatusName);
1090
+                        operLog.setCaseAppliId(caseAppliId);
1091
+                        operLog.setCaseNode(caseNode);
1092
+                        operLog.setCreateTime(dateOperate);
1093
+                        caseLogRecordMapper.insert(operLog);
1071
                         if(signStatusApply!=null&&signStatusApply.intValue()==1&&
1094
                         if(signStatusApply!=null&&signStatusApply.intValue()==1&&
1072
                                 signStatusMediator!=null&&signStatusMediator.intValue()==1){
1095
                                 signStatusMediator!=null&&signStatusMediator.intValue()==1){
1073
                             // 根据流程id查找下一个流程节点
1096
                             // 根据流程id查找下一个流程节点
1086
                         //调解员签名
1109
                         //调解员签名
1087
                         sealSignRecordsel.setSignStatusMediator(1);
1110
                         sealSignRecordsel.setSignStatusMediator(1);
1088
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1111
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1112
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
1113
+                        operLog.setCreateNickName(pensonNameMedi);
1114
+                        operLog.setCaseStatusName(caseStatusName);
1115
+                        operLog.setCaseAppliId(caseAppliId);
1116
+                        operLog.setCaseNode(caseNode);
1117
+                        operLog.setCreateTime(dateOperate);
1118
+                        caseLogRecordMapper.insert(operLog);
1089
                         if(signStatusApply!=null&&signStatusApply.intValue()==1&&
1119
                         if(signStatusApply!=null&&signStatusApply.intValue()==1&&
1090
                                 signStatusResponse!=null&&signStatusResponse.intValue()==1){
1120
                                 signStatusResponse!=null&&signStatusResponse.intValue()==1){
1091
                             // 根据流程id查找下一个流程节点
1121
                             // 根据流程id查找下一个流程节点
1104
                         sealSignRecordsel.setSealStatus(1);
1134
                         sealSignRecordsel.setSealStatus(1);
1105
                         sealSignRecordsel.setSignFlowStatus(3);
1135
                         sealSignRecordsel.setSignFlowStatus(3);
1106
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1136
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1137
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
1138
+                        operLog.setCreateNickName(orgnNamePsnName);
1139
+                        operLog.setCaseStatusName(caseStatusName);
1140
+                        operLog.setCaseAppliId(caseAppliId);
1141
+                        operLog.setCaseNode(caseNode);
1142
+                        operLog.setCreateTime(dateOperate);
1143
+                        caseLogRecordMapper.insert(operLog);
1107
 
1144
 
1108
                         // 根据流程id查找下一个流程节点
1145
                         // 根据流程id查找下一个流程节点
1109
                         MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue());
1146
                         MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue());
1163
                         //申请人签名
1200
                         //申请人签名
1164
                         sealSignRecordsel.setSignStatusApply(1);
1201
                         sealSignRecordsel.setSignStatusApply(1);
1165
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1202
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1203
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
1204
+                        operLog.setCreateNickName(pensonName);
1205
+                        operLog.setCaseStatusName(caseStatusName);
1206
+                        operLog.setCaseAppliId(caseAppliId);
1207
+                        operLog.setCaseNode(caseNode);
1208
+                        operLog.setCreateTime(dateOperate);
1209
+                        caseLogRecordMapper.insert(operLog);
1166
                         if(signStatusResponse!=null&&signStatusResponse.intValue()==1){
1210
                         if(signStatusResponse!=null&&signStatusResponse.intValue()==1){
1167
                             MsCaseFlow nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue());
1211
                             MsCaseFlow nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue());
1168
                             MsCaseApplication application = new MsCaseApplication();
1212
                             MsCaseApplication application = new MsCaseApplication();
1222
                         //被申请人签名
1266
                         //被申请人签名
1223
                         sealSignRecordsel.setSignStatusResponse(1);
1267
                         sealSignRecordsel.setSignStatusResponse(1);
1224
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1268
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
1269
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
1270
+                        operLog.setCreateNickName(pensonNameRes);
1271
+                        operLog.setCaseStatusName(caseStatusName);
1272
+                        operLog.setCaseAppliId(caseAppliId);
1273
+                        operLog.setCaseNode(caseNode);
1274
+                        operLog.setCreateTime(dateOperate);
1275
+                        caseLogRecordMapper.insert(operLog);
1225
                         if(signStatusApply!=null&&signStatusApply.intValue()==1){
1276
                         if(signStatusApply!=null&&signStatusApply.intValue()==1){
1226
                             MsCaseFlow nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue());
1277
                             MsCaseFlow nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue());
1227
                             MsCaseApplication application = new MsCaseApplication();
1278
                             MsCaseApplication application = new MsCaseApplication();

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java Просмотреть файл

355
                 "       \"signConfig\": {\n" +
355
                 "       \"signConfig\": {\n" +
356
                 "           \"availableSignClientTypes\":  \"1\"\n" +
356
                 "           \"availableSignClientTypes\":  \"1\"\n" +
357
                 "       },\n" +
357
                 "       },\n" +
358
-                "        \"notifyUrl\": \"" + signSealCallbackUrl + "\",\n" +
358
+//                "        \"notifyUrl\": \"" + signSealCallbackUrl + "\",\n" +
359
                 "        \"autoFinish\": true\n" +
359
                 "        \"autoFinish\": true\n" +
360
                 "    },\n" +
360
                 "    },\n" +
361
 
361