【数据资产】

1、认证变更跨平台审批

 package com.csbr.qingcloud.portal.mybatis.service.impl;
 package com.csbr.qingcloud.portal.mybatis.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl;
 import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
 import com.csbr.qingcloud.portal.mybatis.mapper.MfEnterpriseChangeApproveMapper;
 import com.csbr.qingcloud.portal.mybatis.mapper.MfEnterpriseChangeApproveMapper;
 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
 /**
 /**
  * @program: D:/git/ms-data-circulation-portal-service
  * @program: D:/git/ms-data-circulation-portal-service
  * @description: 企业信息变更审批逻辑层接口实现
  * @description: 企业信息变更审批逻辑层接口实现
@@ -19,4 +26,12 @@ public class MfEnterpriseChangeApproveServiceImpl extends CsbrServiceImpl<MfEnte
     @Resource
     @Resource
     private MfEnterpriseChangeApproveMapper mfEnterpriseChangeApproveMapper;
     private MfEnterpriseChangeApproveMapper mfEnterpriseChangeApproveMapper;
 
 
+    @Override
+    public List<MfEnterpriseChangeApprove> listByIds(Collection<? extends Serializable> idList) {
+        LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = Wrappers.lambdaQuery(MfEnterpriseChangeApprove.class);
+        queryWrapper.in(MfEnterpriseChangeApprove::getGuid, idList);
+        csbrExcludeShardingLambdaQueryWrapper(queryWrapper);
+        return list(queryWrapper);
+    }
+    
 }
 }

@@ -155,18 +155,18 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
             for (ApproveVO approveVO : approveVOList) {
             for (ApproveVO approveVO : approveVOList) {
                 // 补跨服务审批状态数据
                 // 补跨服务审批状态数据
                 EnterpriseApproveRSVO enterpriseApproveRSVO = csbrBeanUtil.convert(approveVO, EnterpriseApproveRSVO.class);
                 EnterpriseApproveRSVO enterpriseApproveRSVO = csbrBeanUtil.convert(approveVO, EnterpriseApproveRSVO.class);
-                if (ObjectUtils.isNotEmpty(mfEnterpriseMap) && mfEnterpriseMap.containsKey(enterpriseApproveRSVO.getBizGuid())) {
-                    MfEnterprise mfEnterprise = mfEnterpriseMap.get(enterpriseApproveRSVO.getBizGuid());
-                    enterpriseApproveRSVO.setCrossPlatformApproveState(mfEnterprise.getCrossPlatformApproveState());
-                    enterpriseApproveRSVO.setZqName(mfEnterprise.getZqName());
-                    enterpriseApproveRSVO.setTenantName(mfEnterprise.getTenantName());
-                }
                 if (ObjectUtils.isNotEmpty(mfEnterpriseChangeApproveMap) && mfEnterpriseChangeApproveMap.containsKey(enterpriseApproveRSVO.getBizGuid())) {
                 if (ObjectUtils.isNotEmpty(mfEnterpriseChangeApproveMap) && mfEnterpriseChangeApproveMap.containsKey(enterpriseApproveRSVO.getBizGuid())) {
                     MfEnterpriseChangeApprove mfEnterpriseChangeApprove = mfEnterpriseChangeApproveMap.get(enterpriseApproveRSVO.getBizGuid());
                     MfEnterpriseChangeApprove mfEnterpriseChangeApprove = mfEnterpriseChangeApproveMap.get(enterpriseApproveRSVO.getBizGuid());
                     enterpriseApproveRSVO.setCrossPlatformApproveState(mfEnterpriseChangeApprove.getCrossPlatformApproveState());
                     enterpriseApproveRSVO.setCrossPlatformApproveState(mfEnterpriseChangeApprove.getCrossPlatformApproveState());
                     enterpriseApproveRSVO.setZqName(mfEnterpriseChangeApprove.getZqName());
                     enterpriseApproveRSVO.setZqName(mfEnterpriseChangeApprove.getZqName());
                     enterpriseApproveRSVO.setTenantName(mfEnterpriseChangeApprove.getTenantName());
                     enterpriseApproveRSVO.setTenantName(mfEnterpriseChangeApprove.getTenantName());
                 }
                 }
+                if (ObjectUtils.isNotEmpty(mfEnterpriseMap) && mfEnterpriseMap.containsKey(enterpriseApproveRSVO.getBizGuid())) {
+                    MfEnterprise mfEnterprise = mfEnterpriseMap.get(enterpriseApproveRSVO.getBizGuid());
+                    enterpriseApproveRSVO.setCrossPlatformApproveState(mfEnterprise.getCrossPlatformApproveState());
+                    enterpriseApproveRSVO.setZqName(mfEnterprise.getZqName());
+                    enterpriseApproveRSVO.setTenantName(mfEnterprise.getTenantName());
+                }
                 results.add(enterpriseApproveRSVO);
                 results.add(enterpriseApproveRSVO);
             }
             }
 
 

@@ -69,7 +69,7 @@ public class ChangeInfoUtil {
         String oldValue = getRegisteredCapital(item.oldBean.getRegisteredCapital());
         String oldValue = getRegisteredCapital(item.oldBean.getRegisteredCapital());
         String newValue = getRegisteredCapital(item.newBean.getRegisteredCapital());
         String newValue = getRegisteredCapital(item.newBean.getRegisteredCapital());
         if(!oldValue.equals(newValue)){
         if(!oldValue.equals(newValue)){
-            list.add(getChangeInfoVO(item,getCompareResult("注册资本","registeredCapital",oldValue,newValue)));
+            list.add(getChangeInfoVO(item,getCompareResult("注册资本(万元)","registeredCapital",oldValue,newValue)));
         }
         }
     }
     }