Преглед на файлове

撤销申诉时逻辑删除申诉审批记录

songxinlu преди 3 години
родител
ревизия
24c10ab2bd
променени са 1 файла, в които са добавени 11 реда и са изтрити 5 реда
  1. 11 5
      report-service/src/main/java/com/lantone/report/facade/MedAppealInfoManagementFacade.java

+ 11 - 5
report-service/src/main/java/com/lantone/report/facade/MedAppealInfoManagementFacade.java

@@ -347,17 +347,23 @@ public class MedAppealInfoManagementFacade {
                     .eq(appealInfo.getCasesEntryId() != null, "cases_entry_id", appealInfo.getCasesEntryId())
                     .eq("is_deleted", IsDeleteEnum.Y.getKey())
                     .orderByDesc("gmt_create"));
-            //逻辑删除该申诉(撤回)
-            appealInfo.setIsDeleted(IsDeleteEnum.Y.getKey());
-            appealInfo.setWorkFlowNodeId(cancelAppealInfoVO.getWorkFlowNodeId());
-            appealInfo.setGmtModified(DateUtil.now());
-            Boolean out = appealInfoFacade.updateById(appealInfo);
             //存在历史记录还原最后一条
             if (ListUtil.isNotEmpty(appealInfoHistory)) {
                 AppealInfo appealInfoOld = appealInfoHistory.get(0);
                 appealInfoOld.setIsDeleted(IsDeleteEnum.N.getKey());
                 return appealInfoFacade.saveOrUpdate(appealInfoOld);
             }
+            //逻辑删除该申诉(撤回)
+            appealInfo.setIsDeleted(IsDeleteEnum.Y.getKey());
+            appealInfo.setWorkFlowNodeId(cancelAppealInfoVO.getWorkFlowNodeId());
+            appealInfo.setGmtModified(DateUtil.now());
+            Boolean out = appealInfoFacade.updateById(appealInfo);
+            if(out){
+                //逻辑删除申诉申请审批记录
+                appealExamineInfoFacade.update(new UpdateWrapper<AppealExamineInfo>()
+                        .eq("appeal_info_id",appealInfo.getId())
+                        .set("is_deleted",IsDeleteEnum.N.getKey()));
+            }
             return out;
         } else {
             Asserts.fail2("撤回申诉条目状态不是申诉状态");