【DAOP-1.0】数据需求

【功能点】测试问题处理

@@ -184,8 +184,11 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         MfDemand entity = convertToEntity(rqVO);
         // 发起审批流程或保存草稿
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
-        super.restartWorkFlow(rqVO, oldEntity.getBizApproveState(), approvalDTO, this::saveDemand, entity::setBizApproveState);
-        if(!rqVO.getIsRestart()){
+        super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
+        if (rqVO.getIsRestart()) {
+            // 重新提交
+            againSubmitFlow(entity, rqVO, approvalDTO);
+        } else {
             // 修改业务数据
             boolean flag = mfDemandService.updateById(entity);
             if (!flag) {
@@ -197,6 +200,30 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
     }
 
     /**
+     * 重新提交数据需求
+     * @author xcq
+     * @date 2025-02-17 18:16
+     * @param entity
+     * @param rqVO
+     * @param approvalDTO
+     * @return void
+     */
+    private void againSubmitFlow(MfDemand entity, DemandRQVO rqVO, AddApprovalDTO approvalDTO) {
+        // 重新提交的数据重置相关字段
+        entity.setGuid(CommonUtil.newGuid());
+        mfDemandService.csbrBaseEntity(entity);
+        // 保存新数据
+        boolean flag = mfDemandService.save(entity);
+        if (!flag) {
+            throw new CsbrSystemException(SystemError.DATA_ADD_ERROR, messageSourceUtil.addMessage(String.format("重新提交%s",FUNCTION_NAME)));
+        }
+        // 发起新的流程
+        approvalDTO.setGuid(entity.getGuid());
+        approvalFlowUtil.addApproval(approvalDTO);
+        afterSave(entity, rqVO);
+    }
+    
+   /**
     * 数据需求数据删除、并有相关的处理操作
     * @author xcq
     * @date 2024-12-31 18:46

@@ -323,7 +323,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         MfEnterprise entity = convertToEntity(rqVO);
         // 发起审批流程或保存草稿
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
-        super.restartWorkFlow(rqVO, oldEntity.getBizApproveState(), approvalDTO, this::saveEnterprise, entity::setBizApproveState);
+        super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
         if(!rqVO.getIsRestart()){
             // 修改业务数据
             boolean flag = mfEnterpriseService.updateById(entity);
@@ -336,6 +336,30 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     }
 
     /**
+     * 重新提交企业信息
+     * @author xcq
+     * @date 2024-12-26 16:18
+     * @param entity
+     * @param rqVO
+     * @param approvalDTO
+     * @return void
+     */
+    private void againSubmitFlow(MfEnterprise entity, EnterpriseRQVO rqVO, AddApprovalDTO approvalDTO) {
+        // 重新提交的数据重置相关字段
+        entity.setGuid(CommonUtil.newGuid());
+        mfEnterpriseService.csbrBaseEntity(entity);
+        // 保存新数据
+        boolean flag = mfEnterpriseService.save(entity);
+        if (!flag) {
+            throw new CsbrSystemException(SystemError.DATA_ADD_ERROR, messageSourceUtil.addMessage(String.format("重新提交%s",FUNCTION_NAME)));
+        }
+        // 发起新的流程
+        approvalDTO.setGuid(entity.getGuid());
+        approvalFlowUtil.addApproval(approvalDTO);
+        afterSave(entity, rqVO);
+    }
+    
+   /**
     * 企业信息数据删除、并有相关的处理操作
     * @author xcq
     * @date 2024-12-26 16:18

@@ -176,7 +176,7 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
         else{
             // 发起审批流程或保存草稿
             AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
-            super.restartWorkFlow(rqVO, oldEntity.getBizApproveState(), approvalDTO, this::saveServicerMaintain, entity::setBizApproveState);
+            super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
             if(!rqVO.getIsRestart()){
                 // 修改业务数据
                 boolean flag = mfServicerMaintainService.updateById(entity);
@@ -190,6 +190,30 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
     }
 
     /**
+     * 重新提交服务商维护
+     * @author xcq
+     * @date 2024-12-31 18:49
+     * @param entity
+     * @param rqVO
+     * @param approvalDTO
+     * @return void
+     */
+    private void againSubmitFlow(MfServicerMaintain entity, ServicerMaintainRQVO rqVO, AddApprovalDTO approvalDTO) {
+        // 重新提交的数据重置相关字段
+        entity.setGuid(CommonUtil.newGuid());
+        mfServicerMaintainService.csbrBaseEntity(entity);
+        // 保存新数据
+        boolean flag = mfServicerMaintainService.save(entity);
+        if (!flag) {
+            throw new CsbrSystemException(SystemError.DATA_ADD_ERROR, messageSourceUtil.addMessage(String.format("重新提交%s",FUNCTION_NAME)));
+        }
+        // 发起新的流程
+        approvalDTO.setGuid(entity.getGuid());
+        approvalFlowUtil.addApproval(approvalDTO);
+        afterSave(entity, rqVO);
+    }
+    
+   /**
     * 服务商维护数据删除、并有相关的处理操作
     * @author xcq
     * @date 2024-12-31 18:49