zcloud_gbs
/
zcloud_gbs_basic_info_gwj
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

企业调整

main
zhaokai 2025-11-07 18:33:09 +08:00
parent 472bc1c430
commit 0489ce49dd
15 changed files with 177 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,10 +16,8 @@ import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO;
import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
import com.zcloud.basic.info.persistence.repository.PostRepository;
import com.zcloud.basic.info.persistence.repository.UserRepository;
import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO;
import com.zcloud.basic.info.persistence.repository.*;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import lombok.AllArgsConstructor;
import org.apache.dubbo.config.annotation.DubboReference;
@ -43,6 +41,7 @@ public class CorpInfoQueryExe {
private final DepartmentRepository departmentRepository;
private final PostRepository postRepository;
private final UserRepository userRepository;
private final UserQualificationInfoRepository userQualificationInfoRepository;
/**
@ -98,6 +97,24 @@ public class CorpInfoQueryExe {
info.setDepartMentCount(departmentRepository.getCountByCorpInfoId(info.getId()));
info.setPostCount(postRepository.getCountByCorpInfoId(info.getId()));
info.setUserCount(userRepository.getCountByCorpInfoId(info.getId()));
List<UserQualificationInfoDO> userQualificationInfoDOList = userQualificationInfoRepository.getTypeCountByCorpInfoId(info.getId());
if (CollUtil.isNotEmpty(userQualificationInfoDOList)) {
long specialCount = userQualificationInfoDOList.stream()
.filter(Objects::nonNull)
.filter(infoDO -> Integer.valueOf(1).equals(infoDO.getQualificationinfoType()))
.count();
info.setSpecialUserCount(specialCount);
long safetyCount = userQualificationInfoDOList.stream()
.filter(Objects::nonNull)
.filter(infoDO -> Integer.valueOf(2).equals(infoDO.getQualificationinfoType()))
.count();
info.setSafetyUserCount(safetyCount);
} else {
info.setSpecialUserCount(0L);
info.setSafetyUserCount(0L);
}
// info.setMiddleUserCount(departmentRepository.getCountByCorpInfoId(info.getId()));
});

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

@ -31,6 +31,8 @@ public class CorpInfoAddCmd extends Command {
@ApiModelProperty(value = "企业名称", name = "corpName", required = true)
@NotEmpty(message = "企业名称不能为空")
private String corpName;
@ApiModelProperty(value = "企业账号")
private String corpAccount;
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "type", required = true)
private Integer type;
@ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方", name = "xgfLevel", required = true)
@ -90,6 +92,10 @@ public class CorpInfoAddCmd extends Command {
private String longitude;
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
private String latitude;
@ApiModelProperty(value = "所属区域名称")
private String areaName;
@ApiModelProperty(value = "所属区域编码")
private String areaCode;
@ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
private String lrName;

72
web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java
View File

@ -1,11 +1,14 @@
package com.zcloud.basic.info.dto;
import com.alibaba.cola.dto.PageQuery;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
@ -27,8 +30,8 @@ public class CorpInfoPageQry extends PageQuery {
* - `le`: 小于等于比较查询
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
@ApiModelProperty(value = "企业名称", name = "eqCorpinfoId")
private Long eqCorpinfoId;
// @ApiModelProperty(value = "企业id", name = "eqCorpinfoId")
// private Long eqCorpinfoId;
@ApiModelProperty(value = "企业名称", name = "likecorpName")
private String likecorpName;
/**、
@ -37,7 +40,70 @@ public class CorpInfoPageQry extends PageQuery {
* 1：监管 2：企业 3：相关方
*/
@ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true)
@NotNull(message = "企业类型不能为空")
private Integer enterpriseType;
@ApiModelProperty(value = "企业账号", name = "likeCorpAccount")
private String likeCorpAccount;
@ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)
private String eqCode;
@ApiModelProperty(value = "规模", name = "scale", required = true)
private String eqScale;
@ApiModelProperty(value = "成立时间", name = "createDate", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate eqCreateDate;
@ApiModelProperty(value = "企业状态", name = "corpState", required = true)
private String eqCorpState;
@ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true)
private BigDecimal eqTotalAssets;
@ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true)
private BigDecimal eqRegcapital;
@ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true)
private String eqAddressBusiness;
@ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
private String eqAddressOffice;
@ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
private String eqEcoType;
@ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
private String eqLrName;
@ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true)
private String eqLrMobile;
@ApiModelProperty(value = "主要负责人", name = "contacts", required = true)
private String eqContacts;
@ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true)
private String eqContactsPhone;
@ApiModelProperty(value = "行业分类", name = "corpType", required = true)
private String eqcorpType;
@ApiModelProperty(value = "行业分类", name = "corpType2", required = true)
private String eqCorpType2;
@ApiModelProperty(value = "行业分类", name = "corpType3", required = true)
private String eqCorpType3;
@ApiModelProperty(value = "行业分类", name = "corpType4", required = true)
private String eqCorpType4;
@ApiModelProperty(value = "所属省编码", name = "province", required = true)
private String eqProvince;
@ApiModelProperty(value = "所属市级编码", name = "city", required = true)
private String eqCity;
@ApiModelProperty(value = "所属区县编码", name = "country", required = true)
private String eqCountry;
@ApiModelProperty(value = "所属乡镇编码", name = "village", required = true)
private String eqVillage;
@ApiModelProperty(value = "所属街道编码", name = "street", required = true)
private String eqStreet;
}

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

