Explorar el Código

Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

wangqiong123 hace 2 años
padre
commit
8ec8971f2a

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

646
     @Override
646
     @Override
647
     @Transactional
647
     @Transactional
648
     public int pendTralCheck(CaseApplication caseApplication) {
648
     public int pendTralCheck(CaseApplication caseApplication) {
649
-        int isAgreePendTral = caseApplication.getIsAgreePendTral();
649
+        Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
650
         caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
650
         caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
651
         int rows = 0;
651
         int rows = 0;
652
         //同意组庭
652
         //同意组庭
653
-        if(isAgreePendTral==1){
653
+        if(isAgreePendTral!=null&&isAgreePendTral==1){
654
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
654
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
655
         }else {
655
         }else {
656
             List<Arbitrator> arbitrators = caseApplication.getArbitrators();
656
             List<Arbitrator> arbitrators = caseApplication.getArbitrators();

+ 2
- 60
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java Ver fichero

30
                 }
30
                 }
31
 
31
 
32
                 contentBuilder.append(record.getCreateNickName()).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
32
                 contentBuilder.append(record.getCreateNickName()).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
33
-                switch(record.getCaseNode()){
34
-                  case  0:
35
-                      contentBuilder.append("创建立案申请");
36
-                      break;
37
-                    case  1:
38
-                        contentBuilder.append("提交立案申请");
39
-                        break;
40
-                    case  2:
41
-                        contentBuilder.append("立案审查");
42
-                        break;
43
-                    case  3:
44
-                        contentBuilder.append("支付成功");
45
-                        break;
46
-                    case  4:
47
-                        contentBuilder.append("缴费确认");
48
-                        break;
49
-                    case  5:
50
-                        contentBuilder.append("案件质证");
51
-                        break;
52
-                    case  6:
53
-                        contentBuilder.append("组庭审核");
54
-                        break;
55
-                    case  7:
56
-                        contentBuilder.append("组庭确认");
57
-                        break;
58
-                    case  8:
59
-                        contentBuilder.append("待开庭审理");
60
-                        break;
61
-                    case  9:
62
-                        contentBuilder.append("待书面审理");
63
-                        break;
64
-                    case  10:
65
-                        contentBuilder.append("书面审理");
66
-                        break;
67
-                    case  11:
68
-                        contentBuilder.append("审核裁决书,拒绝");
69
-                        break;
70
-                    case  12:
71
-                        contentBuilder.append("核验裁决书");
72
-                        break;
73
-                    case  13:
74
-                        contentBuilder.append("审核裁决书,同意");
75
-                        break;
76
-                    case  14:
77
-                        contentBuilder.append("签名成功");
78
-                        break;
79
-                    case  15:
80
-                        contentBuilder.append("用印成功");
81
-                        break;
82
-                    case  16:
83
-                        contentBuilder.append("送达仲裁文书");
84
-                        break;
85
-                    case  17:
86
-                        contentBuilder.append("案件归档");
87
-                        break;
88
-                    case  26:
89
-                        contentBuilder.append("证据确认成功");
90
-                        break;
91
-                    default:break;
33
+                if(StrUtil.isNotEmpty(record.getContent())){
34
+                    contentBuilder.append(record.getContent());
92
                 }
35
                 }
93
-
94
                 record.setContent(contentBuilder.toString());
36
                 record.setContent(contentBuilder.toString());
95
 
37
 
96
             });
38
             });

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

49
                             when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
49
                             when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
50
                             when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
50
                             when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
51
                             when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
51
                             when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
52
-                            when 15 then '待仲裁文书送达' when 16 then '待案件归档'
52
+                            when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
53
                             ELSE '无案件状态'
53
                             ELSE '无案件状态'
54
                             END caseStatusName,
54
                             END caseStatusName,
55
         c.hear_date ,c.arbitrat_claims ,
55
         c.hear_date ,c.arbitrat_claims ,
56
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
56
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
57
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
57
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
58
-        c.update_by ,c.update_time , c.arbitrator_name,d.dept_name as applicantName
58
+        c.update_by ,c.update_time , c.arbitrator_name,d.dept_name as applicantName,c.register_date
59
         from case_application c
59
         from case_application c
60
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
60
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
61
         LEFT JOIN sys_dept d ON ca.NAME = d.dept_id and ca.name=d.dept_id
61
         LEFT JOIN sys_dept d ON ca.NAME = d.dept_id and ca.name=d.dept_id
93
 
93
 
94
         <if test="caseNum != null and caseNum != ''">case_num,</if>
94
         <if test="caseNum != null and caseNum != ''">case_num,</if>
95
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
95
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
96
-        <if test="registerDate != null">register_date,</if>
96
+        register_date,
97
         <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method,</if>
97
         <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method,</if>
98
         <if test="caseStatus != null ">case_status,</if>
98
         <if test="caseStatus != null ">case_status,</if>
99
         <if test="hearDate != null ">hear_date,</if>
99
         <if test="hearDate != null ">hear_date,</if>
114
         )values(
114
         )values(
115
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
115
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
116
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
116
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
117
-        <if test="registerDate != null">#{registerDate},</if>
117
+       sysdate(),
118
         <if test="arbitratMethod != null and arbitratMethod != ''">#{arbitratMethod},</if>
118
         <if test="arbitratMethod != null and arbitratMethod != ''">#{arbitratMethod},</if>
119
         <if test="caseStatus != null ">#{caseStatus},</if>
119
         <if test="caseStatus != null ">#{caseStatus},</if>
120
         <if test="hearDate != null ">#{hearDate},</if>
120
         <if test="hearDate != null ">#{hearDate},</if>

+ 10
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml Ver fichero

22
     </insert>
22
     </insert>
23
     <select id="selectCaseLogRecordList" resultType="com.ruoyi.wisdomarbitrate.domain.CaseLogRecord">
23
     <select id="selectCaseLogRecordList" resultType="com.ruoyi.wisdomarbitrate.domain.CaseLogRecord">
24
             select cl.case_node caseNode ,cl.case_node_time caseNodeTime ,cl.notes  ,cl.id ,cl.case_appli_id caseAppliId,
24
             select cl.case_node caseNode ,cl.case_node_time caseNodeTime ,cl.notes  ,cl.id ,cl.case_appli_id caseAppliId,
25
-            cl.create_by createBy,cl.create_nick_name createNickName,cl.create_time createTime,cl.update_by updateBy,cl.update_time updateTime
25
+            cl.create_by createBy,cl.create_nick_name createNickName,cl.create_time createTime,cl.update_by updateBy,cl.update_time updateTime,
26
+        CASE cl.case_node when 0 then '立案申请' when 1 then '提交立案申请' when 2 then '立案审查'
27
+        when 3 then '支付成功' when 4 then '缴费确认' when 5 then '案件质证'
28
+        when 6 then '组庭审核' when 7 then '组庭确认' when 8 then '待开庭审理'
29
+        when 9 then '待书面审理' when 10 then '书面审理' when 11 then '拒绝裁决书'
30
+        when 12 then '核验裁决书' when 13 then '同意裁决书' when 14 then '签名成功'
31
+        when 15 then '用印成功' when 16 then '送达仲裁文书' when 17 then '案件归档'
32
+        when 26 then '证据确认成功'
33
+        ELSE '无案件状态'
34
+        END content
26
             from case_log_record cl
35
             from case_log_record cl
27
 
36
 
28
             <where>
37
             <where>