【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -201,6 +201,9 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         // MfDemand oldEntity = mfDemandService.getById(rqVO.getGuid());
         beforeUpdate(rqVO);
         MfDemand entity = convertToEntity(rqVO);
+        if (rqVO.getIsRestart()) {
+            entity.setGuid(CommonUtil.newGuid());
+        }
         // 发起审批流程或保存草稿
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
@@ -228,8 +231,6 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
      * @return void
      */
     private void againSubmitFlow(MfDemand entity, DemandRQVO rqVO, AddApprovalDTO approvalDTO) {
-        // 重新提交的数据重置相关字段
-        entity.setGuid(CommonUtil.newGuid());
         mfDemandService.csbrBaseEntity(entity);
         // 保存新数据
         boolean flag = mfDemandService.save(entity);

@@ -223,6 +223,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         // MfEnterprise oldEntity = mfEnterpriseService.getById(rqVO.getGuid());
         beforeUpdate(rqVO);
         MfEnterprise entity = convertToEntity(rqVO);
+        if (rqVO.getIsRestart()) {
+            entity.setGuid(CommonUtil.newGuid());
+        }
         // 发起审批流程或保存草稿
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
@@ -250,8 +253,6 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
      * @return void
      */
     private void againSubmitFlow(MfEnterprise entity, EnterpriseRQVO rqVO, AddApprovalDTO approvalDTO) {
-        // 重新提交的数据重置相关字段
-        entity.setGuid(CommonUtil.newGuid());
         mfEnterpriseService.csbrBaseEntity(entity);
         // 保存新数据
         boolean flag = mfEnterpriseService.save(entity);

@@ -164,6 +164,9 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
         MfServicerMaintain oldEntity = mfServicerMaintainService.getById(rqVO.getGuid());
         beforeUpdate(rqVO);
         MfServicerMaintain entity = convertToEntity(rqVO);
+        if (rqVO.getIsRestart()) {
+            entity.setGuid(CommonUtil.newGuid());
+        }
         if("Y".equals(rqVO.getBizApproveState())){
             // 修改业务数据
             boolean flag = mfServicerMaintainService.updateById(entity);
@@ -202,8 +205,6 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
      * @return void
      */
     private void againSubmitFlow(MfServicerMaintain entity, ServicerMaintainRQVO rqVO, AddApprovalDTO approvalDTO) {
-        // 重新提交的数据重置相关字段
-        entity.setGuid(CommonUtil.newGuid());
         mfServicerMaintainService.csbrBaseEntity(entity);
         // 保存新数据
         boolean flag = mfServicerMaintainService.save(entity);