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

删除 隶属关系编码，四色图类型

main
zhaokai 2025-11-03 09:16:01 +08:00
parent a772e06c6f
commit 2c3cc6903e
17 changed files with 73 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfUpdateExe.java
View File

@ -58,7 +58,19 @@ public class CorpInfoXgfUpdateExe {
if (!res) {
throw new BizException("修改失败");
}
Long corpInfoId = corpInfoXgfUpdateCmd.getId();
OtaPlatformUserUpdateCmd otaUpdateCmd = new OtaPlatformUserUpdateCmd();
otaUpdateCmd.setAccount(corpInfoXgfE.getCorpName());
otaUpdateCmd.setTenantName(corpInfoXgfE.getCorpName());
otaUpdateCmd.setOriginalAccount(corpInfoDO.getCorpName());
otaUpdateCmd.setPassword(corpInfoXgfUpdateCmd.getPassWord());
log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS请求:{}",otaUpdateCmd.toString());
Response response = tenantFacade.updateOtaPlatformUser(otaUpdateCmd);
log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS返回:{}",response.toString());
if(!corpInfoDO.getCorpName().equals(corpInfoXgfE.getCorpName())){
//TODO 名字有变动，发送mq
}
/* Long corpInfoId = corpInfoXgfUpdateCmd.getId();
List<CorpFormE> corpFormEList = new ArrayList<>();
//股份主管部门
List<CorpInfoXgfItemCmd> mainDepartmentList = corpInfoXgfUpdateCmd.getMainDepartmentList();
@ -146,19 +158,8 @@ public class CorpInfoXgfUpdateExe {
.collect(Collectors.toList());
filteredList.forEach(info->{
CorpFormGateway.add(info);
});
OtaPlatformUserUpdateCmd otaUpdateCmd = new OtaPlatformUserUpdateCmd();
otaUpdateCmd.setAccount(corpInfoXgfE.getCorpName());
otaUpdateCmd.setTenantName(corpInfoXgfE.getCorpName());
otaUpdateCmd.setOriginalAccount(corpInfoDO.getCorpName());
otaUpdateCmd.setPassword(corpInfoXgfUpdateCmd.getPassWord());
log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS请求:{}",otaUpdateCmd.toString());
Response response = tenantFacade.updateOtaPlatformUser(otaUpdateCmd);
log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS返回:{}",response.toString());
});*/
if(!corpInfoDO.getCorpName().equals(corpInfoXgfE.getCorpName())){
//TODO 名字有变动，发送mq
}
}
}

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

@ -47,7 +47,7 @@ public class CorpInfoXgfQueryExe {
Map<String, Object> params = PageQueryHelper.toHashMap(corpInfoXgfPageQry);
PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(params);
List<CorpInfoXgfCO> examCenterCOS = corpInfoXgfCoConvertor.converDOsToCOs(pageResponse.getData());
//TODo 组装营业执照和多选框
/* // 组装营业执照和多选框
examCenterCOS.forEach(info -> {
Long corpInfoId = info.getId();
List<Integer> typeList = Arrays.asList(CorpFormTypeEnum.MAINDEPARTMENT.getCode()
@ -62,7 +62,7 @@ public class CorpInfoXgfQueryExe {
info.setCompetentDeptList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.COMPETENTDEPT.getCode())));
info.setSuperVisecorpDeptList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.SUPERVISECORPDEPT.getCode())));
info.setCorpTypeList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.CORP_TYPE.getCode())));
});
});*/
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
@ -73,7 +73,7 @@ public class CorpInfoXgfQueryExe {
CorpInfoXgfCO corpInfoXgfCO = new CorpInfoXgfCO();
BeanUtils.copyProperties(corpInfoDO, corpInfoXgfCO);
//查找多选按钮
/*
List<CorpFormDO> employmentformList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.EMPLOYMENTFORM.getCode());
corpInfoXgfCO.setEmploymentformList(corpFormCoConvertor.converDOsToItemCOs(employmentformList));
List<CorpFormDO> selectFromList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.SELECTFROM.getCode());
@ -90,7 +90,7 @@ public class CorpInfoXgfQueryExe {
List<CorpFormDO> superVisecorpDeptList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.SUPERVISECORPDEPT.getCode());
corpInfoXgfCO.setSuperVisecorpDeptList(corpFormCoConvertor.converDOsToItemCOs(superVisecorpDeptList));
List<CorpFormDO> corpTypeList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.CORP_TYPE.getCode());
corpInfoXgfCO.setCorpTypeList(corpFormCoConvertor.converDOsToItemCOs(corpTypeList));
corpInfoXgfCO.setCorpTypeList(corpFormCoConvertor.converDOsToItemCOs(corpTypeList));*/
return corpInfoXgfCO;
}
}

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

