From 3d36f05cf92ea54b8a0b38f644c675184223d0a4 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Fri, 20 Oct 2023 14:47:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=81=E5=AE=9A=EF=BC=8C=E8=A7=A3=E9=94=81?= =?UTF-8?q?=E6=A1=88=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomarbitrate/CaseApplicationController.java | 13 +++++++++++++ .../wisdomarbitrate/domain/CaseApplication.java | 12 ++++++++++++ .../mapper/CaseApplicationMapper.java | 8 ++++++++ .../service/ICaseApplicationService.java | 7 +++++++ .../service/impl/CaseApplicationServiceImpl.java | 5 +++++ .../service/impl/CaseLogRecordServiceImpl.java | 3 ++- .../wisdomarbitrate/CaseApplicationMapper.xml | 13 +++++++++++-- 7 files changed, 58 insertions(+), 3 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 02c5e01..f941437 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 @@ -296,5 +296,18 @@ public class CaseApplicationController extends BaseController { public AjaxResult creatTrialRecord(@Validated @RequestBody ArbitrateRecord arbitrateRecord){ return caseApplicationService.creatTrialRecord(arbitrateRecord); } + /** + * 案件锁定或者解锁 + * @param caseApplication + * @return + */ + @PostMapping("/updateCaseLockStatus") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:creatTrialRecord')") + public AjaxResult updateCaseLockStatus(@Validated @RequestBody CaseApplication caseApplication){ + if(caseApplication.getId()==null || caseApplication.getLockStatus()==null){ + return error("参数校验失败"); + } + return AjaxResult.success(caseApplicationService.updateCaseLockStatus(caseApplication)); + } } 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 185968e..24c2251 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 @@ -235,6 +235,18 @@ public class CaseApplication extends BaseEntity { private List payOrderList; // 导入校验失败信息 private StringBuilder errorMsg; + /** + * 是否锁定，0-否，1-是 + */ + private Integer lockStatus; + + public Integer getLockStatus() { + return lockStatus; + } + + public void setLockStatus(Integer lockStatus) { + this.lockStatus = lockStatus; + } public Integer getPayTypeCode() { return payTypeCode; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java index b2a5ff9..d63145e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java @@ -60,4 +60,12 @@ public interface CaseApplicationMapper { ToDoCount selectTodoCountByRole(CaseApplication caseApplication); + + /** + * 修改案件锁定状态 + * @param id + * @param lockStatus + * @return + */ + int updateCaseLockStatus(@Param("id")Long id,@Param("lockStatus") Integer lockStatus); } 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 78808bf..3e1e289 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 @@ -64,4 +64,11 @@ public interface ICaseApplicationService { AjaxResult selectCaseProgress(CaseApplication caseApplication); int updateHeardate(CaseApplication caseApplication); + + /** + * 修改案件锁定状态 + * @param caseApplication + * @return + */ + int updateCaseLockStatus(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 968d2bf..0e7c2f8 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 @@ -241,6 +241,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { return rows; } + @Override + public int updateCaseLockStatus(CaseApplication caseApplication) { + return caseApplicationMapper.updateCaseLockStatus(caseApplication.getId(),caseApplication.getLockStatus()); + } + private List getNofinishCasenode(Integer caseStatus) { CaseLogRecord caseLogRecord1 = new CaseLogRecord(); caseLogRecord1.setCaseNodeName("立案审查"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java index 30356f2..3305363 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; @Service public class CaseLogRecordServiceImpl implements ICaseLogRecordService { @@ -29,7 +30,7 @@ public class CaseLogRecordServiceImpl implements ICaseLogRecordService { caseNodeTime= DateUtil.format(record.getCaseNodeTime(), DatePattern.NORM_DATETIME_FORMATTER); } - contentBuilder.append(record.getCreateNickName()).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime); + contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime); if(StrUtil.isNotEmpty(record.getContent())){ contentBuilder.append(record.getContent()); } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 105cacf..bdf2161 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -74,7 +74,7 @@ c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time , c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name as applicantName, - c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url + c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status from case_application c LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id @@ -90,6 +90,9 @@ #{caseStatus} + + AND c.lock_status = #{lockStatus} + ) t @@ -238,7 +241,7 @@ END caseStatusName, c.hear_date ,c.arbitrat_claims , c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable , - c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time , + c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status, c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url from case_application c LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1 @@ -246,6 +249,9 @@ AND c.case_status = #{caseStatus} + + AND c.lock_status = #{lockStatus} + AND c.case_num = #{caseNum} @@ -438,6 +444,9 @@ update case_application set pay_type=#{payType} where id = #{caseId} + + update case_application set lock_status=#{lockStatus} where id = #{id} + delete from case_application where id = #{id}