18792927508 пре 2 година
родитељ
комит
7c3044811e

+ 6
- 5
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java Прегледај датотеку

2419
     @Transactional(rollbackFor = Exception.class)
2419
     @Transactional(rollbackFor = Exception.class)
2420
     @Override
2420
     @Override
2421
     public AjaxResult mediation(MsCaseApplicationReq req) throws EsignDemoException, InterruptedException {
2421
     public AjaxResult mediation(MsCaseApplicationReq req) throws EsignDemoException, InterruptedException {
2422
+        req.setSealFlag(null);
2422
         // 查询案件是否存在
2423
         // 查询案件是否存在
2423
         MsCaseApplication application = msCaseApplicationMapper.selectByPrimaryKey(req.getId());
2424
         MsCaseApplication application = msCaseApplicationMapper.selectByPrimaryKey(req.getId());
2424
         if (application == null) {
2425
         if (application == null) {
2709
                                     if (caseFlow != null) {
2710
                                     if (caseFlow != null) {
2710
                                         application.setCaseFlowId(caseFlow.getId());
2711
                                         application.setCaseFlowId(caseFlow.getId());
2711
                                         application.setCaseStatusName(caseFlow.getCaseStatusName());
2712
                                         application.setCaseStatusName(caseFlow.getCaseStatusName());
2712
-                                        msCaseApplicationMapper.updateByPrimaryKey(application);
2713
+                                        msCaseApplicationMapper.updateByPrimaryKeySelective(application);
2713
                                         // 新增日志
2714
                                         // 新增日志
2714
                                         CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "");
2715
                                         CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "");
2715
                                     }
2716
                                     }
2748
                     application.setCaseFlowId(caseFlow.getId());
2749
                     application.setCaseFlowId(caseFlow.getId());
2749
                     application.setCaseStatusName(caseFlow.getCaseStatusName());
2750
                     application.setCaseStatusName(caseFlow.getCaseStatusName());
2750
                     application.setMediaResult(mediaResult);
2751
                     application.setMediaResult(mediaResult);
2751
-                    msCaseApplicationMapper.updateByPrimaryKey(application);
2752
+                    msCaseApplicationMapper.updateByPrimaryKeySelective(application);
2752
                 }
2753
                 }
2753
                 return AjaxResult.success();
2754
                 return AjaxResult.success();
2754
             } else if (mediaResult == 3) {
2755
             } else if (mediaResult == 3) {
2760
                     application.setCaseFlowId(caseFlow.getId());
2761
                     application.setCaseFlowId(caseFlow.getId());
2761
                     application.setCaseStatusName(caseFlow.getCaseStatusName());
2762
                     application.setCaseStatusName(caseFlow.getCaseStatusName());
2762
                     application.setMediaResult(mediaResult);
2763
                     application.setMediaResult(mediaResult);
2763
-                    msCaseApplicationMapper.updateByPrimaryKey(application);
2764
+                    msCaseApplicationMapper.updateByPrimaryKeySelective(application);
2764
                     // 新增日志
2765
                     // 新增日志
2765
                     CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "");
2766
                     CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "");
2766
                     // 新增结束日志
2767
                     // 新增结束日志
2802
                     application.setCaseFlowId(caseFlow.getId());
2803
                     application.setCaseFlowId(caseFlow.getId());
2803
                     application.setCaseStatusName(caseFlow.getCaseStatusName());
2804
                     application.setCaseStatusName(caseFlow.getCaseStatusName());
2804
                     application.setMediaResult(mediaResult);
2805
                     application.setMediaResult(mediaResult);
2805
-                    msCaseApplicationMapper.updateByPrimaryKey(application);
2806
+                    msCaseApplicationMapper.updateByPrimaryKeySelective(application);
2806
                 }
2807
                 }
2807
 
2808
 
2808
                 return AjaxResult.success();
2809
                 return AjaxResult.success();
3051
                 application.setCaseFlowId(caseFlow.getId());
3052
                 application.setCaseFlowId(caseFlow.getId());
3052
                 application.setCaseStatusName(caseFlow.getCaseStatusName());
3053
                 application.setCaseStatusName(caseFlow.getCaseStatusName());
3053
                 application.setMediaResult(mediaResult);
3054
                 application.setMediaResult(mediaResult);
3054
-                msCaseApplicationMapper.updateByPrimaryKey(application);
3055
+                msCaseApplicationMapper.updateByPrimaryKeySelective(application);
3055
                 // 新增日志
3056
                 // 新增日志
3056
                 CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "");
3057
                 CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "");
3057
                 if (mediaResult == 2 || mediaResult == 3 || mediaResult == 4) {
3058
                 if (mediaResult == 2 || mediaResult == 3 || mediaResult == 4) {

+ 2
- 4
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java Прегледај датотеку

522
             return AjaxResult.error("未找到案件被申请操作人");
522
             return AjaxResult.error("未找到案件被申请操作人");
523
         }
523
         }
