Просмотр исходного кода

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

qtz 2 лет назад
Родитель
Сommit
6c9a09f29a

+ 6
- 7
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Просмотреть файл

1873
     public AjaxResult arbitratorCheckArbitrateRecord(CaseApplication caseApplication) {
1873
     public AjaxResult arbitratorCheckArbitrateRecord(CaseApplication caseApplication) {
1874
         // 同意后状态改为待部门长审核仲裁文书(CHECK_ARBITRATION = 12),拒绝改为待秘书核验仲裁文书(VERPRIF_ARBITRATION = 11)
1874
         // 同意后状态改为待部门长审核仲裁文书(CHECK_ARBITRATION = 12),拒绝改为待秘书核验仲裁文书(VERPRIF_ARBITRATION = 11)
1875
         int rows = 0;
1875
         int rows = 0;
1876
-        ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
1877
-        if(arbitrateRecord.getId()!=null){
1878
-            arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
1879
-        }else {
1880
-            arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
1881
-        }
1882
-
1883
         Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
1876
         Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
1884
         if (agreeOrNotCheck.intValue() == 1) {
1877
         if (agreeOrNotCheck.intValue() == 1) {
1885
             caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION);
1878
             caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION);
1888
             // 新增日志
1881
             // 新增日志
1889
             insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION, "");
1882
             insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION, "");
1890
         } else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核
1883
         } else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核
1884
+            ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
1885
+            if(arbitrateRecord.getId()!=null){
1886
+                arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
1887
+            }else {
1888
+                arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
1889
+            }
1891
             caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
1890
             caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
1892
 
1891
 
1893
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
1892
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);