企业添加开户人和选取形式字段

web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java

@@ -5,22 +5,22 @@ import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.exception.BizException;
 import com.jjb.saas.system.client.tenant.facade.TenantFacade;
 import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd;
+import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor;
+import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor;
+import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
 import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
+import com.zcloud.basic.info.domain.gateway.CorpFormGateway;
 import com.zcloud.basic.info.domain.gateway.CorpInfoGateway;
 import com.zcloud.basic.info.domain.gateway.UserGateway;
-import com.zcloud.basic.info.domain.model.CorpInfoE;
+import com.zcloud.basic.info.domain.model.*;
-import com.zcloud.basic.info.domain.model.DepartmentE;
-import com.zcloud.basic.info.domain.model.UserE;
-import com.zcloud.basic.info.domain.model.UserEmploymentLogE;
 import com.zcloud.basic.info.dto.CorpInfoAddCmd;
 import com.zcloud.basic.info.dto.DepartmentAddCmd;
 import com.zcloud.basic.info.dto.UserAddCmd;
+import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
 import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
-import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
+import com.zcloud.basic.info.persistence.repository.*;
-import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
-import com.zcloud.basic.info.persistence.repository.UserEmploymentLogRepository;
-import com.zcloud.basic.info.persistence.repository.UserRepository;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
+import com.zcloud.gbscommon.utils.Tools;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -31,6 +31,7 @@ import org.springframework.util.ObjectUtils;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -48,6 +49,9 @@ public class CorpInfoAddExe {
     private final UserRepository userRepository;
     private final DepartmentRepository departmentRepository;
     private final UserEmploymentLogRepository userEmploymentLogRepository;
+    private final CorpFormCoConvertor corpFormCoConvertor;
+    private final CorpFormGateway corpFormGateway;
+    private final CorpFormRepository corpFormRepository;
 
 
     @Transactional(rollbackFor = Exception.class)
@@ -70,6 +74,23 @@ public class CorpInfoAddExe {
         if (corpInfoId == null) {
             throw new BizException("保存失败");
         }
+        if(CollUtil.isNotEmpty(cmd.getSelectfromList())){
+            //选取形式
+            List<CorpFormE> selectfromList  = corpFormCoConvertor.converItemToData(cmd.getSelectfromList());
+            selectfromList.forEach(info->{
+                info.setInfoId(corpInfoId);
+                info.setType(CorpFormTypeEnum.SELECTFROM.getCode());
+                info.setTypeName(CorpFormTypeEnum.SELECTFROM.getName());
+                info.setCorpFormId(Tools.get32UUID());
+            });
+            List<CorpFormE> filteredList = selectfromList.stream()
+                    .filter(item -> item.getItemCode() != null && !item.getItemCode().trim().isEmpty())
+                    .collect(Collectors.toList());
+            List<CorpFormDO> convertToData = corpFormCoConvertor.convertToData(filteredList);
+            corpFormRepository.addBatch(convertToData);
+        }
+
+
         DepartmentE departmentE = new DepartmentE();
         departmentE.initCorpInfo(corpInfoId,cmd.getCorpName());
 

web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java

@@ -1,21 +1,30 @@
 package com.zcloud.basic.info.command;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.exception.BizException;
 import com.jjb.saas.system.client.tenant.facade.TenantFacade;
 import com.jjb.saas.system.client.tenant.request.OtaPlatformUserUpdateCmd;
 import com.jjb.saas.system.client.tenant.request.TenantUpdateStatusCmd;
+import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor;
+import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor;
+import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
+import com.zcloud.basic.info.domain.gateway.CorpFormGateway;
 import com.zcloud.basic.info.domain.gateway.CorpInfoGateway;
+import com.zcloud.basic.info.domain.model.CorpFormE;
 import com.zcloud.basic.info.domain.model.CorpInfoE;
 import com.zcloud.basic.info.dto.CorpInfoUpdateCmd;
 import com.zcloud.basic.info.dto.CorpInfoUpdateUseFlagCmd;
+import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
 import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
 import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
 import com.zcloud.basic.info.persistence.dataobject.UserDO;
+import com.zcloud.basic.info.persistence.repository.CorpFormRepository;
 import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
 import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
 import com.zcloud.basic.info.persistence.repository.UserRepository;
 import com.zcloud.gbscommon.utils.Const;
+import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.gbscommon.utils.ZcloudRedisUtil;
 import lombok.AllArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -26,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * web-app
@@ -43,6 +53,9 @@ public class CorpInfoUpdateExe {
     private final UserRepository userRepository;
     @DubboReference
     private TenantFacade tenantFacade;
+    private final CorpFormCoConvertor corpFormCoConvertor;
+    private final CorpFormGateway corpFormGateway;
+    private final CorpFormRepository corpFormRepository;
 //    @Autowired
 //    private ZcloudRedisUtil zcloudRedisUtil;
 
@@ -58,8 +71,24 @@ public class CorpInfoUpdateExe {
         if (!res) {
             throw new BizException("修改失败");
         }
-        //删除redis数据
+        //修改多选
-     //   zcloudRedisUtil.del(Const.REDIS_CORP_PREFIX+corpInfoUpdateCmd.getId());
+        //选取形式
+        if (CollUtil.isNotEmpty(corpInfoUpdateCmd.getSelectfromList())) {
+            List<CorpFormE> selectfromList = corpFormCoConvertor.converItemToData(corpInfoUpdateCmd.getSelectfromList());
+            corpFormGateway.deletedCorpFormByType(corpInfoUpdateCmd.getId(), CorpFormTypeEnum.SELECTFROM.getCode());
+            selectfromList.forEach(info -> {
+                info.setInfoId(corpInfoUpdateCmd.getId());
+                info.setType(CorpFormTypeEnum.SELECTFROM.getCode());
+                info.setTypeName(CorpFormTypeEnum.SELECTFROM.getName());
+                info.setCorpFormId(Tools.get32UUID());
+            });
+            List<CorpFormE> filteredList = selectfromList.stream()
+                    .filter(item -> item.getItemCode() != null && !item.getItemCode().trim().isEmpty())
+                    .collect(Collectors.toList());
+            List<CorpFormDO> convertToData = corpFormCoConvertor.convertToData(filteredList);
+            corpFormRepository.addBatch(convertToData);
+        }
+
     }
 
     public void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd) {

web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpFormCoConvertor.java

@@ -1,5 +1,7 @@
 package com.zcloud.basic.info.command.convertor;
 
+import com.zcloud.basic.info.domain.model.CorpFormE;
+import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd;
 import com.zcloud.basic.info.dto.clientobject.CorpFormCO;
 import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfItemCO;
 import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
@@ -23,5 +25,10 @@ public interface CorpFormCoConvertor {
     List<CorpFormCO> converDOsToCOs(List<CorpFormDO> corpFormDOs);
 
     List<CorpInfoXgfItemCO> converDOsToItemCOs(List<CorpFormDO> selectFromList);
+
+    List<CorpFormE> converItemToData(List<CorpInfoXgfItemCmd> selectfromList);
+
+    List<CorpFormDO> convertToData(List<CorpFormE> filteredList);
+
 }
 

web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpInfoCoConvertor.java

@@ -4,7 +4,9 @@ import com.zcloud.basic.info.domain.model.CorpDepartmentE;
 import com.zcloud.basic.info.domain.model.DepartmentE;
 import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
 import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
+import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfItemCO;
 import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO;
+import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
 import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
 import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
 import com.zcloud.gbscommon.zcloudcorp.response.ZcloudCorpInfoCO;
@@ -36,5 +38,7 @@ public interface CorpInfoCoConvertor {
     List<ZcloudCorpInfoCO> converCOsToDubboCOs(List<CorpInfoCO> data);
 
     List<CorpUserMiddleCO> converDOsToMiddleCOs(List<CorpInfoDO> data);
+
+    List<CorpInfoXgfItemCO> converDOsToItemCOs(List<CorpFormDO> corpFormDOS);
 }
 

web-app/src/main/java/com/zcloud/basic/info/command/convertor/CorpInfoXgfCoConvertor.java

@@ -3,6 +3,7 @@ package com.zcloud.basic.info.command.convertor;
 import com.zcloud.basic.info.domain.model.CorpFormE;
 import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd;
 import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO;
+import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
 import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
 import org.mapstruct.Mapper;
 
@@ -23,6 +24,8 @@ public interface CorpInfoXgfCoConvertor {
      */
     List<CorpInfoXgfCO> converDOsToCOs(List<CorpInfoDO> corpInfoXgfDOs);
 
-    List<CorpFormE> converItemToData(List<CorpInfoXgfItemCmd> mainDepartmentList);
+
+    List<CorpFormDO> convertToData(List<CorpFormE> filteredList);
+
 }
 

web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java

@@ -5,6 +5,7 @@ import com.alibaba.cola.dto.PageResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jjb.saas.system.client.tenant.request.TenantAddCmd;
 import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor;
+import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
 import com.zcloud.basic.info.domain.model.CorpDepartmentE;
 import com.zcloud.basic.info.domain.model.CorpInfoE;
 import com.zcloud.basic.info.domain.model.DepartmentE;
@@ -12,6 +13,7 @@ import com.zcloud.basic.info.dto.*;
 import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
 import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
 import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO;
+import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
 import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
 import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
 import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO;
@@ -23,6 +25,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -40,6 +43,8 @@ public class CorpInfoQueryExe {
     private final PostRepository postRepository;
     private final UserRepository userRepository;
     private final UserQualificationInfoRepository userQualificationInfoRepository;
+    private final CorpFormRepository corpFormRepository;
+    private final CorpInfoCoConvertor corpFormCoConvertor;
 
 
     /**
@@ -56,7 +61,16 @@ public class CorpInfoQueryExe {
         }
         PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(parmas);
         List<CorpInfoCO> examCenterCOS = corpInfoCoConvertor.converDOsToCOs(pageResponse.getData());
+        // 组装营业执照和多选框
+        examCenterCOS.forEach(info -> {
+            Long corpInfoId = info.getId();
+            List<Integer> typeList = Arrays.asList(CorpFormTypeEnum.SELECTFROM.getCode());
+            List<CorpFormDO> infoByTypeList = corpFormRepository.getInfoByTypeList(corpInfoId, typeList);
 
+            Map<Integer, List<CorpFormDO>> groupedByType = infoByTypeList.stream()
+                    .collect(Collectors.groupingBy(CorpFormDO::getType));
+            info.setSelectfromList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.SELECTFROM.getCode())));
+        });
         return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
     }
 
@@ -65,7 +79,12 @@ public class CorpInfoQueryExe {
         CorpInfoCO corpInfoCO = new CorpInfoCO();
         BeanUtils.copyProperties(corpInfoDO, corpInfoCO);
 
+        List<Integer> typeList = Arrays.asList(CorpFormTypeEnum.SELECTFROM.getCode());
+        List<CorpFormDO> infoByTypeList = corpFormRepository.getInfoByTypeList(corpInfoCO.getId(), typeList);
 
+        Map<Integer, List<CorpFormDO>> groupedByType = infoByTypeList.stream()
+                .collect(Collectors.groupingBy(CorpFormDO::getType));
+        corpInfoCO.setSelectfromList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.SELECTFROM.getCode())));
         return corpInfoCO;
     }
 

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java

@@ -13,6 +13,7 @@ import javax.validation.constraints.NotEmpty;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * web-client
@@ -171,6 +172,8 @@ public class CorpInfoAddCmd extends Command {
     private Integer whetherActinogenFlag;
     @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true)
     private Integer whetherLiquidammoniaFlag;
+    @ApiModelProperty(value = "选取形式", name = "selectfromList")
+    private List<CorpInfoXgfItemCmd> selectfromList;
 
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java

@@ -13,6 +13,7 @@ import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * web-client
@@ -173,6 +174,7 @@ public class CorpInfoUpdateCmd extends Command {
     private Integer whetherActinogenFlag;
     @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true)
     private Integer whetherLiquidammoniaFlag;
-
+    @ApiModelProperty(value = "选取形式", name = "selectfromList")
+    private List<CorpInfoXgfItemCmd> selectfromList;
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -182,6 +183,12 @@ public class CorpInfoCO extends ClientObject {
     //营业执照结束时间
     @ApiModelProperty(value = "营业执照结束时间")
     private LocalDate licenseEnd;
+    //开户人idaccount_contact_id
+    @ApiModelProperty(value = "开户人id")
+    private String accountContactId;
+    //开户人姓名 account_contact_name
+    @ApiModelProperty(value = "开户人姓名")
+    private String accountContactName;
     //有无职业卫生信息,1:是,0:否
     @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否")
     private Integer whetherHygieneFlag;
@@ -224,9 +231,6 @@ public class CorpInfoCO extends ClientObject {
     //是否涉及液氨制冷,1:是,0:否
     @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否")
     private Integer whetherLiquidammoniaFlag;
-    //乐观锁
-    @ApiModelProperty(value = "乐观锁")
-    private Integer version;
     //创建人
     @ApiModelProperty(value = "创建人")
     private Long createId;
@@ -255,11 +259,8 @@ public class CorpInfoCO extends ClientObject {
     //租户ID
     @ApiModelProperty(value = "租户ID")
     private Long tenantId;
-    //机构ID
+
-    @ApiModelProperty(value = "机构ID")
+    @ApiModelProperty(value = "选取形式", name = "selectfromList", required = true)
-    private Long orgId;
+    private List<CorpInfoXgfItemCO> selectfromList;
-    //环境
-    @ApiModelProperty(value = "环境")
-    private String env;
 }
 

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java

@@ -2,11 +2,13 @@ package com.zcloud.basic.info.domain.model;
 
 import com.alibaba.cola.domain.Entity;
 import com.alibaba.cola.exception.BizException;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.domain.model.BaseE;
 import com.zcloud.basic.info.domain.enums.CorpStateEnum;
 import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.gbscommon.utils.MD5;
 import com.zcloud.gbscommon.utils.Sm2Util;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -135,6 +137,10 @@ public class CorpInfoE extends BaseE {
     private LocalDate licenseStart;
     //营业执照结束时间
     private LocalDate licenseEnd;
+    //开户人id
+    private String accountContactId;
+    //开户人姓名
+    private String accountContactName;
     //有无职业卫生信息,1:是,0:否
     private Integer whetherHygieneFlag;
     //有无重大危险源,1:是,0:否
@@ -183,6 +189,9 @@ public class CorpInfoE extends BaseE {
             throw new BizException("社会统一信用代码重复。");
         }
     }
+    public static Boolean isCorp() {
+        return AuthContext.getTenantId().equals(AuthContext.getUserId());
+    }
 
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java

@@ -39,12 +39,17 @@ public class CorpInfoGatewayImpl implements CorpInfoGateway {
         if(corpCount>0){
             throw new BizException("企业名称已存在");
         }
-
         CorpInfoDO d = new CorpInfoDO();
+
+
         BeanUtils.copyProperties(corpInfoE, d);
         if(StringUtils.isEmpty(d.getCorpinfoId())){
             d.setCorpinfoId(Tools.get32UUID());
         }
+        if(!CorpInfoE.isCorp()){
+            d.setAccountContactId(corpInfoE.getAccountContactId());
+            d.setAccountContactName(corpInfoE.getAccountContactName());
+        }
         corpInfoRepository.saveCorp(d);
 //        corpInfoRepository.save(d);
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java

@@ -185,6 +185,12 @@ public class CorpInfoDO extends BaseDO {
     //营业执照结束时间
     @ApiModelProperty(value = "营业执照结束时间")
     private LocalDate licenseEnd;
+    //开户人idaccount_contact_id
+    @ApiModelProperty(value = "开户人id")
+    private String accountContactId;
+    //开户人姓名 account_contact_name
+    @ApiModelProperty(value = "开户人姓名")
+    private String accountContactName;
     //有无职业卫生信息,1:是,0:否
     @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否")
     private Integer whetherHygieneFlag;

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpFormRepository.java

@@ -2,6 +2,7 @@ package com.zcloud.basic.info.persistence.repository;
 
 import com.alibaba.cola.dto.PageResponse;
 import com.jjb.saas.framework.repository.repo.BaseRepository;
+import com.zcloud.basic.info.domain.model.CorpFormE;
 import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
 
 import java.util.List;
@@ -19,5 +20,7 @@ public interface CorpFormRepository extends BaseRepository<CorpFormDO> {
     List<CorpFormDO> getInfoByType(Long id, Integer type);
 
     List<CorpFormDO> getInfoByTypeList(Long corpInfoId, List<Integer> typeList);
+
+    void addBatch(List<CorpFormDO> filteredList);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpFormRepositoryImpl.java

@@ -52,5 +52,10 @@ public class CorpFormRepositoryImpl extends BaseRepositoryImpl<CorpFormMapper, C
         List<CorpFormDO> corpFormDOList = corpFormMapper.selectListByType(corpInfoId,typeList);
         return corpFormDOList;
     }
+
+    @Override
+    public void addBatch(List<CorpFormDO> filteredList) {
+        this.saveBatch(filteredList);
+    }
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java

@@ -111,6 +111,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
         } catch (Exception e){
             e.printStackTrace();
         }
+        
         save(corpInfoDO);
 
     }