【DAOP-1.0】企业认证

【功能点】测试问题处理

 package com.csbr.qingcloud.portal.controller;
 package com.csbr.qingcloud.portal.controller;
 
 
 import com.csbr.cloud.common.response.CommonRes;
 import com.csbr.cloud.common.response.CommonRes;
-import com.csbr.qingcloud.portal.domain.vo.ChangeApproveVO;
+import com.csbr.qingcloud.portal.domain.vo.*;
 import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
 import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
 import csbr.cloud.entity.annotation.SystemLog;
 import csbr.cloud.entity.annotation.SystemLog;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
-import com.csbr.qingcloud.portal.domain.vo.EnterpriseQueryVO;
-import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO;
-import com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO;
 import com.csbr.qingcloud.portal.service.EnterpriseService;
 import com.csbr.qingcloud.portal.service.EnterpriseService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -96,6 +93,14 @@ public class EnterpriseController {
         return CommonRes.success(true);
         return CommonRes.success(true);
     }
     }
 
 
+    @PostMapping("/move-old-data")
+    @SystemLog(value = "将此账号提交的数据需求迁移到新的企业")
+    @Operation(summary = "将此账号提交的数据需求迁移到新的企业", hidden = true)
+    public CommonRes<Boolean> moveOldData(@RequestBody @Valid TenantRQVO vo) {
+        enterpriseService.moveOldData(vo);
+        return CommonRes.success(true);
+    }
+    
     //endregion
     //endregion
 
 
     //region 变更申请
     //region 变更申请

 package com.csbr.qingcloud.portal.service;
 package com.csbr.qingcloud.portal.service;
 
 
-import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
-import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO;
+import com.csbr.qingcloud.portal.domain.vo.*;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
-import com.csbr.qingcloud.portal.domain.vo.EnterpriseQueryVO;
-import com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -77,4 +74,7 @@ public interface EnterpriseService {
     List<ChangeInfoVO> getChange(String tenantName);
     List<ChangeInfoVO> getChange(String tenantName);
 
 
     EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
     EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
+
+    /** 将此账号提交的数据需求迁移到新的企业 */
+    void moveOldData(TenantRQVO vo);
 }
 }

@@ -409,9 +409,6 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
             vo.setPersonIncharge(entity.getJuridicalPerson());
             vo.setPersonIncharge(entity.getJuridicalPerson());
             vo.setBizState("Y");
             vo.setBizState("Y");
             vo = personelFeign.authTenant(vo).getData();
             vo = personelFeign.authTenant(vo).getData();
-
-            //将此账号提交的数据需求迁移到新的企业
-            moveDemand(entity,vo);
         }
         }
         // 同步更新审批状态
         // 同步更新审批状态
         LambdaUpdateWrapper<MfEnterprise> updateWrapper = new LambdaUpdateWrapper<>();
         LambdaUpdateWrapper<MfEnterprise> updateWrapper = new LambdaUpdateWrapper<>();
@@ -424,9 +421,11 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     }
     }
 
 
     /** 将此账号提交的数据需求迁移到新的企业 */
     /** 将此账号提交的数据需求迁移到新的企业 */
-    private void moveDemand(MfEnterprise entity,TenantRQVO vo){
+    @Override
+    @Transactional
+    public void moveOldData(TenantRQVO vo){
         LambdaQueryWrapper<MfDemand> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<MfDemand> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(MfDemand::getCreateUserId, entity.getCreateUserId());
+        queryWrapper.eq(MfDemand::getRequirementUnit, 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)){