hejinbo před 2 roky
rodič
revize
5311b1dc3d

+ 31
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java Zobrazit soubor

1
+package com.ruoyi.web.controller.wisdomarbitrate;
2
+
3
+import com.ruoyi.common.core.domain.AjaxResult;
4
+import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
5
+import com.ruoyi.wisdomarbitrate.service.ICaseArbitrateService;
6
+import org.springframework.beans.factory.annotation.Autowired;
7
+import org.springframework.validation.annotation.Validated;
8
+import org.springframework.web.bind.annotation.*;
9
+
10
+@RestController
11
+@RequestMapping("/arbitrate")
12
+public class CaseArbitrateController {
13
+    @Autowired
14
+    private ICaseArbitrateService caseArbitrateService;
15
+
16
+    /**
17
+     * 确定仲裁方式
18
+     * @param caseApplication
19
+     * @param arbitratMethod
20
+     * @return
21
+     */
22
+    @PutMapping("/method")
23
+    public AjaxResult chooseArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication,Integer arbitratMethod){
24
+        return caseArbitrateService.chooseArbitrateMethod(caseApplication,arbitratMethod);
25
+    }
26
+
27
+    @PostMapping("/writtenHear")
28
+    public AjaxResult writtenHear(@Validated @RequestBody CaseApplication caseApplication,String accidentDescription , String arbitrationResult){
29
+        return caseArbitrateService.writtenHear(caseApplication,accidentDescription,arbitrationResult);
30
+    }
31
+}

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java Zobrazit soubor

15
 import java.util.List;
15
 import java.util.List;
16
 
16
 
17
 /**
17
 /**
18
- * 案件证据上传
18
+ * 案件证据
19
  */
19
  */
20
 @RestController
20
 @RestController
21
 @RequestMapping("/evidence")
21
 @RequestMapping("/evidence")

+ 3
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Zobrazit soubor

25
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
25
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
26
     private Date registerDate;
26
     private Date registerDate;
27
     /** 仲裁方式 */
27
     /** 仲裁方式 */
28
-    private String arbitratMethod;
28
+    private int arbitratMethod;
29
     /** 案件状态 */
29
     /** 案件状态 */
30
     private int caseStatus;
30
     private int caseStatus;
31
     /** 开庭日期 */
31
     /** 开庭日期 */
278
         this.registerDate = registerDate;
278
         this.registerDate = registerDate;
279
     }
279
     }
280
 
280
 
281
-    public String getArbitratMethod() {
281
+    public int getArbitratMethod() {
282
         return arbitratMethod;
282
         return arbitratMethod;
283
     }
283
     }
284
 
284
 
285
-    public void setArbitratMethod(String arbitratMethod) {
285
+    public void setArbitratMethod(int arbitratMethod) {
286
         this.arbitratMethod = arbitratMethod;
286
         this.arbitratMethod = arbitratMethod;
287
     }
287
     }
288
 
288
 

+ 10
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java Zobrazit soubor

1
+package com.ruoyi.wisdomarbitrate.service;
2
+
3
+import com.ruoyi.common.core.domain.AjaxResult;
4
+import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
5
+
6
+public interface ICaseArbitrateService {
7
+    AjaxResult chooseArbitrateMethod(CaseApplication caseApplication,Integer arbitratMethod);
8
+
9
+    AjaxResult writtenHear(CaseApplication caseApplication, String accidentDescription, String arbitrationResult);
10
+}

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