@ -33,6 +33,8 @@ public class CorpInfoUpdateCmd extends Command {
@ApiModelProperty(value = "企业名称", name = "corpName", required = true)
@NotEmpty(message = "企业名称不能为空")
private String corpName;
@ApiModelProperty(value = "企业账号")
private String corpAccount;
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "type", required = true)
private Integer type;
@ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方", name = "xgfLevel", required = true)
@ -92,6 +94,10 @@ public class CorpInfoUpdateCmd extends Command {
private String longitude;
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
private String latitude;
@ApiModelProperty(value = "所属区域名称")
private String areaName;
@ApiModelProperty(value = "所属区域编码")
private String areaCode;
@ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
private String lrName;

3
web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java
View File

@ -27,7 +27,8 @@ public class CorpInfoXgfAddCmd extends Command {
@ApiModelProperty(value = "企业名称,汉字30以内", name = "corpName", required = true)
@NotEmpty(message = "企业名称不能为空")
private String corpName;
@ApiModelProperty(value = "企业账号")
private String corpAccount;
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "type", required = true)
private Integer type;

6
web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java
View File

@ -34,6 +34,8 @@ public class CorpInfoXgfUpdateCmd extends Command {
@ApiModelProperty(value = "企业名称", name = "corpName", required = true)
@NotEmpty(message = "企业名称不能为空")
private String corpName;
@ApiModelProperty(value = "企业账号")
private String corpAccount;
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "type", required = true)
private Integer type;
@ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方", name = "xgfLevel", required = true)
@ -91,6 +93,10 @@ public class CorpInfoXgfUpdateCmd extends Command {
private String longitude;
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
private String latitude;
@ApiModelProperty(value = "所属区域名称")
private String areaName;
@ApiModelProperty(value = "所属区域编码")
private String areaCode;
@ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
private String lrName;
@ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true)

13
web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java
View File

@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* web-client
@ -30,9 +32,16 @@ public class CorpUserMiddleQry extends PageQuery {
@ApiModelProperty(value = "分公司名称", name = "likeCorpName")
private String likeCorpName;
@ApiModelProperty(value = "企业类型，0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位", name = "eqType")
private String eqType;
@ApiModelProperty(value = "企业状态", name = "eqCorpState")
private String eqCorpState;
@ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "eqUseFlag")
private Integer eqUseFlag;
@ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true)
@NotNull(message = "企业类型不能为空")
private Integer enterpriseType;
// @ApiModelProperty(value = "企业类型，0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位", name = "eqType")
// private String eqType;
}

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