524
         MsCaseApplication caseApplication = msCaseApplicationMapper.selectByPrimaryKey(caseId);
524
         MsCaseApplication caseApplication = msCaseApplicationMapper.selectByPrimaryKey(caseId);
525
-        Integer organizeFlag = caseApplication.getOrganizeFlag();
525
+
526
         Long userId = SecurityUtils.getUserId();
526
         Long userId = SecurityUtils.getUserId();
527
 
527
 
528
         if(appOpt.get().getUserId()!=null && appOpt.get().getUserId().equals(userId)){
528
         if(appOpt.get().getUserId()!=null && appOpt.get().getUserId().equals(userId)){
533
             List<MsSealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecord(mssealSignRecord);
533
             List<MsSealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecord(mssealSignRecord);
534
             if (sealSignRecords != null && sealSignRecords.size() > 0) {
534
             if (sealSignRecords != null && sealSignRecords.size() > 0) {
535
                 String signFlowid = sealSignRecords.get(0).getSignFlowId();
535
                 String signFlowid = sealSignRecords.get(0).getSignFlowId();
536
-                if(organizeFlag!=null){
537
                     SealSignRecord sealSignRecord = new SealSignRecord();
536
                     SealSignRecord sealSignRecord = new SealSignRecord();
538
                     sealSignRecord.setPensonAccount(appOpt.get().getPhone());
537
                     sealSignRecord.setPensonAccount(appOpt.get().getPhone());
539
                     sealSignRecord.setPensonName(appOpt.get().getName());
538
                     sealSignRecord.setPensonName(appOpt.get().getName());
549
                         String urlapply = signUrlData.get("shortUrl").getAsString();
548
                         String urlapply = signUrlData.get("shortUrl").getAsString();
550
                         sealSignRecordres.setSealUrl(urlapply);
549
                         sealSignRecordres.setSealUrl(urlapply);
551
                     }
550
                     }
552
-                }
553
                 return AjaxResult.success(sealSignRecordres);
551
                 return AjaxResult.success(sealSignRecordres);
554
             }else {
552
             }else {
555
                 return AjaxResult.error();
553
                 return AjaxResult.error();
674
                                 signStatusMediator!=null&&signStatusMediator.equals(1)){
672
                                 signStatusMediator!=null&&signStatusMediator.equals(1)){
675
                             // 根据流程id查找下一个流程节点
673
                             // 根据流程id查找下一个流程节点
676
                             MsCaseFlow nextFlow=null;
674
                             MsCaseFlow nextFlow=null;
677
-                            if(caseApplicationselect.getSealFlag()!=null&&caseApplicationselect.getSealFlag()==1) {
675
+                            if(caseApplicationselect.getSealFlag()!=null&&caseApplicationselect.getSealFlag().equals(1)) {
678
                                 // 需要用印
676
                                 // 需要用印
679
                                  nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId());
677
                                  nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId());
680
                             }else {
678
                             }else {

+ 9
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java Прегледај датотеку

121
             List<String> recordParamList = recordParamContentMap.get(record.getId());
121
             List<String> recordParamList = recordParamContentMap.get(record.getId());
122
             if(recordParamContentMap.containsKey(record.getId()) && templateParamMap.containsKey(record.getMsSmsTemplateId())){
122
             if(recordParamContentMap.containsKey(record.getId()) && templateParamMap.containsKey(record.getMsSmsTemplateId())){
123
                 List<MsSmsTemplateParam> templateParamList = templateParamMap.get(record.getMsSmsTemplateId());
123
                 List<MsSmsTemplateParam> templateParamList = templateParamMap.get(record.getMsSmsTemplateId());
124
+                ArrayList<MsSmsTemplateParam> copyParamList = new ArrayList<>();
124
                 for (int i = 0; i < templateParamList.size(); i++) {
125
                 for (int i = 0; i < templateParamList.size(); i++) {
125
                     MsSmsTemplateParam templateParam = templateParamList.get(i);
126
                     MsSmsTemplateParam templateParam = templateParamList.get(i);
126
-                    templateParam.setParamValue(recordParamContentMap.get(record.getId()).get(i));
127
+                    MsSmsTemplateParam msSmsTemplateParam =new MsSmsTemplateParam();
128
+                    msSmsTemplateParam.setParam(templateParam.getParam());
129
+                    msSmsTemplateParam.setSmsTemplateId(templateParam.getSmsTemplateId());
130
+                    msSmsTemplateParam.setParamName(templateParam.getParamName());
131
+                    msSmsTemplateParam.setId(templateParam.getId());
132
+                    msSmsTemplateParam.setParamValue(recordParamContentMap.get(record.getId()).get(i));
133
+                    copyParamList.add(msSmsTemplateParam);
127
                 }
134
                 }
128
-                record.setTemplateParams(templateParamList);
135
+                record.setTemplateParams(copyParamList);
129
 
136
 
130
             }
137
             }
131
             // 按顺序替换占位符
138
             // 按顺序替换占位符