【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -201,9 +201,6 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         // MfDemand oldEntity = mfDemandService.getById(rqVO.getGuid());
         // MfDemand oldEntity = mfDemandService.getById(rqVO.getGuid());
         beforeUpdate(rqVO);
         beforeUpdate(rqVO);
         MfDemand entity = convertToEntity(rqVO);
         MfDemand entity = convertToEntity(rqVO);
-        if (rqVO.getIsRestart()) {
-            entity.setGuid(CommonUtil.newGuid());
-        }
         // 发起审批流程或保存草稿
         // 发起审批流程或保存草稿
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
         super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
@@ -231,6 +228,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
      * @return void
      * @return void
      */
      */
     private void againSubmitFlow(MfDemand entity, DemandRQVO rqVO, AddApprovalDTO approvalDTO) {
     private void againSubmitFlow(MfDemand entity, DemandRQVO rqVO, AddApprovalDTO approvalDTO) {
+        entity.setGuid(CommonUtil.newGuid());
         mfDemandService.csbrBaseEntity(entity);
         mfDemandService.csbrBaseEntity(entity);
         // 保存新数据
         // 保存新数据
         boolean flag = mfDemandService.save(entity);
         boolean flag = mfDemandService.save(entity);
@@ -239,6 +237,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         }
         }
         // 发起新的流程
         // 发起新的流程
         approvalDTO.setBizGuid(entity.getGuid());
         approvalDTO.setBizGuid(entity.getGuid());
+        approvalDTO.setUrlParam(String.format("guid=%s&name=%s",entity.getGuid(),entity.getDataDemandName()));
         approvalFlowUtil.addApproval(approvalDTO);
         approvalFlowUtil.addApproval(approvalDTO);
         afterSave(entity, rqVO);
         afterSave(entity, rqVO);
     }
     }

@@ -227,9 +227,6 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         // MfEnterprise oldEntity = mfEnterpriseService.getById(rqVO.getGuid());
         // MfEnterprise oldEntity = mfEnterpriseService.getById(rqVO.getGuid());
         beforeUpdate(rqVO);
         beforeUpdate(rqVO);
         MfEnterprise entity = convertToEntity(rqVO);
         MfEnterprise entity = convertToEntity(rqVO);
-        if (rqVO.getIsRestart()) {
-            entity.setGuid(CommonUtil.newGuid());
-        }
         // 发起审批流程或保存草稿
         // 发起审批流程或保存草稿
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
         super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
@@ -257,6 +254,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
      * @return void
      * @return void
      */
      */
     private void againSubmitFlow(MfEnterprise entity, EnterpriseRQVO rqVO, AddApprovalDTO approvalDTO) {
     private void againSubmitFlow(MfEnterprise entity, EnterpriseRQVO rqVO, AddApprovalDTO approvalDTO) {
+        entity.setGuid(CommonUtil.newGuid());
         mfEnterpriseService.csbrBaseEntity(entity);
         mfEnterpriseService.csbrBaseEntity(entity);
         // 保存新数据
         // 保存新数据
         boolean flag = mfEnterpriseService.save(entity);
         boolean flag = mfEnterpriseService.save(entity);
@@ -265,6 +263,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         }
         }
         // 发起新的流程
         // 发起新的流程
         approvalDTO.setBizGuid(entity.getGuid());
         approvalDTO.setBizGuid(entity.getGuid());
+        RedisStaffPOJO staffPOJO = redisUtil.getRedisStaff();
+        approvalDTO.setUrlParam(String.format("guid=%s&name=%s&tName=%s&fType=%s&bizGuid=%s",entity.getGuid(), entity.getTenantName(),
+                staffPOJO.getTenantName(),WorkFlowBizEnum.ENTERPRISE_APPLY.getValue(),entity.getGuid()));
         approvalFlowUtil.addApproval(approvalDTO);
         approvalFlowUtil.addApproval(approvalDTO);
         afterSave(entity, rqVO);
         afterSave(entity, rqVO);
     }
     }

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