Procházet zdrojové kódy

11.13 查询和流程节点修改

hejinbo před 2 roky
rodič
revize
9a9cacbdd5

+ 3
- 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java Zobrazit soubor

1
 package com.ruoyi.web.controller.wisdomarbitrate;
1
 package com.ruoyi.web.controller.wisdomarbitrate;
2
 
2
 
3
 import com.ruoyi.common.core.controller.BaseController;
3
 import com.ruoyi.common.core.controller.BaseController;
4
+import com.ruoyi.common.core.domain.AjaxResult;
4
 import com.ruoyi.common.core.page.TableDataInfo;
5
 import com.ruoyi.common.core.page.TableDataInfo;
5
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
6
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
6
 import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
7
 import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
24
      */
25
      */
25
 //    @PreAuthorize("@ss.hasPermi('caseLog:list')")
26
 //    @PreAuthorize("@ss.hasPermi('caseLog:list')")
26
     @GetMapping("/list")
27
     @GetMapping("/list")
27
-    public TableDataInfo list(CaseLogRecord caseLogRecord)
28
+    public AjaxResult list(CaseLogRecord caseLogRecord)
28
     {
29
     {
29
-        startPage();
30
         List<CaseLogRecord> list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord);
30
         List<CaseLogRecord> list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord);
31
-        return getDataTable(list);
31
+        return AjaxResult.success(list);
32
     }
32
     }
33
 
33
 
34
 
34
 

+ 30
- 19
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Zobrazit soubor

185
                     //
185
                     //
186
                     caseApplication.setIdCard(String.valueOf(sysUser.getIdCard()));
186
                     caseApplication.setIdCard(String.valueOf(sysUser.getIdCard()));
187
                 }
187
                 }
188
+                if (role.getRoleName().equals("申请人")) {
189
+                    //
190
+                    caseApplication.setNameId(String.valueOf(sysUser.getDeptId()));
191
+                }
188
             }
192
             }
189
 
193
 
190
 
194
 
531
         caseLogRecord5.setCaseNode(5);
535
         caseLogRecord5.setCaseNode(5);
532
         caseLogRecord5.setCaseNodeName("组庭审核");
536
         caseLogRecord5.setCaseNodeName("组庭审核");
533
         caseLogRecord5.setContent("法律顾问将进行组庭审核");
537
         caseLogRecord5.setContent("法律顾问将进行组庭审核");
538
+
534
         CaseLogRecord caseLogRecord6 = new CaseLogRecord();
539
         CaseLogRecord caseLogRecord6 = new CaseLogRecord();
535
         caseLogRecord6.setCaseNode(6);
540
         caseLogRecord6.setCaseNode(6);
541
+        caseLogRecord6.setCaseNodeName("修改开庭时间");
542
+        caseLogRecord6.setContent("部门长将修改开庭时间");
543
+
544
+        CaseLogRecord caseLogRecord7 = new CaseLogRecord();
545
+        caseLogRecord6.setCaseNode(7);
536
         caseLogRecord6.setCaseNodeName("组庭确定");
546
         caseLogRecord6.setCaseNodeName("组庭确定");
537
         caseLogRecord6.setContent("部门长将进行组庭确定");
547
         caseLogRecord6.setContent("部门长将进行组庭确定");
538
-        CaseLogRecord caseLogRecord7 = new CaseLogRecord();
539
-        caseLogRecord7.setCaseNode(7);
548
+
549
+        CaseLogRecord caseLogRecord8 = new CaseLogRecord();
550
+        caseLogRecord7.setCaseNode(8);
540
         caseLogRecord7.setCaseNodeName("审核仲裁方式");
551
         caseLogRecord7.setCaseNodeName("审核仲裁方式");
541
         caseLogRecord7.setContent("仲裁员将进行审核仲裁方式");
552
         caseLogRecord7.setContent("仲裁员将进行审核仲裁方式");
542
-        CaseLogRecord caseLogRecord8 = new CaseLogRecord();
543
-        caseLogRecord8.setCaseNode(8);
553
+        CaseLogRecord caseLogRecord9 = new CaseLogRecord();
554
+        caseLogRecord8.setCaseNode(9);
544
         caseLogRecord8.setCaseNodeName("开庭审理");
555
         caseLogRecord8.setCaseNodeName("开庭审理");
545
         caseLogRecord8.setContent("仲裁员将进行开庭审理");
556
         caseLogRecord8.setContent("仲裁员将进行开庭审理");
546
-        CaseLogRecord caseLogRecord9 = new CaseLogRecord();
547
-        caseLogRecord9.setCaseNode(9);
557
+        CaseLogRecord caseLogRecord11 = new CaseLogRecord();
558
+        caseLogRecord9.setCaseNode(11);
548
         caseLogRecord9.setCaseNodeName("书面审理");
559
         caseLogRecord9.setCaseNodeName("书面审理");
549
         caseLogRecord9.setContent("仲裁员将进行书面审理");
560
         caseLogRecord9.setContent("仲裁员将进行书面审理");
