【DAOP-1.0】数据需求

【功能点】测试问题处理

@@ -185,13 +185,15 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         // 发起审批流程或保存草稿
         // 发起审批流程或保存草稿
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
         super.restartWorkFlow(rqVO, oldEntity.getBizApproveState(), approvalDTO, this::saveDemand, entity::setBizApproveState);
         super.restartWorkFlow(rqVO, oldEntity.getBizApproveState(), approvalDTO, this::saveDemand, entity::setBizApproveState);
-        // 修改业务数据
-        boolean flag = mfDemandService.updateById(entity);
-        if (!flag) {
-            throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, rqVO.getImmediateApprove() ?
-                    messageSourceUtil.submitMessage(FUNCTION_NAME) : messageSourceUtil.updateMessage(FUNCTION_NAME));
+        if(!rqVO.getIsRestart()){
+            // 修改业务数据
+            boolean flag = mfDemandService.updateById(entity);
+            if (!flag) {
+                throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, rqVO.getImmediateApprove() ?
+                        messageSourceUtil.submitMessage(FUNCTION_NAME) : messageSourceUtil.updateMessage(FUNCTION_NAME));
+            }
+            afterUpdate(entity, rqVO);
         }
         }
-        afterUpdate(entity, rqVO);
     }
     }
     
     
    /**
    /**

@@ -324,13 +324,15 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         // 发起审批流程或保存草稿
         // 发起审批流程或保存草稿
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
         super.restartWorkFlow(rqVO, oldEntity.getBizApproveState(), approvalDTO, this::saveEnterprise, entity::setBizApproveState);
         super.restartWorkFlow(rqVO, oldEntity.getBizApproveState(), approvalDTO, this::saveEnterprise, entity::setBizApproveState);
-        // 修改业务数据
-        boolean flag = mfEnterpriseService.updateById(entity);
-        if (!flag) {
-            throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, rqVO.getImmediateApprove() ?
-                    messageSourceUtil.submitMessage(FUNCTION_NAME) : messageSourceUtil.updateMessage(FUNCTION_NAME));
+        if(!rqVO.getIsRestart()){
+            // 修改业务数据
+            boolean flag = mfEnterpriseService.updateById(entity);
+            if (!flag) {
+                throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, rqVO.getImmediateApprove() ?
+                        messageSourceUtil.submitMessage(FUNCTION_NAME) : messageSourceUtil.updateMessage(FUNCTION_NAME));
+            }
+            afterUpdate(entity, rqVO);
         }
         }
-        afterUpdate(entity, rqVO);
     }
     }
     
     
    /**
    /**

@@ -177,13 +177,15 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
             // 发起审批流程或保存草稿
             // 发起审批流程或保存草稿
             AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
             AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
             super.restartWorkFlow(rqVO, oldEntity.getBizApproveState(), approvalDTO, this::saveServicerMaintain, entity::setBizApproveState);
             super.restartWorkFlow(rqVO, oldEntity.getBizApproveState(), approvalDTO, this::saveServicerMaintain, entity::setBizApproveState);
-            // 修改业务数据
-            boolean flag = mfServicerMaintainService.updateById(entity);
-            if (!flag) {
-                throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, rqVO.getImmediateApprove() ?
-                        messageSourceUtil.submitMessage(FUNCTION_NAME) : messageSourceUtil.updateMessage(FUNCTION_NAME));
+            if(!rqVO.getIsRestart()){
+                // 修改业务数据
+                boolean flag = mfServicerMaintainService.updateById(entity);
+                if (!flag) {
+                    throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, rqVO.getImmediateApprove() ?
+                            messageSourceUtil.submitMessage(FUNCTION_NAME) : messageSourceUtil.updateMessage(FUNCTION_NAME));
+                }
+                afterUpdate(entity, rqVO);
             }
             }
-            afterUpdate(entity, rqVO);
         }
         }
     }
     }