@ -137,14 +137,7 @@ public class CorpInfoAddCmd extends Command {
private String street;
@ApiModelProperty(value = "公司简介", name = "descr", required = true)
private String descr;
@ApiModelProperty(value = "隶属关系编码", name = "subordination", required = true)
private String subordination;
@ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true)
private String subordinationName;
@ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseStart;

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

@ -140,14 +140,7 @@ public class CorpInfoUpdateCmd extends Command {
private String street;
@ApiModelProperty(value = "公司简介", name = "descr", required = true)
private String descr;
@ApiModelProperty(value = "隶属关系编码", name = "subordination", required = true)
private String subordination;
@ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true)
private String subordinationName;
@ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseStart;

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

@ -185,15 +185,6 @@ public class CorpInfoXgfAddCmd extends Command {
@ApiModelProperty(value = "公司简介", name = "descr", required = true)
private String descr;
@ApiModelProperty(value = "隶属关系编码", name = "subordination", required = true)
private String subordination;
@ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true)
private String subordinationName;
@ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseStart;

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

@ -140,14 +140,7 @@ public class CorpInfoXgfUpdateCmd extends Command {
private String street;
@ApiModelProperty(value = "公司简介", name = "descr", required = true)
private String descr;
@ApiModelProperty(value = "隶属关系编码", name = "subordination", required = true)
private String subordination;
@ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true)
private String subordinationName;
@ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseStart;
@ -183,7 +176,7 @@ public class CorpInfoXgfUpdateCmd extends Command {
private Integer whetherActinogen;
@ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true)
private Integer whetherLiquidammonia;
@ApiModelProperty(value = "用工形式", name = "employmentformList", required = true)
/* @ApiModelProperty(value = "用工形式", name = "employmentformList", required = true)
private List<CorpInfoXgfItemCmd> employmentformList;
@ApiModelProperty(value = "选取形式", name = "selectfromList", required = true)
private List<CorpInfoXgfItemCmd> selectfromList;
@ -197,7 +190,7 @@ public class CorpInfoXgfUpdateCmd extends Command {
private List<CorpInfoXgfItemCmd> superVisecorpDeptList;
@ApiModelProperty(value = "集团单位", name = "corpTypeList", required = true)
private List<CorpInfoXgfItemCmd> corpTypeList;
@ApiModelProperty(value = "密码", name = "passWord", required = true)
@ApiModelProperty(value = "密码", name = "passWord", required = true)*/
private String passWord;
}

10
web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoAddCmd.java
View File

