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 61b603e..f3f7a7c 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 @@ -324,7 +324,7 @@ public class CaseApplicationController extends BaseController { if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getAgreeOrNotCheck()==null){ return error("参数校验失败"); } - return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck())); + return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getRejectReason())); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java index 950c487..eed8844 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java @@ -57,6 +57,19 @@ public class ArbitrateRecord extends BaseEntity { */ private String applicantOpinion; + /** + * 立案审查驳回原因 + */ + private String caseCheckReject; + /** + * 仲裁员确认裁决书驳回 + */ + private String arbitrateReject; + /** + * 部门长确认裁决书驳回 + */ + private String deptorReject; + diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java index b881187..3e616b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java @@ -20,4 +20,6 @@ public class BatchCaseApplication { * 1同意,0拒绝 */ private Integer opinion; + /** 驳回原因 */ + private String rejectReason; } 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 47044a5..b74ae4b 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 @@ -45,7 +45,7 @@ public interface ICaseApplicationService { AjaxResult checkArbitrateRecord(CaseApplication caseApplication); - int submitCaseApplicationCheck(List ids, Integer agreeOrNotCheck); + int submitCaseApplicationCheck(List ids, Integer agreeOrNotCheck,String rejectReason); CaseApplication selectCaseApplicationConfirm(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 1a214ff..9bd4ce6 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 @@ -2230,7 +2230,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override @Transactional - public int submitCaseApplicationCheck(List ids, Integer agreeOrNotCheck) { + public int submitCaseApplicationCheck(List ids, Integer agreeOrNotCheck,String rejectReason) { //提交立案审查 int rows = 0; for (Long id : ids) { @@ -2243,6 +2243,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } else if (agreeOrNotCheck == 2) {//拒绝审核 caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION); rows += caseApplicationMapper.submitCaseApplication(caseApplication); + ArbitrateRecord arbitrateRecordsel = new ArbitrateRecord(); + arbitrateRecordsel.setCaseAppliId(id); + ArbitrateRecord arbitrateRecordnew = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecordsel); + arbitrateRecordnew.setCaseCheckReject(rejectReason); + arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordnew); + } // 新增日志 insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_PAYMENT, ""); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml index f1bab8c..e4f82ac 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml @@ -74,6 +74,9 @@ case_facts = #{caseFacts}, respondent_opinion = #{respondentOpinion}, applicant_opinion = #{applicantOpinion}, + case_check_reject = #{caseCheckReject}, + arbitrate_reject = #{arbitrateReject}, + deptor_reject = #{deptorReject}, update_time = sysdate() where id = #{id} @@ -82,7 +85,8 @@