ソースを参照

优化案件提交退还原因

qitz 2 年 前
コミット
b1f0fb8f6f

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java ファイルの表示

@@ -324,7 +324,7 @@ public class CaseApplicationController extends BaseController {
324 324
         if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getAgreeOrNotCheck()==null){
325 325
             return error("参数校验失败");
326 326
         }
327
-        return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck()));
327
+        return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getRejectReason()));
328 328
     }
329 329
 
330 330
     /**

+ 13
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java ファイルの表示

@@ -57,6 +57,19 @@ public class ArbitrateRecord     extends BaseEntity {
57 57
      */
58 58
     private String applicantOpinion;
59 59
 
60
+    /**
61
+     * 立案审查驳回原因
62
+     */
63
+    private String caseCheckReject;
64
+    /**
65
+     * 仲裁员确认裁决书驳回
66
+     */
67
+    private String arbitrateReject;
68
+    /**
69
+     * 部门长确认裁决书驳回
70
+     */
71
+    private String deptorReject;
72
+
60 73
 
61 74
 
62 75
 

+ 2
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java ファイルの表示

@@ -20,4 +20,6 @@ public class BatchCaseApplication {
20 20
      * 1同意,0拒绝
21 21
      */
22 22
     private Integer  opinion;
23
+    /** 驳回原因 */
24
+    private String rejectReason;
23 25
 }

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java ファイルの表示

@@ -45,7 +45,7 @@ public interface ICaseApplicationService {
45 45
 
46 46
     AjaxResult checkArbitrateRecord(CaseApplication caseApplication);
47 47
 
48
-    int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck);
48
+    int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck,String rejectReason);
49 49
 
50 50
     CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication);
51 51
 

+ 7
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java ファイルの表示

@@ -2230,7 +2230,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
2230 2230
 
2231 2231
     @Override
2232 2232
     @Transactional
2233
-    public int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck) {
2233
+    public int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck,String rejectReason) {
2234 2234
         //提交立案审查
2235 2235
         int rows = 0;
2236 2236
         for (Long id : ids) {
@@ -2243,6 +2243,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
2243 2243
             } else if (agreeOrNotCheck == 2) {//拒绝审核
2244 2244
                 caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
2245 2245
                 rows += caseApplicationMapper.submitCaseApplication(caseApplication);
2246
+                ArbitrateRecord arbitrateRecordsel = new ArbitrateRecord();
2247
+                arbitrateRecordsel.setCaseAppliId(id);
2248
+                ArbitrateRecord arbitrateRecordnew = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecordsel);
2249
+                arbitrateRecordnew.setCaseCheckReject(rejectReason);
2250
+                arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordnew);
2251
+
2246 2252
             }
2247 2253
             // 新增日志
2248 2254
             insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_PAYMENT, "");

+ 5
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml ファイルの表示

@@ -74,6 +74,9 @@
74 74
             <if test="caseFacts != null  and caseFacts != ''">case_facts = #{caseFacts},</if>
75 75
             <if test="respondentOpinion != null  and respondentOpinion != ''">respondent_opinion = #{respondentOpinion},</if>
76 76
             <if test="applicantOpinion != null  and applicantOpinion != ''">applicant_opinion = #{applicantOpinion},</if>
77
+            <if test="caseCheckReject != null  and caseCheckReject != ''">case_check_reject = #{caseCheckReject},</if>
78
+            <if test="arbitrateReject != null  and arbitrateReject != ''">arbitrate_reject = #{arbitrateReject},</if>
79
+            <if test="deptorReject != null  and deptorReject != ''">deptor_reject = #{deptorReject},</if>
77 80
             update_time = sysdate()
78 81
         </set>
79 82
         where id = #{id}
@@ -82,7 +85,8 @@
82 85
 
83 86
     <select id="selectArbitrateRecord" parameterType="ArbitrateRecord" resultMap="ArbitrateRecordResult">
84 87
         SELECT a.id ,a.case_appli_id ,a.eviden_determi ,a.fact_determi ,a.case_sketch ,a.arbitrate_think ,a.ruling_follows ,
85
-        a.verifica_opinion ,a.check_opinion,a.annex_id,a.case_focus,a.case_facts,a.respondent_opinion,a.applicant_opinion
88
+        a.verifica_opinion ,a.check_opinion,a.annex_id,a.case_focus,a.case_facts,a.respondent_opinion,a.applicant_opinion,
89
+        a.case_check_reject ,a.arbitrate_reject,a.deptor_reject
86 90
         from arbitrate_record a
87 91
         <where>
88 92
             <if test="caseAppliId != null ">