【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -444,15 +444,6 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         if (entity == null) {
         if (entity == null) {
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(FUNCTION_NAME));
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(FUNCTION_NAME));
         }
         }
-        if (ApprovalStateEnum.PASSED.getValue().equals(dto.getApprovalState())) {
-            //删除原帐号并新增正式会员
-            TenantRQVO vo = csbrBeanUtil.convert(entity,TenantRQVO.class);
-            vo.setTenantType(null);
-            vo.setGuid(CommonUtil.newGuid());
-            vo.setPersonIncharge(entity.getJuridicalPerson());
-            vo.setBizState("Y");
-            vo = personelFeign.authTenant(vo).getData();
-        }
         // 同步更新审批状态
         // 同步更新审批状态
         LambdaUpdateWrapper<MfEnterprise> updateWrapper = new LambdaUpdateWrapper<>();
         LambdaUpdateWrapper<MfEnterprise> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(MfEnterprise::getBizApproveState, dto.getApprovalState());
         updateWrapper.set(MfEnterprise::getBizApproveState, dto.getApprovalState());
@@ -461,6 +452,23 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         if (!flag) {
         if (!flag) {
             throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, messageSourceUtil.updateMessage(String.format("%s的业务审批状态", FUNCTION_NAME)));
             throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, messageSourceUtil.updateMessage(String.format("%s的业务审批状态", FUNCTION_NAME)));
         }
         }
+        if (ApprovalStateEnum.PASSED.getValue().equals(dto.getApprovalState())) {
+            //删除原帐号并新增正式会员
+            TenantRQVO vo = csbrBeanUtil.convert(entity,TenantRQVO.class);
+            vo.setTenantType(null);
+            vo.setGuid(CommonUtil.newGuid());
+            vo.setPersonIncharge(entity.getJuridicalPerson());
+            vo.setBizState("Y");
+            try{
+                vo = personelFeign.authTenant(vo).getData();
+            }catch (Exception e){
+                if(!e.getMessage().contains("Read timed out")){
+                    throw e;
+                }
+            }
+
+        }
+
     }
     }
 
 
     /** 将此账号提交的数据需求迁移到新的企业 */
     /** 将此账号提交的数据需求迁移到新的企业 */
@@ -468,7 +476,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void moveOldData(TenantRQVO vo){
     public void moveOldData(TenantRQVO vo){
         LambdaQueryWrapper<MfDemand> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<MfDemand> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(MfDemand::getRequirementUnit, vo.getTenantName());
+        queryWrapper.eq(MfDemand::getCreateUserName, vo.getTenantName());
         mfDemandService.csbrExcludeShardingLambdaQueryWrapper(queryWrapper);
         mfDemandService.csbrExcludeShardingLambdaQueryWrapper(queryWrapper);
         List<MfDemand> list = mfDemandService.list(queryWrapper);
         List<MfDemand> list = mfDemandService.list(queryWrapper);
         if(CollectionUtils.isEmpty(list)){
         if(CollectionUtils.isEmpty(list)){