【数据资产】

1、企业信息-根据登陆账号查询详情

@@ -88,6 +88,15 @@ public class EnterpriseController {
         return CommonRes.success(vo);
         return CommonRes.success(vo);
     }
     }
 
 
+    @GetMapping("/detail-by-logonUser")
+    @SystemLog(value = "企业信息-根据登陆账号查询详情")
+    @Operation(summary = "企业信息-根据登陆账号查询详情",
+            parameters = {@Parameter(name = "logonUser", description = "登陆账号", required = true)} )
+    public CommonRes<EnterpriseRSVO> getEnterpriseDetailByLogonUser(@RequestParam String logonUser) {
+        EnterpriseRSVO vo = enterpriseService.getEnterpriseDetailByLogonUser(logonUser);
+        return CommonRes.success(vo);
+    }
+
     @GetMapping("/detail-by-name")
     @GetMapping("/detail-by-name")
     @SystemLog(value = "按名称查企业信息详情")
     @SystemLog(value = "按名称查企业信息详情")
     @Operation(summary = "按名称查企业信息详情",
     @Operation(summary = "按名称查企业信息详情",

@@ -96,4 +96,11 @@ public interface EnterpriseService {
 
 
     /** 更新会员信息 */
     /** 更新会员信息 */
     void updateTenant(MfEnterprise vo);
     void updateTenant(MfEnterprise vo);
+
+    /**
+     * 企业信息-根据登陆账号查询详情
+     * @param logonUser
+     * @return
+     */
+    EnterpriseRSVO getEnterpriseDetailByLogonUser(String logonUser);
 }
 }

@@ -47,10 +47,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -193,8 +191,8 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     @Override
     @Override
     public List<ChangeInfoVO> getChange(String sourceGuid){
     public List<ChangeInfoVO> getChange(String sourceGuid){
         LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid,sourceGuid);
-        queryWrapper.eq(MfEnterpriseChangeApprove::getBizApproveState,ApprovalStateEnum.PASSED.getValue());
+        queryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, sourceGuid);
+        queryWrapper.eq(MfEnterpriseChangeApprove::getBizApproveState, ApprovalStateEnum.PASSED.getValue());
         queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
         queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
         List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
         List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
         if(CollectionUtils.isEmpty(approveList)){
         if(CollectionUtils.isEmpty(approveList)){
@@ -532,6 +530,56 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     }
     }
 
 
     @Override
     @Override
+    public EnterpriseRSVO getEnterpriseDetailByLogonUser(String logonUser) {
+        // 根据登陆人信息查询业务数据
+        LambdaQueryWrapper<MfEnterprise> queryWrapper = Wrappers.lambdaQuery(MfEnterprise.class);
+        queryWrapper.eq(MfEnterprise::getLogonUser, logonUser);
+        queryWrapper.orderByDesc(MfEnterprise::getCreateTime);
+        List<MfEnterprise> mfEnterprises = mfEnterpriseService.list(queryWrapper);
+        if (ObjectUtils.isEmpty(mfEnterprises)) {
+            return null;
+        }
+
+        // 判断业务数据是否有通过
+        Optional<MfEnterprise> enterpriseOptional = mfEnterprises.stream().filter(item -> ApprovalStateEnum.PASSED.getValue().equals(item.getBizApproveState())).findFirst();
+        if (enterpriseOptional.isEmpty()) {
+            return null;
+        }
+        MfEnterprise mfEnterprise = enterpriseOptional.get();
+        EnterpriseRSVO enterpriseRSVO = convertToVO(mfEnterprise);
+
+        // 查询变更历史
+        LambdaQueryWrapper<MfEnterpriseChangeApprove> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, mfEnterprise.getGuid());
+        lambdaQueryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
+        List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(lambdaQueryWrapper);
+        if(CollectionUtils.isEmpty(approveList)){
+            return enterpriseRSVO;
+        }
+
+        // 判断变更历史数据 最新是否驳回
+        MfEnterpriseChangeApprove mfEnterpriseChangeApprove = approveList.get(0);
+        if (ApprovalStateEnum.CHECKING.getValue().equals(mfEnterpriseChangeApprove.getBizApproveState())) {
+            enterpriseRSVO = csbrBeanUtil.convert(mfEnterpriseChangeApprove, EnterpriseRSVO.class);
+        }
+
+        List<MfEnterpriseChangeApprove> passChangeApproves = approveList.stream().filter(item -> ApprovalStateEnum.PASSED.getValue().equals(item.getBizApproveState())).toList();
+        if (ObjectUtils.isNotEmpty(passChangeApproves)) {
+            List<ChangeApproveBean> beanList = getChangeBeanList(passChangeApproves);
+            try {
+                if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
+                    ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData();
+                }
+                enterpriseRSVO.setChangeList(ChangeInfoUtil.getChangeList(beanList));
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return enterpriseRSVO;
+    }
+
+    @Override
     public Boolean check(EnterpriseRQVO vo) {
     public Boolean check(EnterpriseRQVO vo) {
         String tenantName = personelFeign.getAllTenantGuidNameMap().getData().get(vo.getTenantGuid());
         String tenantName = personelFeign.getAllTenantGuidNameMap().getData().get(vo.getTenantGuid());
         TenantRQVO tenant = csbrBeanUtil.convert(vo,TenantRQVO.class);
         TenantRQVO tenant = csbrBeanUtil.convert(vo,TenantRQVO.class);