SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit was merged in pull request #306.
This commit is contained in:
qtz
2023-12-13 11:46:48 +08:00
committed by Gitea
parent d69b959534 2787aa38c6
commit 6c9a09f29a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+6 -7
View File
@@ -1873,13 +1873,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
public AjaxResult arbitratorCheckArbitrateRecord(CaseApplication caseApplication) { public AjaxResult arbitratorCheckArbitrateRecord(CaseApplication caseApplication) {
// 同意后状态改为待部门长审核仲裁文书（CHECK_ARBITRATION = 12），拒绝改为待秘书核验仲裁文书（VERPRIF_ARBITRATION = 11） // 同意后状态改为待部门长审核仲裁文书（CHECK_ARBITRATION = 12），拒绝改为待秘书核验仲裁文书（VERPRIF_ARBITRATION = 11）
int rows = 0; int rows = 0;
ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
if(arbitrateRecord.getId()!=null){
arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
}else {
arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
}
Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck(); Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
if (agreeOrNotCheck.intValue() == 1) { if (agreeOrNotCheck.intValue() == 1) {
caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION); caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION);
@@ -1888,6 +1881,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
// 新增日志 // 新增日志
insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION, ""); insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION, "");
} else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核 } else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核
ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
if(arbitrateRecord.getId()!=null){
arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
}else {
arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
}
caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION); caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
rows = caseApplicationMapper.submitCaseApplication(caseApplication); rows = caseApplicationMapper.submitCaseApplication(caseApplication);