@ -35,10 +35,14 @@ public class CorpQualificationInfoAddCmd extends Command {
@ApiModelProperty(value = "资质名称,汉字30以内", name = "qualificationName", required = true)
@NotEmpty(message = "资质名称不能为空")
private String qualificationName;
@ApiModelProperty(value = "证书有效期", name = "validityTime", required = true)
@NotNull(message = "证书有效期不能为空")
@ApiModelProperty(value = "开始证书有效期", name = "startValidityTime", required = true)
@NotNull(message = "开始证书有效期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date validityTime;
private Date startValidityTime;
@ApiModelProperty(value = "结束证书有效期", name = "endValidityTime", required = true)
@NotNull(message = "结束证书有效期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endValidityTime;
@ApiModelProperty(value = "证书编号", name = "certificateNo", required = true)
@NotEmpty(message = "证书编号不能为空")

8
web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoPageQry.java
View File

@ -28,10 +28,10 @@ public class CorpQualificationInfoPageQry extends PageQuery {
private Long eqCorpInfoId;
@ApiModelProperty(value = "证书名称编号模糊查询", name = "keyWords")
private String keyWords;
@ApiModelProperty(value = "结束时间", name = "leValidityTime")
private String leValidityTime;
@ApiModelProperty(value = "开始时间", name = "geValidityTime")
private String geValidityTime;
@ApiModelProperty(value = "结束时间", name = "leEndValidityTime")
private String leEndValidityTime;
@ApiModelProperty(value = "开始时间", name = "geEndValidityTime")
private String geEndValidityTime;
// validitytime
}

10
web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java
View File

@ -36,10 +36,14 @@ public class CorpQualificationInfoUpdateCmd extends Command {
@ApiModelProperty(value = "资质名称,汉字30以内", name = "qualificationName", required = true)
@NotEmpty(message = "资质名称不能为空")
private String qualificationName;
@ApiModelProperty(value = "证书有效期", name = "validityTime", required = true)
@NotNull(message = "证书有效期不能为空")
@ApiModelProperty(value = "开始证书有效期", name = "startValidityTime", required = true)
@NotNull(message = "开始证书有效期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date validityTime;
private Date startValidityTime;
@ApiModelProperty(value = "结束证书有效期", name = "endValidityTime", required = true)
@NotNull(message = "结束证书有效期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endValidityTime;
@ApiModelProperty(value = "证书编号", name = "certificateNo", required = true)
@NotEmpty(message = "证书编号不能为空")
private String certificateNo;

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

@ -181,15 +181,7 @@ public class CorpInfoCO extends ClientObject {
//公司简介
@ApiModelProperty(value = "公司简介")
private String descr;
//隶属关系编码
@ApiModelProperty(value = "隶属关系编码")
private String subordination;
//隶属关系名称
@ApiModelProperty(value = "隶属关系名称")
private String subordinationName;
//四色图类型，1.平面四色图
@ApiModelProperty(value = "四色图类型，1.平面四色图")
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间")
private LocalDate licenseStart;
//营业执照结束时间

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

@ -182,15 +182,7 @@ public class CorpInfoXgfCO extends ClientObject {
//公司简介
@ApiModelProperty(value = "公司简介")
private String descr;
//隶属关系编码
@ApiModelProperty(value = "隶属关系编码")
private String subordination;
//隶属关系名称
@ApiModelProperty(value = "隶属关系名称")
private String subordinationName;
//四色图类型，1.平面四色图
@ApiModelProperty(value = "四色图类型，1.平面四色图")
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间")
private LocalDate licenseStart;
//营业执照结束时间
@ -260,21 +252,21 @@ public class CorpInfoXgfCO extends ClientObject {
//描述
@ApiModelProperty(value = "描述")
private String remarks;
@ApiModelProperty(value = "用工形式", name = "employmentformList", required = true)
private List<CorpInfoXgfItemCO> employmentformList;
@ApiModelProperty(value = "选取形式", name = "selectfromList", required = true)
private List<CorpInfoXgfItemCO> selectfromList;
@ApiModelProperty(value = "股份监管部门", name = "managerDepartmentList", required = true)
private List<CorpInfoXgfItemCO> managerDepartmentList;
@ApiModelProperty(value = "股份主管部门", name = "mainDepartmentList", required = true)
private List<CorpInfoXgfItemCO> mainDepartmentList;
@ApiModelProperty(value = "基层单位监管部门", name = "competentDeptList", required = true)
private List<CorpInfoXgfItemCO> competentDeptList;
@ApiModelProperty(value = "基层单位主管部门", name = "superVisecorpDeptList", required = true)
private List<CorpInfoXgfItemCO> superVisecorpDeptList;
@ApiModelProperty(value = "集团单位", name = "corpTypeList", required = true)
private List<CorpInfoXgfItemCO> corpTypeList;
//
// @ApiModelProperty(value = "用工形式", name = "employmentformList", required = true)
// private List<CorpInfoXgfItemCO> employmentformList;
// @ApiModelProperty(value = "选取形式", name = "selectfromList", required = true)
// private List<CorpInfoXgfItemCO> selectfromList;
// @ApiModelProperty(value = "股份监管部门", name = "managerDepartmentList", required = true)
// private List<CorpInfoXgfItemCO> managerDepartmentList;
// @ApiModelProperty(value = "股份主管部门", name = "mainDepartmentList", required = true)
// private List<CorpInfoXgfItemCO> mainDepartmentList;
// @ApiModelProperty(value = "基层单位监管部门", name = "competentDeptList", required = true)
// private List<CorpInfoXgfItemCO> competentDeptList;
// @ApiModelProperty(value = "基层单位主管部门", name = "superVisecorpDeptList", required = true)
// private List<CorpInfoXgfItemCO> superVisecorpDeptList;
// @ApiModelProperty(value = "集团单位", name = "corpTypeList", required = true)
// private List<CorpInfoXgfItemCO> corpTypeList;
}

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

@ -31,10 +31,13 @@ public class CorpQualificationInfoCO extends ClientObject {
@ApiModelProperty(value = "资质名称")
private String qualificationName;
//企业资质开始日期
@ApiModelProperty(value = "证书有效期", name = "validityTime", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date validityTime;
@ApiModelProperty(value = "开始证书有效期", name = "startValidityTime", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startValidityTime;
@ApiModelProperty(value = "结束证书有效期", name = "endValidityTime", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endValidityTime;
//证书编号
@ApiModelProperty(value = "证书编号")
private String certificateNo;

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

@ -130,12 +130,7 @@ public class CorpInfoE extends BaseE {
private String street;
//公司简介
private String descr;
//隶属关系编码
private String subordination;
//隶属关系名称
private String subordinationName;
//四色图类型，1.平面四色图
private String fourtype;
//营业执照开始时间
private LocalDate licenseStart;
//营业执照结束时间

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

@ -126,12 +126,7 @@ public class CorpInfoXgfE extends BaseE {
private String street;
//公司简介
private String descr;
//隶属关系编码
private String subordination;
//隶属关系名称
private String subordinationName;
//四色图类型，1.平面四色图
private String fourtype;
//营业执照开始时间
private LocalDate licenseStart;
//营业执照结束时间

3
web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpQualificationInfoE.java
View File

@ -27,7 +27,8 @@ public class CorpQualificationInfoE extends BaseE {
//资质名称
private String qualificationName;
//证书有效期
private Date validityTime;
private Date startValidityTime;
private Date endValidityTime;
//证书编号
private String certificateNo;

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

@ -186,15 +186,7 @@ public class CorpInfoDO extends BaseDO {
//公司简介
@ApiModelProperty(value = "公司简介")
private String descr;
//隶属关系编码
@ApiModelProperty(value = "隶属关系编码")
private String subordination;
//隶属关系名称
@ApiModelProperty(value = "隶属关系名称")
private String subordinationName;
//四色图类型，1.平面四色图
@ApiModelProperty(value = "四色图类型，1.平面四色图")
private String fourtype;
//营业执照开始时间
@ApiModelProperty(value = "营业执照开始时间")
private LocalDate licenseStart;

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

@ -33,9 +33,13 @@ public class CorpQualificationInfoDO extends BaseDO {
@ApiModelProperty(value = "资质名称")
private String qualificationName;
@ApiModelProperty(value = "证书有效期", name = "validityTime", required = true)
@ApiModelProperty(value = "开始证书有效期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date validityTime;
private Date startValidityTime;
@ApiModelProperty(value = "结束证书有效期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endValidityTime;
//证书编号
@ApiModelProperty(value = "证书编号")