【数据资产】

1、认证变更跨平台审批

@@ -210,6 +210,9 @@ public class EnterpriseRSVO {
 
     @Schema(description = "变更信息列表")
     private List<ChangeInfoVO> changeList;
+
+    @Schema(description = "变更前信息列表")
+    private List<ChangeInfoVO> beforeChangeList;
     
     /******** 子对象 *****/
     

@@ -89,6 +89,8 @@ public interface EnterpriseService {
 
     List<ChangeInfoVO> getChange(String sourceGuid, Date createTime);
 
+    List<ChangeInfoVO> beforeChangeList(Date createTime);
+
     EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
 
     /** 将此账号提交的数据需求迁移到新的企业 */

@@ -13,6 +13,7 @@ import com.csbr.cloud.common.util.MessageSourceUtil;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.util.ApprovalFlowUtil;
 import com.csbr.qingcloud.portal.domain.vo.ChangeApproveVO;
+import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
 import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO;
 import com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO;
 import com.csbr.qingcloud.portal.feign.ConfigureFeign;
@@ -36,9 +37,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * @program: ms-hc-customer-service
@@ -303,6 +302,9 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
 
         //生成变更信息
         vo.setChangeList(enterpriseService.getChange(entity.getSourceGuid(), entity.getCreateTime()));
+
+        // 生成变更前的数据
+        vo.setBeforeChangeList(enterpriseService.beforeChangeList(entity.getCreateTime()));
         return vo;
     }
 

@@ -224,6 +224,27 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     }
 
     @Override
+    public List<ChangeInfoVO> beforeChangeList(Date createTime){
+        LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MfEnterpriseChangeApprove::getCreateTime, createTime);
+        queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
+        List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
+        if(CollectionUtils.isEmpty(approveList)){
+            return new ArrayList<>();
+        }
+        List<EnterpriseServiceImpl.ChangeApproveBean> beanList = getChangeBeanList(approveList);
+        try {
+            if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
+                ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData();
+            }
+            return ChangeInfoUtil.getChangeList(beanList);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
     public EnterpriseRSVO getEnterpriseDetailByName(String tenantName) {
         LambdaQueryWrapper<MfEnterprise> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MfEnterprise::getTenantName,tenantName);