【DAOP-1.0】企业认证

【功能点】功能开发

@@ -16,6 +16,4 @@ public interface EnterpriseChangeApproveService {
     ChangeApproveVO changeDetail(String guid);
 
     void changeUpdate(BizCallbackDTO dto);
-
-    List<ChangeInfoVO> getChange(String tenantName);
 }

 package com.csbr.qingcloud.portal.service;
 
+import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
 import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
@@ -72,4 +73,6 @@ public interface EnterpriseService {
     void flowCallBack(BizCallbackDTO dto);
 
     Boolean check(EnterpriseRQVO vo);
+
+    List<ChangeInfoVO> getChange(String tenantName);
 }

@@ -54,91 +54,13 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
     @Resource
     private PersonelFeign personelFeign;
 
-    /** 生成变更信息列表 */
-    @Override
-    public List<ChangeInfoVO> getChange(String tenantName){
-        LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(MfEnterpriseChangeApprove::getTenantName,tenantName);
-        queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
-        List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
-        if(CollectionUtils.isEmpty(approveList)){
-            return new ArrayList<>();
-        }
-        List<ChangeApproveBean> beanList = getChangeBeanList(approveList);
-        try {
-            return getChangeList(beanList);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return new ArrayList<>();
-    }
 
-    public static void test(){
-        List<ChangeApproveBean> beanList = new ArrayList<>();
-        ChangeApproveBean bean = new ChangeApproveBean();
-
-        MfEnterprise oldBean = new  MfEnterprise();
-        oldBean.setBankTaxNo("999");
-        oldBean.setTenantName("武汉小米");
-        oldBean.setCreateTime(new Date());
-
-        MfEnterprise newBean = new  MfEnterprise();
-        newBean.setBankTaxNo("666");
-        newBean.setTenantName("武汉大米");
-        newBean.setCreateTime(new Date());
-
-        bean.oldBean = oldBean;
-        bean.newBean = newBean;
-        beanList.add(bean);
-        List<ChangeInfoVO> list = new ArrayList<>();
-        try {
-            list = getChangeList(beanList);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        log.info("变更内容：{}", JSON.toJSONString(list));
-    }
 
-    /** 计算变更信息 */
-    public static List<ChangeInfoVO> getChangeList(List<ChangeApproveBean> beanList) throws IllegalAccessException {
-        List<ChangeInfoVO> list = new ArrayList<>();
-        //循环对比每组记录生来变更内容
-        for(ChangeApproveBean item : beanList){
-            List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
-            for(CompareResult diffItem : diffList){
-                ChangeInfoVO vo = new ChangeInfoVO();
-                vo.setName(diffItem.getFieldComment());
-                vo.setDate(DateUtil.formatDate(item.oldBean.getCreateTime(),"yyyy-MM-dd"));
-                vo.setBefore(diffItem.getOldValue().toString());
-                vo.setAfter(diffItem.getNewValue().toString());
-                list.add(vo);
-            }
-        }
 
-        return list;
-    }
 
-    /** 准备变更对比实体 */
-    private List<ChangeApproveBean> getChangeBeanList(List<MfEnterpriseChangeApprove> list){
-        List<ChangeApproveBean> beanList = new ArrayList<>();
-        for(MfEnterpriseChangeApprove item : list){
-            if("1".equals(item.getDataType())){
-                ChangeApproveBean bean = new ChangeApproveBean();
-                bean.oldBean = csbrBeanUtil.convert(item,MfEnterprise.class);
-                beanList.add(bean);
-            }
-            if("2".equals(item.getDataType())){
-                ChangeApproveBean bean = beanList.get(beanList.size() - 1);
-                bean.newBean = csbrBeanUtil.convert(item,MfEnterprise.class);
-            }
-        }
-        return beanList;
-    }
 
-    public static class ChangeApproveBean{
-        public MfEnterprise oldBean;
-        public MfEnterprise newBean;
-    }
+
+
 
     /** 保存变更数据 */
     @Override

 package com.csbr.qingcloud.portal.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
 import com.csbr.qingcloud.portal.domain.vo.*;
 import com.csbr.qingcloud.portal.feign.PersonelFeign;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
+import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
 import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
+import com.csbr.qingcloud.portal.util.ObjectUtil;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import com.csbr.cloud.common.exception.CsbrSystemException;
 import com.csbr.cloud.common.util.CommonUtil;
@@ -21,6 +25,7 @@ import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
 import com.csbr.qingcloud.portal.service.EnterpriseService;
+import io.seata.common.util.DateUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -30,6 +35,7 @@ import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -63,7 +69,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     private PersonelFeign personelFeign;
 
     @Resource
-    private EnterpriseChangeApproveService enterpriseChangeApproveService;
+    private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService;
 
     /**
      * 企业信息分页查询
@@ -108,10 +114,95 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         }
         EnterpriseRSVO vo = convertToVO(entity);
         //生成变更信息
-        vo.setChangeList(enterpriseChangeApproveService.getChange(entity.getTenantName()));
+        vo.setChangeList(getChange(entity.getTenantName()));
         return vo;
     }
 
+    /** 生成变更信息列表 */
+    @Override
+    public List<ChangeInfoVO> getChange(String tenantName){
+        LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MfEnterpriseChangeApprove::getTenantName,tenantName);
+        queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
+        List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
+        if(CollectionUtils.isEmpty(approveList)){
+            return new ArrayList<>();
+        }
+        List<ChangeApproveBean> beanList = getChangeBeanList(approveList);
+        try {
+            return getChangeList(beanList);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return new ArrayList<>();
+    }
+
+    public static void test(){
+        List<ChangeApproveBean> beanList = new ArrayList<>();
+        ChangeApproveBean bean = new ChangeApproveBean();
+
+        MfEnterprise oldBean = new  MfEnterprise();
+        oldBean.setBankTaxNo("999");
+        oldBean.setTenantName("武汉小米");
+        oldBean.setCreateTime(new Date());
+
+        MfEnterprise newBean = new  MfEnterprise();
+        newBean.setBankTaxNo("666");
+        newBean.setTenantName("武汉大米");
+        newBean.setCreateTime(new Date());
+
+        bean.oldBean = oldBean;
+        bean.newBean = newBean;
+        beanList.add(bean);
+        List<ChangeInfoVO> list = new ArrayList<>();
+        try {
+            list = getChangeList(beanList);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        log.info("变更内容：{}", JSON.toJSONString(list));
+    }
+
+    /** 准备变更对比实体 */
+    private List<ChangeApproveBean> getChangeBeanList(List<MfEnterpriseChangeApprove> list){
+        List<ChangeApproveBean> beanList = new ArrayList<>();
+        for(MfEnterpriseChangeApprove item : list){
+            if("1".equals(item.getDataType())){
+                ChangeApproveBean bean = new ChangeApproveBean();
+                bean.oldBean = csbrBeanUtil.convert(item,MfEnterprise.class);
+                beanList.add(bean);
+            }
+            if("2".equals(item.getDataType())){
+                ChangeApproveBean bean = beanList.get(beanList.size() - 1);
+                bean.newBean = csbrBeanUtil.convert(item,MfEnterprise.class);
+            }
+        }
+        return beanList;
+    }
+
+    public static class ChangeApproveBean{
+        public MfEnterprise oldBean;
+        public MfEnterprise newBean;
+    }
+
+    /** 计算变更信息 */
+    public static List<ChangeInfoVO> getChangeList(List<ChangeApproveBean> beanList) throws IllegalAccessException {
+        List<ChangeInfoVO> list = new ArrayList<>();
+        //循环对比每组记录生来变更内容
+        for(ChangeApproveBean item : beanList){
+            List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
+            for(CompareResult diffItem : diffList){
+                ChangeInfoVO vo = new ChangeInfoVO();
+                vo.setName(diffItem.getFieldComment());
+                vo.setDate(DateUtil.formatDate(item.oldBean.getCreateTime(),"yyyy-MM-dd"));
+                vo.setBefore(diffItem.getOldValue().toString());
+                vo.setAfter(diffItem.getNewValue().toString());
+                list.add(vo);
+            }
+        }
+
+        return list;
+    }
 
 
     /**

@@ -4,7 +4,7 @@
     <springProperty scope="context" name="app_name" source="spring.application.name"/>
     <contextName>${app_name}</contextName>
     <!-- 包含 logback 的基础配置，路径就是所在包 -->
-    <include resource="com/csbr/cloud/common/logback/logback-base.xml"/>
+    <include resource="com/csbr/cloud/base/logback/logback-base.xml"/>
     <!--   增加skywalking配置日志收集-->
     <appender name="grpc-log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
@@ -27,11 +27,11 @@
     <springProperty scope="context" name="topci_prefix" source="csbr.kafka.topic-prefix" />
 
     <!-- 输出到Kafka -->
-    <appender name="kafkaAppender" class="com.csbr.cloud.common.logback.KafkaAppender">
+    <appender name="kafkaAppender" class="com.csbr.cloud.log.logback.KafkaAppender">
         <bootstrapServers>${kafka_server}</bootstrapServers>
         <topic>csbr_fbt_log</topic>
         <prefix>${topci_prefix}</prefix>
-        <formatter class="com.csbr.cloud.common.logback.JsonFormatter">
+        <formatter class="com.csbr.cloud.log.logback.JsonFormatter">
             <expectJson>false</expectJson>
         </formatter>
     </appender>

@@ -3,7 +3,7 @@
     <!-- 本地服务的名称 -->
     <property name="app_name" value="ms-data-circulation-portal-service"/>
     <!-- 包含 logback 的基础配置，路径就是所在包 -->
-    <include resource="com/csbr/cloud/common/logback/logback-base.xml"/>
+    <include resource="com/csbr/cloud/base/logback/logback-base.xml"/>
     <!-- 控制打印输出的内容 -->
     <root level="INFO">
         <appender-ref ref="FILE_ERROR"/>