1
+package com.ruoyi.wisdomarbitrate.service.impl;
2
+
3
+import com.ruoyi.common.constant.CaseApplicationConstants;
4
+import com.ruoyi.common.core.domain.AjaxResult;
5
+import com.ruoyi.common.utils.SmsUtils;
6
+import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
7
+import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
8
+import com.ruoyi.wisdomarbitrate.mapper.CaseAffiliateMapper;
9
+import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper;
10
+import com.ruoyi.wisdomarbitrate.service.ICaseArbitrateService;
11
+import org.springframework.beans.factory.annotation.Autowired;
12
+import org.springframework.stereotype.Service;
13
+import org.springframework.transaction.annotation.Transactional;
14
+
15
+import java.util.List;
16
+
17
+@Service
18
+public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
19
+    @Autowired
20
+    private CaseApplicationMapper caseApplicationMapper;
21
+    @Autowired
22
+    private CaseAffiliateMapper caseAffiliateMapper;
23
+
24
+    @Override
25
+    @Transactional
26
+    public AjaxResult chooseArbitrateMethod(CaseApplication caseApplication, Integer arbitratMethod) {
27
+        if (arbitratMethod != null) {
28
+            String arbitratMethodStr = arbitratMethod == 1 ? "开庭审理" : "书面审理";
29
+            //查询案件详细信息
30
+            CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
31
+            if (caseApplication1 == null) {
32
+                return AjaxResult.error();
33
+            }
34
+            String caseNum = caseApplication1.getCaseNum();
35
+            //选择仲裁方式
36
+            caseApplication.setArbitratMethod(arbitratMethod);
37
+            //修改案件状态为待开庭
38
+            caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT);
39
+            int i = caseApplicationMapper.submitCaseApplication(caseApplication);
40
+            if (i > 0) {
41
+                //发送短信通知
42
+                SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
43
+                request.setTemplateId("1931000");
44
+                CaseAffiliate caseAffiliate = new CaseAffiliate();
45
+                caseAffiliate.setCaseAppliId(caseApplication1.getId());
46
+                List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);            //获取案件关联人信息
47
+                if (caseAffiliates != null && caseAffiliates.size() > 0) {
48
+                    for (CaseAffiliate affiliate : caseAffiliates) {
49
+                        //获取身份类型
50
+                        int identityType = affiliate.getIdentityType();
51
+                        if (identityType == 1) {    //申请人
52
+                            request.setPhone(affiliate.getContactTelphone());
53
+                            // 这个值,要看你的模板中是否预留了占位符,如果没有则不需要设置
54
+                            // 1931000 普通短信 确定仲裁方式通知 尊敬的{1}用户,您的{2}仲裁案件,仲裁方式已确定为{3},请知晓,如非本人操作,请忽略本短信。
55
+                            String name = affiliate.getName();
56
+                            request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
57
+                            SmsUtils.sendSms(request);
58
+                        } else {       //被申请人
59
+                            request.setPhone(affiliate.getContactTelphone());
60
+                            // 模板id1928006 普通短信 案件应诉通知 尊敬的{1}用户,您的{2}案件{3}已成功受理,请点击https://phmapp.xayunmei.com选择是否应诉。
61
+                            String name = affiliate.getName();
62
+                            request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
63
+                            SmsUtils.sendSms(request);
64
+                        }
65
+                    }
66
+                }
67
+                return AjaxResult.success("选择成功");
68
+            }
69
+
70
+        }
71
+        return AjaxResult.error("请选择开庭方式");
72
+    }
73
+
74
+    @Override
75
+    public AjaxResult writtenHear(CaseApplication caseApplication, String accidentDescription, String arbitrationResult) {
76
+        //提交仲裁结果
77
+        // caseApplication.set(accidentDescription); //案情描述
78
+        // caseApplication.set(arbitrationResult);  //仲裁结果
79
+        int i = caseApplicationMapper.updataCaseApplication(caseApplication);
80
+        if (i>0){
81
+            return AjaxResult.success("提交成功");
82
+        }
83
+        return AjaxResult.error("暂无需要提交仲裁结果的案件");
84
+    }
85
+}

+ 4
- 8
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java Zobrazit soubor

17
 import org.springframework.beans.BeanUtils;
17
 import org.springframework.beans.BeanUtils;
18
 import org.springframework.beans.factory.annotation.Autowired;
18
 import org.springframework.beans.factory.annotation.Autowired;
19
 import org.springframework.stereotype.Service;
19
 import org.springframework.stereotype.Service;
20
+import org.springframework.transaction.annotation.Transactional;
20
 import org.springframework.web.multipart.MultipartFile;
21
 import org.springframework.web.multipart.MultipartFile;
21
 
22
 
22
 import java.io.IOException;
23
 import java.io.IOException;
36
     private CaseApplicationMapper caseApplicationMapper;
37
     private CaseApplicationMapper caseApplicationMapper;