550
-        CaseLogRecord caseLogRecord11 = new CaseLogRecord();
551
-        caseLogRecord11.setCaseNode(11);
561
+        CaseLogRecord caseLogRecord12 = new CaseLogRecord();
562
+        caseLogRecord11.setCaseNode(12);
552
         caseLogRecord11.setCaseNodeName("核验仲裁文书");
563
         caseLogRecord11.setCaseNodeName("核验仲裁文书");
553
         caseLogRecord11.setContent("法律顾问将进行核验仲裁文书");
564
         caseLogRecord11.setContent("法律顾问将进行核验仲裁文书");
554
-        CaseLogRecord caseLogRecord12 = new CaseLogRecord();
555
-        caseLogRecord12.setCaseNode(12);
565
+        CaseLogRecord caseLogRecord13 = new CaseLogRecord();
566
+        caseLogRecord12.setCaseNode(13);
556
         caseLogRecord12.setCaseNodeName("确认仲裁文书");
567
         caseLogRecord12.setCaseNodeName("确认仲裁文书");
557
         caseLogRecord12.setContent("仲裁员将进行确认仲裁文书");
568
         caseLogRecord12.setContent("仲裁员将进行确认仲裁文书");
558
-        CaseLogRecord caseLogRecord13 = new CaseLogRecord();
559
-        caseLogRecord13.setCaseNode(13);
569
+        CaseLogRecord caseLogRecord14 = new CaseLogRecord();
570
+        caseLogRecord13.setCaseNode(14);
560
         caseLogRecord13.setCaseNodeName("仲裁文书签名");
571
         caseLogRecord13.setCaseNodeName("仲裁文书签名");
561
         caseLogRecord13.setContent("仲裁员将进行仲裁文书签名");
572
         caseLogRecord13.setContent("仲裁员将进行仲裁文书签名");
562
-        CaseLogRecord caseLogRecord14 = new CaseLogRecord();
563
-        caseLogRecord14.setCaseNode(14);
573
+        CaseLogRecord caseLogRecord15 = new CaseLogRecord();
574
+        caseLogRecord14.setCaseNode(15);
564
         caseLogRecord14.setCaseNodeName("仲裁文书用印");
575
         caseLogRecord14.setCaseNodeName("仲裁文书用印");
565
         caseLogRecord14.setContent("部门长将进行仲裁文书用印");
576
         caseLogRecord14.setContent("部门长将进行仲裁文书用印");
566
-        CaseLogRecord caseLogRecord15 = new CaseLogRecord();
567
-        caseLogRecord15.setCaseNode(15);
577
+        CaseLogRecord caseLogRecord16 = new CaseLogRecord();
578
+        caseLogRecord15.setCaseNode(16);
568
         caseLogRecord15.setCaseNodeName("仲裁文书送达");
579
         caseLogRecord15.setCaseNodeName("仲裁文书送达");
569
         caseLogRecord15.setContent("法律顾问将进行仲裁文书送达");
580
         caseLogRecord15.setContent("法律顾问将进行仲裁文书送达");
570
-        CaseLogRecord caseLogRecord16 = new CaseLogRecord();
571
-        caseLogRecord16.setCaseNode(16);
581
+        CaseLogRecord caseLogRecord17 = new CaseLogRecord();
582
+        caseLogRecord16.setCaseNode(17);
572
         caseLogRecord16.setCaseNodeName("案件归档");
583
         caseLogRecord16.setCaseNodeName("案件归档");
573
         caseLogRecord16.setContent("法律顾问将进行案件归档");
584
         caseLogRecord16.setContent("法律顾问将进行案件归档");
574
 
585
 
2215
     public int pendTralSure(CaseApplication caseApplication) {
2226
     public int pendTralSure(CaseApplication caseApplication) {
2216
 //        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
2227
 //        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
2217
 
2228
 
2218
-        caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
2229
+        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
2219
         Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
2230
         Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
2220
         int rows = 0;
2231
         int rows = 0;
2221
         //同意组庭
2232
         //同意组庭

+ 6
- 6
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java Zobrazit soubor

72
         if (opinion == 0) {   //拒绝
72
         if (opinion == 0) {   //拒绝
73
             if (arbitratMethod == 2) {
73
             if (arbitratMethod == 2) {
74
                 caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
74
                 caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
75
-                //修改案件状态为待开庭审理
76
-                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
75
+                //修改案件状态修改开庭时间
76
+                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
77
                 //修改案件状态为待修改开庭时间
77
                 //修改案件状态为待修改开庭时间
78
 //                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
78
 //                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
79
                 // 新增日志
79
                 // 新增日志
80
-                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, "");
80
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
81
 
81
 
82
             } else {
82
             } else {
83
                 caseApplication1.setArbitratMethod(2);
83
                 caseApplication1.setArbitratMethod(2);
95
                 CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
95
                 CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
96
 
96
 
97
             } else {
97
             } else {
98
-                //修改案件状态为待开庭审理
99
-                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
98
+                //修改案件状态为待修改开庭时间
99
+                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
100
                 //修改案件状态为待修改开庭时间
100
                 //修改案件状态为待修改开庭时间
101
 //                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
101
 //                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
102
                 // 新增日志
102
                 // 新增日志
103
-                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, "");
103
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
104
 
104
 
105
             }
105
             }
106
         }
106
         }