Explorar el Código

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

hejinbo hace 2 años
padre
commit
8e82f8eaa2

+ 48
- 11
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Ver fichero

147
                 }
147
                 }
148
                 if (role.getRoleName().equals("法律顾问")) {
148
                 if (role.getRoleName().equals("法律顾问")) {
149
                     // 查询角色有关的用户部门
149
                     // 查询角色有关的用户部门
150
-                    List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
150
+              //      List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
151
+                    List<Long> deptIds =new ArrayList<>();
152
+                    deptIds.add(sysUser.getDeptId());
151
                     caseApplication.setDeptIds(deptIds);
153
                     caseApplication.setDeptIds(deptIds);
152
                 }
154
                 }
153
                 if (StrUtil.isEmpty(caseApplication.getNameId()) && role.getRoleName().equals("申请人")) {
155
                 if (StrUtil.isEmpty(caseApplication.getNameId()) && role.getRoleName().equals("申请人")) {
205
             }
207
             }
206
             if(role.getRoleName().equals("法律顾问")){
208
             if(role.getRoleName().equals("法律顾问")){
207
                 // 查询角色有关的用户部门
209
                 // 查询角色有关的用户部门
208
-                List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
210
+               // List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
211
+                List<Long> deptIds =new ArrayList<>();
212
+                deptIds.add(sysUser.getDeptId());
209
                 caseApplication.setDeptIds(deptIds);
213
                 caseApplication.setDeptIds(deptIds);
210
             }
214
             }
211
             if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){
215
             if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){
234
         List<CaseLogRecord> records = caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord);
238
         List<CaseLogRecord> records = caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord);
235
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
239
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
236
         Integer caseStatus = caseApplicationselect.getCaseStatus();
240
         Integer caseStatus = caseApplicationselect.getCaseStatus();
237
-        CaseLogRecord caseLogRecordin = getInCasenode(caseStatus);
238
-        records.add(caseLogRecordin);
241
+        if(caseStatus.intValue()!=0){
242
+            CaseLogRecord caseLogRecordin = getInCasenode(caseStatus);
243
+            records.add(caseLogRecordin);
244
+        }
245
+
239
         List<CaseLogRecord> recordsnofinish = getNofinishCasenode(caseStatus);
246
         List<CaseLogRecord> recordsnofinish = getNofinishCasenode(caseStatus);
240
         records.addAll(recordsnofinish);
247
         records.addAll(recordsnofinish);
241
         datas.put("allCasenode",records);
248
         datas.put("allCasenode",records);
247
     @Override
254
     @Override
248
     @Transactional
255
     @Transactional
249
     public int updateHeardate(CaseApplication caseApplication) {
256
     public int updateHeardate(CaseApplication caseApplication) {
250
-        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
257
+//        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
258
+        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
251
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
259
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
252
 
260
 
253
         // 新增日志
261
         // 新增日志
254
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_OPENCOURT_HEAR,"");
262
+        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,"");
255
         return rows;
263
         return rows;
256
     }
264
     }
257
 
265
 
538
 
546
 
539
         List<CaseLogRecord> caseLogRecords = new ArrayList<>();
547
         List<CaseLogRecord> caseLogRecords = new ArrayList<>();