37
     @Autowired
38
     @Autowired
38
     private CaseAttachMapper caseAttachMapper;
39
     private CaseAttachMapper caseAttachMapper;
39
- /*   @Override
40
-    public List<CaseEvidenceVO> getCaseListByRespondent(String identityNum) {
41
-        return getCaseEvidenceVOList(identityNum,3, 2);
42
-    }*/
43
 
40
 
44
     @Override
41
     @Override
42
+    @Transactional
45
     public AjaxResult getCaseDetailsById(Long id,String userName) {
43
     public AjaxResult getCaseDetailsById(Long id,String userName) {
46
         CaseApplication caseApplication = new CaseApplication();
44
         CaseApplication caseApplication = new CaseApplication();
47
         caseApplication.setId(id);
45
         caseApplication.setId(id);
73
     }
71
     }
74
 
72
 
75
     @Override
73
     @Override
74
+    @Transactional
76
     public AjaxResult uploadEvidence(MultipartFile file, Integer annexType, Long id, String userName, Long userId) {
75
     public AjaxResult uploadEvidence(MultipartFile file, Integer annexType, Long id, String userName, Long userId) {
77
 
76
 
78
         if (file.isEmpty()) {
77
         if (file.isEmpty()) {
105
         return AjaxResult.error("上传失败");
104
         return AjaxResult.error("上传失败");
106
     }
105
     }
107
 
106
 
108
-/*    @Override
109
-    public List<CaseEvidenceVO> getCaseListByApplicant(String identityNum) {
110
-        return getCaseEvidenceVOList(identityNum,4, 1);
111
-    }*/
107
+
112
 
108
 
113
     @Override
109
     @Override
114
     public List<CaseEvidenceVO> getCaseListAll(String identityNum) {
110
     public List<CaseEvidenceVO> getCaseListAll(String identityNum) {

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

1
 package com.ruoyi.wisdomarbitrate.service.impl;
1
 package com.ruoyi.wisdomarbitrate.service.impl;
2
 
2
 
3
 
3
 
4
-
5
 import com.ruoyi.ElegentPay;
4
 import com.ruoyi.ElegentPay;
6
 import com.ruoyi.common.constant.CaseApplicationConstants;
5
 import com.ruoyi.common.constant.CaseApplicationConstants;
7
 import com.ruoyi.common.core.domain.AjaxResult;
6
 import com.ruoyi.common.core.domain.AjaxResult;
18
 import com.ruoyi.wisdomarbitrate.service.ICasePaymentService;
17
 import com.ruoyi.wisdomarbitrate.service.ICasePaymentService;
19
 import org.springframework.beans.factory.annotation.Autowired;
18
 import org.springframework.beans.factory.annotation.Autowired;
20
 import org.springframework.stereotype.Service;
19
 import org.springframework.stereotype.Service;
20
+import org.springframework.transaction.annotation.Transactional;
21
 
21
 
22
 import java.time.LocalDateTime;
22
 import java.time.LocalDateTime;
23
 import java.util.Date;
23
 import java.util.Date;
42
     }
42
     }
43
 
43
 
44
     @Override
44
     @Override
45
+    @Transactional
45
     public AjaxResult casePay(CasePayDTO casePayDTO) {
46
     public AjaxResult casePay(CasePayDTO casePayDTO) {
46
         PayRequest payRequest = new PayRequest();
47
         PayRequest payRequest = new PayRequest();
47
         payRequest.setBody("案件缴费");
48
         payRequest.setBody("案件缴费");
64
         return AjaxResult.success(response);
65
         return AjaxResult.success(response);
65
     }
66
     }
66
 
67
 
67
-
68
+    @Transactional
68
     public AjaxResult callback(String orderNumber) {
69
     public AjaxResult callback(String orderNumber) {
69
         //查询记录
70
         //查询记录
70
         CasePaymentRecord casePaymentRecord = casePaymentRecordMapper.queryRecord(orderNumber);
71
         CasePaymentRecord casePaymentRecord = casePaymentRecordMapper.queryRecord(orderNumber);
86
         caseApplicationMapper.submitCaseApplication(caseApplication1);
87
         caseApplicationMapper.submitCaseApplication(caseApplication1);
87
         return AjaxResult.success();
88
         return AjaxResult.success();
88
     }
89
     }
90
+
89
     @Override
91
     @Override
92
+    @Transactional
90
     public AjaxResult confirmPayment(CaseApplication caseApplication) {
93
     public AjaxResult confirmPayment(CaseApplication caseApplication) {
91
         caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_RESPOND);
94
         caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_RESPOND);
92
         int i = caseApplicationMapper.submitCaseApplication(caseApplication);
95
         int i = caseApplicationMapper.submitCaseApplication(caseApplication);
102
                     int identityType = affiliate.getIdentityType();
105
                     int identityType = affiliate.getIdentityType();
103
                     //查询案件详细信息
106
                     //查询案件详细信息
104
                     CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
107
                     CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
105
-                    if (caseApplication1 == null){
108
+                    if (caseApplication1 == null) {
106
                         return AjaxResult.error();
109
                         return AjaxResult.error();
107
                     }
110
                     }
108
                     String caseName = "仲裁"; //这里案件名称表里未定义,暂时写死
111
                     String caseName = "仲裁"; //这里案件名称表里未定义,暂时写死
113
                         // 这个值,要看你的模板中是否预留了占位符,如果没有则不需要设置
116
                         // 这个值,要看你的模板中是否预留了占位符,如果没有则不需要设置
114
                         // 模板id:1928003 普通短信 案件受理通知 尊敬的{1}用户,您的{2}案件{3}已成功受理。
117
                         // 模板id:1928003 普通短信 案件受理通知 尊敬的{1}用户,您的{2}案件{3}已成功受理。
115
                         String name = affiliate.getName();
118
                         String name = affiliate.getName();
116
-                        request.setTemplateParamSet(new String[]{name,caseName,caseNum});
119
+                        request.setTemplateParamSet(new String[]{name, caseName, caseNum});
120
+                        SmsUtils.sendSms(request);
117
                     } else {       //被申请人
121
                     } else {       //被申请人
118
                         request.setPhone(affiliate.getContactTelphone());
122
                         request.setPhone(affiliate.getContactTelphone());
119
                         request.setTemplateId("1928006");
123
                         request.setTemplateId("1928006");
120
                         // 模板id1928006 普通短信 案件应诉通知 尊敬的{1}用户,您的{2}案件{3}已成功受理,请点击https://phmapp.xayunmei.com选择是否应诉。
124
                         // 模板id1928006 普通短信 案件应诉通知 尊敬的{1}用户,您的{2}案件{3}已成功受理,请点击https://phmapp.xayunmei.com选择是否应诉。
121
                         String name = affiliate.getName();
125
                         String name = affiliate.getName();
122
-                        request.setTemplateParamSet(new String[]{name,caseName,caseNum});
126
+                        request.setTemplateParamSet(new String[]{name, caseName, caseNum});
127
+                        SmsUtils.sendSms(request);
123
                     }
128
                     }
124
                 }
129
                 }
125
-                SmsUtils.sendSms(request);
126
                 return AjaxResult.success();
130
                 return AjaxResult.success();
127
             }
131
             }
128
         }
132
         }

+ 1
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Zobrazit soubor

139
             <if test="arbitratorId != null and arbitratorId != ''">arbitrator_id = #{arbitratorId},</if>
139
             <if test="arbitratorId != null and arbitratorId != ''">arbitrator_id = #{arbitratorId},</if>
140
             <if test="arbitratorName != null and arbitratorName != ''">arbitrator_name = #{arbitratorName},</if>
140
             <if test="arbitratorName != null and arbitratorName != ''">arbitrator_name = #{arbitratorName},</if>
141
             <if test="pendingAppointArbotrar != null ">pending_appoint_arbotrar = #{pendingAppointArbotrar},</if>
141
             <if test="pendingAppointArbotrar != null ">pending_appoint_arbotrar = #{pendingAppointArbotrar},</if>
142
+            <if test="arbitratMethod != null ">arbitrat_method = #{arbitratMethod},</if>
142
         </set>
143
         </set>
143
         where id = #{id}
144
         where id = #{id}
144
     </update>
145
     </update>