From 293dd52e8c21ac34a3369bccdac6ff8deb616773 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Mon, 8 Jan 2024 14:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A1=88=E4=BB=B6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/wisdomarbitrate/domain/CaseApplication.java | 1 + .../service/impl/AdjudicationServiceImpl.java | 1 + .../service/impl/CaseApplicationServiceImpl.java | 6 ++++++ .../service/impl/CaseArbitrateServiceImpl.java | 1 + .../mapper/wisdomarbitrate/CaseApplicationMapper.xml | 7 +++++++ 5 files changed, 16 insertions(+) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index 313cc73..b514c80 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -50,6 +50,7 @@ public class CaseApplication extends BaseEntity { /** 案件状态 */ private Integer caseStatus; + private String caseStatusstr; /** 申请人是否书面审理 */ private Integer applicantIsWrittenHear; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index b27883a..3afe6b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -610,6 +610,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } //修改案件状态 caseApplicationById.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION); + caseApplicationById.setLockStatus(1); caseApplicationMapper.submitCaseApplication(caseApplicationById); } 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 7005ca1..7771695 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 @@ -409,6 +409,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { public int updateHeardate(CaseApplication caseApplication) { // caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + caseApplication.setLockStatus(1); int rows = caseApplicationMapper.submitCaseApplication(caseApplication); //1975139 修改开庭时间通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已改为{3}，请知晓，如非本人操作，请忽略本短信 //发送短信通知 @@ -1706,6 +1707,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(",")); caseApplication.setArbitratorId(idstr); caseApplication.setArbitratorName(arbitratorNamestr); + caseApplication.setLockStatus(1); rows = caseApplicationMapper.submitCaseApplication(caseApplication); } } else { @@ -1718,6 +1720,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(",")); caseApplication.setArbitratorId(idstr); caseApplication.setArbitratorName(arbitratorNamestr); + caseApplication.setLockStatus(1); rows = caseApplicationMapper.submitCaseApplication(caseApplication); } } @@ -2571,7 +2574,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { List caseStatussnew = caseStatuss.stream().distinct().collect(Collectors.toList()); List caseStatusNamesnew = caseStatusNames.stream().distinct().collect(Collectors.toList()); String caseStatusName = caseStatusNamesnew.stream().map(Object::toString).collect(Collectors.joining(",")); + String caseStatusstr = caseStatussnew.stream().map(Object::toString).collect(Collectors.joining(",")); caseApplicationselect.setCaseStatusName(caseStatusName); + caseApplicationselect.setCaseStatusstr(caseStatusstr); } } } @@ -3253,6 +3258,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { // caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); + caseApplication.setLockStatus(1); Integer isAgreePendTral = caseApplication.getIsAgreePendTral(); int rows = 0; //同意组庭 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 a0f3e34..1737806 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 @@ -123,6 +123,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { } } + caseApplication1.setLockStatus(1); int i = caseApplicationMapper.submitCaseApplication(caseApplication1); if (i > 0) { String arbitratMethodStr = caseApplication1.getArbitratMethod() == 1 ? "开庭审理" : "书面审理"; diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index b5652c9..d3e063a 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -492,6 +492,9 @@ AND t1.case_num = #{caseNum} + + AND t1.batch_number = #{batchNumber} + AND t1.application_organ_id=#{nameId} AND t1.identity_type=1 @@ -841,6 +844,9 @@ AND c.case_num = #{caseNum} + + AND c.batch_number = #{batchNumber} + AND ca.application_organ_id=#{nameId} AND ca.identity_type=1 @@ -1141,6 +1147,7 @@ objecti_juris = #{objectiJuris}, is_absence = #{isAbsence}, + lock_status = #{lockStatus}, appli_is_absen = #{appliIsAbsen}, respon_cross_opin = #{responCrossOpin}, applica_cross_opin = #{applicaCrossOpin}, -- 2.54.0