@ -26,6 +26,8 @@ public class CorpInfoCO extends ClientObject {
//企业名称
@ApiModelProperty(value = "企业名称")
private String corpName;
@ApiModelProperty(value = "企业账号")
private String corpAccount;
//企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
private Integer type;
@ -109,6 +111,10 @@ public class CorpInfoCO extends ClientObject {
//纬度
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "所属区域名称")
private String areaName;
@ApiModelProperty(value = "所属区域编码")
private String areaCode;
//法定代表人
@ApiModelProperty(value = "法定代表人")

6
web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java
View File

@ -28,6 +28,8 @@ public class CorpInfoXgfCO extends ClientObject {
//企业名称
@ApiModelProperty(value = "企业名称")
private String corpName;
@ApiModelProperty(value = "企业账号")
private String corpAccount;
//企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
private Integer type;
@ -110,6 +112,10 @@ public class CorpInfoXgfCO extends ClientObject {
//纬度
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "所属区域名称")
private String areaName;
@ApiModelProperty(value = "所属区域编码")
private String areaCode;
//法定代表人
@ApiModelProperty(value = "法定代表人")
private String lrName;

15
web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpUserMiddleCO.java
View File

@ -21,7 +21,16 @@ public class CorpUserMiddleCO extends ClientObject {
//企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
private Integer type;
//是否启用，1:启用,2:关闭
@ApiModelProperty(value = "是否启用，1:启用,0:关闭")
private Integer useFlag;
//企业状态
@ApiModelProperty(value = "企业状态")
private String corpState;
//企业状态名称
@ApiModelProperty(value = "企业状态名称")
private String corpStateName;
@ApiModelProperty(value = "部门数")
private Long departMentCount;
@ -35,5 +44,11 @@ public class CorpUserMiddleCO extends ClientObject {
@ApiModelProperty(value = "中台用户数")
private Long middleUserCount;
@ApiModelProperty(value = "安全人员信息数量")
private Long safetyUserCount;
@ApiModelProperty(value = "特种作业人员信息数量")
private Long specialUserCount;
}

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

@ -27,6 +27,8 @@ public class CorpInfoE extends BaseE {
private String corpinfoId;
//企业名称
private String corpName;
private String corpAccount;
//企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
private Integer type;
//相关方等级，1 一级相关方,2 二级相关方
@ -82,6 +84,10 @@ public class CorpInfoE extends BaseE {
private String longitude;
//纬度
private String latitude;
private String areaName;
private String areaCode;
//法定代表人
private String lrName;
//法人手机号

5
web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java
View File

@ -21,6 +21,8 @@ public class CorpInfoXgfE extends BaseE {
private String corpinfoId;
//企业名称
private String corpName;
private String corpAccount;
//企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
private Integer type;
//相关方等级，1 一级相关方,2 二级相关方
@ -80,6 +82,9 @@ public class CorpInfoXgfE extends BaseE {
//纬度
private String latitude;
private String areaName;
private String areaCode;
//法定代表人
private String lrName;
//法人手机号

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

@ -29,6 +29,8 @@ public class CorpInfoDO extends BaseDO {
//企业名称
@ApiModelProperty(value = "企业名称")
private String corpName;
private String corpAccount;
//企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
private Integer type;
@ -112,6 +114,10 @@ public class CorpInfoDO extends BaseDO {
//纬度
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "所属区域名称")
private String areaName;
@ApiModelProperty(value = "所属区域编码")
private String areaCode;
//法定代表人
@ApiModelProperty(value = "法定代表人")
private String lrName;

4
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java
View File

@ -5,6 +5,8 @@ import com.alibaba.cola.dto.SingleResponse;
import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO;
import com.alibaba.cola.dto.PageResponse;
import com.jjb.saas.framework.repository.repo.BaseRepository;
import java.util.List;
import java.util.Map;
/**
@ -17,5 +19,7 @@ public interface UserQualificationInfoRepository extends BaseRepository<UserQual
MultiResponse<UserQualificationInfoDO> list(Map<String,Object> params);
SingleResponse<UserQualificationInfoDO> getInfoById(Long id);
List<UserQualificationInfoDO> getTypeCountByCorpInfoId(Long id);
}

8
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java
View File

@ -60,5 +60,13 @@ public class UserQualificationInfoRepositoryImpl extends BaseRepositoryImpl<User
public SingleResponse<UserQualificationInfoDO> getInfoById(Long id) {
return SingleResponse.of(userQualificationInfoMapper.selectById(id));
}
@Override
public List<UserQualificationInfoDO> getTypeCountByCorpInfoId(Long id) {
QueryWrapper<UserQualificationInfoDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("corpinfo_id", id);
List<UserQualificationInfoDO> result = userQualificationInfoMapper.selectList(queryWrapper);
return result;
}
}