540
         switch (caseStatus.toString()) {
548
         switch (caseStatus.toString()) {
549
+            case "0":
550
+                caseLogRecords.add(caseLogRecord1);
551
+                caseLogRecords.add(caseLogRecord2);
552
+                caseLogRecords.add(caseLogRecord3);
553
+                caseLogRecords.add(caseLogRecord4);
554
+                caseLogRecords.add(caseLogRecord5);
555
+                caseLogRecords.add(caseLogRecord6);
556
+                caseLogRecords.add(caseLogRecord7);
557
+                caseLogRecords.add(caseLogRecord8);
558
+                caseLogRecords.add(caseLogRecord9);
559
+                caseLogRecords.add(caseLogRecord11);
560
+                caseLogRecords.add(caseLogRecord12);
561
+                caseLogRecords.add(caseLogRecord13);
562
+                caseLogRecords.add(caseLogRecord14);
563
+                caseLogRecords.add(caseLogRecord15);
564
+                caseLogRecords.add(caseLogRecord16);
565
+                break;
541
             case "1":
566
             case "1":
542
                 caseLogRecords.add(caseLogRecord2);
567
                 caseLogRecords.add(caseLogRecord2);
543
                 caseLogRecords.add(caseLogRecord3);
568
                 caseLogRecords.add(caseLogRecord3);
1176
                         caseApplicationListinsert.add(caseApplication);
1201
                         caseApplicationListinsert.add(caseApplication);
1177
                     }else {
1202
                     }else {
1178
                         // 拼接错误信息
1203
                         // 拼接错误信息
1179
-                        failureMsg.append("<br/>").append("第").append(i+2).append("行:").append(caseApplication.getErrorMsg().toString());
1204
+                         failureMsg.append("<br/>").append("第").append(i+2).append("行:").append(caseApplication.getErrorMsg().toString());
1180
 
1205
 
1181
                     }
1206
                     }
1182
                 }else {
1207
                 }else {
1222
                         caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
1247
                         caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
1223
                         caseApplicationItera.setCreateBy(getUsername());
1248
                         caseApplicationItera.setCreateBy(getUsername());
1224
                         int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera);
1249
                         int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera);
1250
+                        // 新增日志
1251
+                        CaseLogUtils.insertCaseLog(caseApplicationItera.getId(),CaseApplicationConstants.CASE_APPLICATION,"");
1252
+
1225
                         List<CaseAffiliate> caseAffiliates = caseApplicationItera.getCaseAffiliates();
1253
                         List<CaseAffiliate> caseAffiliates = caseApplicationItera.getCaseAffiliates();
1226
                         if(caseAffiliates!=null&&caseAffiliates.size()>0){
1254
                         if(caseAffiliates!=null&&caseAffiliates.size()>0){
1227
                             for (CaseAffiliate caseAffiliate : caseAffiliates){
1255
                             for (CaseAffiliate caseAffiliate : caseAffiliates){
1241
 
1269
 
1242
             }
1270
             }
1243
 
1271
 
1272
+
1273
+
1244
         }else {
1274
         }else {
1245
             throw new ServiceException("导入立案申请数据不能为空!");
1275
             throw new ServiceException("导入立案申请数据不能为空!");
1246
         }
1276
         }
1437
         if( caseApplication.getLoanEndDate()== null){
1467
         if( caseApplication.getLoanEndDate()== null){
1438
             failureMsg.append("【借款结束日期】字段不合法;");
1468
             failureMsg.append("【借款结束日期】字段不合法;");
1439
         }
1469
         }
1470
+        if( caseApplication.getLoanStartDate()!= null && caseApplication.getLoanEndDate()!= null && caseApplication.getLoanStartDate().after(caseApplication.getLoanEndDate()) ){
1471
+            failureMsg.append("【借款结束日期】不能早于【借款开始日期】;");
1472
+        }
1440
         if( StrUtil.isEmpty(caseApplication.getContractNumber())){
1473
         if( StrUtil.isEmpty(caseApplication.getContractNumber())){
1441
             failureMsg.append("【合同编号】字段不能为空;");
1474
             failureMsg.append("【合同编号】字段不能为空;");
1442
         }else if(caseApplication.getContractNumber().length()>50){
1475
         }else if(caseApplication.getContractNumber().length()>50){
1476
             }
1509
             }
1477
         }
1510
         }
1478
         if( StrUtil.isEmpty(caseApplication.getArbitratClaims())){
1511
         if( StrUtil.isEmpty(caseApplication.getArbitratClaims())){
1479
-            failureMsg.append("【申请人仲裁诉求】字段不能为空;");
1512
+            failureMsg.append("【申请人仲裁请求及事实和理由】字段不能为空;");
1480
         }else if(caseApplication.getArbitratClaims().length()>10000){
1513
         }else if(caseApplication.getArbitratClaims().length()>10000){
1481
-            failureMsg.append("【申请人仲裁诉求】字段超出指定长度,最大长度为10000;");
1514
+            failureMsg.append("【申请人仲裁请求及事实和理由】字段超出指定长度,最大长度为10000;");
1515
+        }
1516
+        if(StrUtil.isNotEmpty(caseApplication.getArbitratClaims())&&caseApplication.getArbitratClaims().length()>10000){
1517
+            failureMsg.append("【申请人请求仲裁庭裁决】字段超出指定长度,最大长度为10000;");
1482
         }
1518
         }
