From 05e70343a87c6f97452fd9695f67859bb1bc5c51 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Fri, 20 Oct 2023 14:13:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BF=AE=E6=94=B9=E5=BC=80?= =?UTF-8?q?=E5=BA=AD=E6=97=B6=E9=97=B4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 9 +++++++++ .../common/constant/CaseApplicationConstants.java | 3 +++ .../service/ICaseApplicationService.java | 2 ++ .../service/impl/CaseApplicationServiceImpl.java | 15 +++++++++++++-- .../service/impl/CaseArbitrateServiceImpl.java | 8 ++++++-- .../ruoyi/wisdomarbitrate/utils/SignAward.java | 10 ++++++++++ 6 files changed, 43 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index 012502c..02c5e01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/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)); + } + /** * 核验裁决书 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java index d4bcb6e..33cb946 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java +++ b/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; + diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java index fdbc8c9..78808bf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java +++ b/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); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 6018ee4..968d2bf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/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 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); } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java index 5e59301..ca28030 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java +++ b/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,""); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java index 3b0a8dd..70a00d7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java +++ b/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" + -- 2.54.0