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

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

@@ -205,6 +205,15 @@ public class CaseApplicationController extends BaseController {
         return toAjax(caseApplicationService.pendTralSure(caseApplication));
     }
 
+    /**
+     * 修改开庭时间
+     */
+    @Log(title = "修改开庭时间", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateHeardate")
+    public AjaxResult updateHeardate(@Validated @RequestBody CaseApplication caseApplication) {
+        return toAjax(caseApplicationService.updateHeardate(caseApplication));
+    }
+
     /**
      * 核验裁决书
      */

ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java

@@ -45,6 +45,9 @@ public class CaseApplicationConstants {
     /** 已归档*/
     public static final int CASE_ARCHIVED = 17;
 
+    /** 待修改开庭时间*/
+    public static final int MODIFY_HEARDATE = 31;
+
 
 
 

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java

@@ -62,4 +62,6 @@ public interface ICaseApplicationService {
     ToDoCount selectToDoCount();
 
     AjaxResult selectCaseProgress(CaseApplication caseApplication);
+
+    int updateHeardate(CaseApplication caseApplication);
 }

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

@@ -230,6 +230,17 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     }
 
+    @Override
+    @Transactional
+    public int updateHeardate(CaseApplication caseApplication) {
+        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+        int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+
+        // 新增日志
+        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_OPENCOURT_HEAR,"");
+        return rows;
+    }
+
     private List<CaseLogRecord> getNofinishCasenode(Integer caseStatus) {
         CaseLogRecord caseLogRecord1 = new CaseLogRecord();
         caseLogRecord1.setCaseNodeName("立案审查");
@@ -1346,8 +1357,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                                                     JSONObject coordinateObj = coordinatesArray.getJSONObject(0);
                                                     double positionX = coordinateObj.getDoubleValue("positionX");
                                                     double positionY = coordinateObj.getDoubleValue("positionY");
-                                                    sealSignRecord.setPositionXorg(positionX-10);
-                                                    sealSignRecord.setPositionYorg(positionY+10);
+                                                    sealSignRecord.setPositionXorg(positionX+90);
+                                                    sealSignRecord.setPositionYorg(positionY+90);
                                                 }
                                             }
                                         }

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

@@ -48,7 +48,9 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
             if (arbitratMethod == 2){
                 caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
                 //修改案件状态为待开庭审理
-                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+//                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+                //修改案件状态为待修改开庭时间
+                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
                 // 新增日志
                 CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_OPENCOURT_HEAR,"");
 
@@ -69,7 +71,9 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
 
             }else {
                 //修改案件状态为待开庭审理
-                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+//                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+                //修改案件状态为待修改开庭时间
+                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
                 // 新增日志
                 CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_OPENCOURT_HEAR,"");
 

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java

@@ -161,6 +161,13 @@ public class SignAward {
                 "               \"ORG_LEGALREP\"\n" +
                 "           ]\n" +
                 "       },\n" +
+
+
+                "       \"signConfig\": {\n" +
+                "           \"availableSignClientTypes\":  \"1\"\n" +
+                "       },\n" +
+
+
                 "        \"autoFinish\": true\n" +
                 "    },\n" +
 
@@ -258,6 +265,9 @@ public class SignAward {
 
         String apiaddr = "/v3/sign-flow/" + signFlowId + "/sign-url";
         String jsonParm = "{\n" +
+
+                "    \"clientType\": \"PC\",\n" +
+
                 "    \"operator\": {\n" +
                 "        \"psnAccount\": \"" + psnAccount +  "\"\n" +
                 "    }\n" +