1483
     }
1519
     }
1484
 
1520
 
2045
     @Override
2081
     @Override
2046
     @Transactional
2082
     @Transactional
2047
     public int pendTralSure(CaseApplication caseApplication) {
2083
     public int pendTralSure(CaseApplication caseApplication) {
2048
-        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
2084
+//        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
2085
+        caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
2049
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
2086
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
2050
 
2087
 
2051
         //发送短信通知
2088
         //发送短信通知
2125
             }
2162
             }
2126
         }
2163
         }
2127
         // 新增日志
2164
         // 新增日志
2128
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,"");
2165
+        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.MODIFY_HEARDATE,"");
2129
 
2166
 
2130
         return rows;
2167
         return rows;
2131
 
2168
 

+ 6
- 6
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java Ver fichero

68
             if (arbitratMethod == 2) {
68
             if (arbitratMethod == 2) {
69
                 caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
69
                 caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
70
                 //修改案件状态为待开庭审理
70
                 //修改案件状态为待开庭审理
71
-//                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
71
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
72
                 //修改案件状态为待修改开庭时间
72
                 //修改案件状态为待修改开庭时间
73
-                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
73
+//                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
74
                 // 新增日志
74
                 // 新增日志
75
-                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
75
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, "");
76
 
76
 
77
             } else {
77
             } else {
78
                 caseApplication1.setArbitratMethod(2);
78
                 caseApplication1.setArbitratMethod(2);
91
 
91
 
92
             } else {
92
             } else {
93
                 //修改案件状态为待开庭审理
93
                 //修改案件状态为待开庭审理
94
-//                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
94
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
95
                 //修改案件状态为待修改开庭时间
95
                 //修改案件状态为待修改开庭时间
96
-                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
96
+//                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
97
                 // 新增日志
97
                 // 新增日志
98
-                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
98
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, "");
99
 
99
 
100
             }
100
             }
101
         }
101
         }

+ 7
- 7
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java Ver fichero

246
                         .build();
246
                         .build();
247
                 int count = caseAttachMapper.save(caseAttach);
247
                 int count = caseAttachMapper.save(caseAttach);
248
                 if (count > 0 && annexType != null && annexType != 8) {
248
                 if (count > 0 && annexType != null && annexType != 8) {
249
-                    if (id != null) {
250
-                        //修改案件状态
251
-                        CaseApplication caseApplication = new CaseApplication();
252
-                        caseApplication.setId(id);
253
-                        caseApplication.setCaseStatus(4);
254
-                        caseApplicationMapper.submitCaseApplication(caseApplication);
255
-                    }
249
+//                    if (id != null) {
250
+//                        //修改案件状态
251
+//                        CaseApplication caseApplication = new CaseApplication();
252
+//                        caseApplication.setId(id);
253
+//                        caseApplication.setCaseStatus(4);
254
+//                        caseApplicationMapper.submitCaseApplication(caseApplication);
255
+//                    }
256
                     CaseAttach caseAttachselect = new CaseAttach();
256
                     CaseAttach caseAttachselect = new CaseAttach();
257
                     caseAttachselect.setAnnexId(caseAttach.getAnnexId());
257
                     caseAttachselect.setAnnexId(caseAttach.getAnnexId());
258
                     caseAttachselect.setAnnexName(caseAttach.getAnnexName());
258
                     caseAttachselect.setAnnexName(caseAttach.getAnnexName());

+ 1
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Ver fichero

539
                 AND c.id = #{id}
539
                 AND c.id = #{id}
540
             </if>
540
             </if>
541
         </where>
541
         </where>
542
+order by c.create_time desc limit 1
542
     </select>
543
     </select>
543
     <select id="listCaseApplicationByIds" resultMap="CaseApplicationResult">
544
     <select id="listCaseApplicationByIds" resultMap="CaseApplicationResult">
544
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
545
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,