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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java

@@ -80,14 +80,16 @@ public class AdjudicationController extends BaseController {
 
     /**
      * 归档(暂时只改案件状态)
-     * @param ids
+     * @param batchCaseApplication
      * @return
      */
     @PostMapping("/caseFile")
 //    @PreAuthorize("@ss.hasPermi('awardManagement:list:file')")
-    public AjaxResult caseFile(@RequestParam(value = "ids",required = true) List<Long> ids){
-
-        return adjudicationService.caseFile(ids);
+    public AjaxResult caseFile(@RequestBody BatchCaseApplication batchCaseApplication){
+        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){
+            return error("参数校验失败");
+        }
+        return adjudicationService.caseFile(batchCaseApplication.getIds());
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java

@@ -89,11 +89,11 @@ public class CaseApplicationController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('caseManagement:list:submit')")
     @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
     @PostMapping("/submitCaseApplication")
-    public AjaxResult submitCaseApplication(@RequestParam(value = "ids",required = true)  List<Long> ids) {
-        if(CollectionUtil.isEmpty(ids)){
+    public AjaxResult submitCaseApplication(@RequestBody  BatchCaseApplication batchCaseApplication) {
+        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){
             return error("参数校验失败");
         }
-        return toAjax(caseApplicationService.submitCaseApplication(ids));
+        return toAjax(caseApplicationService.submitCaseApplication(batchCaseApplication.getIds()));
     }
 
     /**
@@ -102,9 +102,11 @@ public class CaseApplicationController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')")
     @Log(title = "删除立案数据", businessType = BusinessType.DELETE)
     @PostMapping("/removeCaseApplication")
-    public AjaxResult removeCaseApplication(@RequestParam(value = "ids",required = true) List<Long> ids) {
-
-        return success(caseApplicationService.deletecaseApplicationByIds(ids));
+    public AjaxResult removeCaseApplication(@RequestBody  BatchCaseApplication batchCaseApplication) {
+        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){
+            return error("参数校验失败");
+        }
+        return success(caseApplicationService.deletecaseApplicationByIds(batchCaseApplication.getIds()));
     }
 
     /**
@@ -235,6 +237,7 @@ public class CaseApplicationController extends BaseController {
     @Log(title = "审核裁决书", businessType = BusinessType.UPDATE)
     @PostMapping("/checkArbitrateRecord")
     public AjaxResult checkArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
+
         return toAjax(caseApplicationService.checkArbitrateRecord(caseApplication));
     }
 
@@ -255,8 +258,11 @@ public class CaseApplicationController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('caseManagement:list:check')")
     @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
     @PostMapping("/submitCaseApplicationCheck")
-    public AjaxResult submitCaseApplicationCheck(@RequestParam(value = "ids",required = true) List<Long> ids,@RequestParam(value = "agreeOrNotCheck",required = true) Integer agreeOrNotCheck) {
-        return toAjax(caseApplicationService.submitCaseApplicationCheck(ids,agreeOrNotCheck));
+    public AjaxResult submitCaseApplicationCheck(@RequestBody BatchCaseApplication batchCaseApplication) {
+        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getAgreeOrNotCheck()==null){
+            return error("参数校验失败");
+        }
+        return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck()));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java

@@ -22,16 +22,17 @@ public class CaseArbitrateController extends BaseController {
 
     /**
      * 审核仲裁方式
-     * @param ids
-     * @param opinion   1同意，0拒绝
+     * @param batchCaseApplication
+     * @param batchCaseApplication   1同意，0拒绝
      * @return
      */
     @PutMapping("/method")
 //    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
-    public AjaxResult examineArbitrateMethod(@RequestParam(value = "ids",required = true) List<Long> ids
-            ,@RequestParam(value = "opinion",required = true) Integer opinion){
-
-        return caseArbitrateService.examineArbitrateMethod(ids,opinion);
+    public AjaxResult examineArbitrateMethod(@RequestBody BatchCaseApplication batchCaseApplication){
+        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getOpinion()==null){
+            return error("参数校验失败");
+        }
+        return caseArbitrateService.examineArbitrateMethod(batchCaseApplication.getIds(),batchCaseApplication.getOpinion());
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java

@@ -11,5 +11,13 @@ import java.util.List;
  */
 @Data
 public class BatchCaseApplication {
-    private List<CaseApplication> list;
+    private List<Long> ids;
+    /**
+     * 是否同意，0拒绝，1同意
+     */
+    private Integer agreeOrNotCheck;
+    /**
+     * 1同意，0拒绝
+     */
+    private Integer  opinion;
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java

@@ -44,7 +44,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
             //查询案件详细信息
             CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
             if (caseApplication1 == null) {
-                return AjaxResult.error();
+                return AjaxResult.success();
             }
             int arbitratMethod = caseApplication1.getArbitratMethod();
             String caseNum = caseApplication1.getCaseNum();

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -44,6 +44,7 @@
         <result property="requestRule"   column="request_rule"  />
         <result property="properPreser"   column="proper_preser"  />
         <result property="adjudicaCounter"   column="adjudica_counter"  />
+        <result property="lockStatus"   column="lock_status"  />
     </resultMap>
 
     <select id="selectCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
@@ -53,7 +54,7 @@
         t.loan_start_date ,t.loan_end_date ,t.claim_princi_owed ,t.claim_interest_owed ,t.claim_liquid_damag,t.fee_payable ,
         t.begin_video_date ,t.online_video_person ,t.contract_number ,t.create_by ,t.create_time ,
         t.update_by ,t.update_time , t.arbitrator_name,t.name,t.application_organ_id,t.applicantName,
-        t.arbitrator_id,t.identity_num , t.identity_type,t.filearbitra_url
+        t.arbitrator_id,t.identity_num , t.identity_type,t.filearbitra_url,t.lock_status
         from(
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'