From 3c0efee6b2e1cad6426dc9dfad6c209be9f3717f Mon Sep 17 00:00:00 2001 From: zhaokai Date: Sat, 1 Nov 2025 14:03:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/dto/CorpInfoAddCmd.java | 7 +++--- .../basic/info/dto/CorpInfoUpdateCmd.java | 7 +++--- .../basic/info/dto/CorpInfoXgfAddCmd.java | 23 ++++++++----------- .../basic/info/dto/CorpInfoXgfUpdateCmd.java | 6 ++--- .../info/dto/clientobject/CorpInfoCO.java | 9 +++----- .../info/dto/clientobject/CorpInfoXgfCO.java | 8 ++----- .../basic/info/domain/model/CorpInfoE.java | 5 +--- .../basic/info/domain/model/CorpInfoXgfE.java | 7 +++--- .../persistence/dataobject/CorpInfoDO.java | 8 ++----- 9 files changed, 29 insertions(+), 51 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java index 7655f27..ab7ab04 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java @@ -74,6 +74,8 @@ public class CorpInfoAddCmd extends Command { private BigDecimal yearOutputValue; @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; + @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true) + private String ecoTypeName; @ApiModelProperty(value = "主要负责人", name = "contacts", required = true) private String contacts; @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true) @@ -92,10 +94,7 @@ public class CorpInfoAddCmd extends Command { private String longitude; @ApiModelProperty(value = "纬度", name = "latitude", required = true) private String latitude; - @ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true) - private String regType; - @ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true) - private String industryDepartment; + @ApiModelProperty(value = "法定代表人", name = "lrName", required = true) private String lrName; @ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java index 2063ac4..d070ffd 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java @@ -77,6 +77,8 @@ public class CorpInfoUpdateCmd extends Command { private BigDecimal yearOutputValue; @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; + @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true) + private String ecoTypeName; @ApiModelProperty(value = "主要负责人", name = "contacts", required = true) private String contacts; @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true) @@ -95,10 +97,7 @@ public class CorpInfoUpdateCmd extends Command { private String longitude; @ApiModelProperty(value = "纬度", name = "latitude", required = true) private String latitude; - @ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true) - private String regType; - @ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true) - private String industryDepartment; + @ApiModelProperty(value = "法定代表人", name = "lrName", required = true) private String lrName; @ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java index 1487df5..9b765ff 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfAddCmd.java @@ -43,7 +43,7 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) private String code; - @ApiModelProperty(value = "通讯地址", name = "address", required = true) + @ApiModelProperty(value = "通讯地址,汉字160以内", name = "address", required = true) private String address; @ApiModelProperty(value = "邮编", name = "postalCode", required = true) @@ -71,16 +71,16 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "企业状态名称", name = "corpStateName", required = true) private String corpStateName; - @ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true) + @ApiModelProperty(value = "资产总额（万元）,10以内", name = "totalAssets", required = true) private BigDecimal totalAssets; - @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true) + @ApiModelProperty(value = "注册资金（万元）,10以内", name = "regcapital", required = true) private BigDecimal regcapital; - @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true) + @ApiModelProperty(value = "企事业单位经营地址,汉字30以内", name = "addressBusiness", required = true) private String addressBusiness; - @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true) + @ApiModelProperty(value = "企事业单位办公地址,汉字30以内", name = "addressOffice", required = true) private String addressOffice; @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true) @@ -92,13 +92,16 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; - @ApiModelProperty(value = "主要负责人", name = "contacts", required = true) + @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true) + private String ecoTypeName; + + @ApiModelProperty(value = "主要负责人,汉字10以内", name = "contacts", required = true) private String contacts; @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true) private String contactsPhone; - @ApiModelProperty(value = "安全负责人", name = "safetyName", required = true) + @ApiModelProperty(value = "安全负责人,汉字10以内", name = "safetyName", required = true) private String safetyName; @ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true) @@ -119,12 +122,6 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "纬度", name = "latitude", required = true) private String latitude; - @ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true) - private String regType; - - @ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true) - private String industryDepartment; - @ApiModelProperty(value = "法定代表人", name = "lrName", required = true) private String lrName; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java index 1b7143b..e8ff392 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java @@ -78,6 +78,8 @@ public class CorpInfoXgfUpdateCmd extends Command { private BigDecimal yearOutputValue; @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; + @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true) + private String ecoTypeName; @ApiModelProperty(value = "主要负责人", name = "contacts", required = true) private String contacts; @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true) @@ -96,10 +98,6 @@ public class CorpInfoXgfUpdateCmd extends Command { private String longitude; @ApiModelProperty(value = "纬度", name = "latitude", required = true) private String latitude; - @ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true) - private String regType; - @ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true) - private String industryDepartment; @ApiModelProperty(value = "法定代表人", name = "lrName", required = true) private String lrName; @ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java index 740451d..96668a0 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java @@ -88,6 +88,8 @@ public class CorpInfoCO extends ClientObject { //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; + @ApiModelProperty(value = "经济类型名称") + private String ecoTypeName; //主要负责人 @ApiModelProperty(value = "主要负责人") private String contacts; @@ -115,12 +117,7 @@ public class CorpInfoCO extends ClientObject { //纬度 @ApiModelProperty(value = "纬度") private String latitude; - //单位注册登记类型 - @ApiModelProperty(value = "单位注册登记类型") - private String regType; - //行业监管部门 - @ApiModelProperty(value = "行业监管部门") - private String industryDepartment; + //法定代表人 @ApiModelProperty(value = "法定代表人") private String lrName; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java index d4d2082..75d33fd 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java @@ -90,6 +90,8 @@ public class CorpInfoXgfCO extends ClientObject { //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; + @ApiModelProperty(value = "经济类型名称") + private String ecoTypeName; //主要负责人 @ApiModelProperty(value = "主要负责人") private String contacts; @@ -117,12 +119,6 @@ public class CorpInfoXgfCO extends ClientObject { //纬度 @ApiModelProperty(value = "纬度") private String latitude; - //单位注册登记类型 - @ApiModelProperty(value = "单位注册登记类型") - private String regType; - //行业监管部门 - @ApiModelProperty(value = "行业监管部门") - private String industryDepartment; //法定代表人 @ApiModelProperty(value = "法定代表人") private String lrName; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java index c2cc631..c4167f7 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java @@ -69,6 +69,7 @@ public class CorpInfoE extends BaseE { private BigDecimal yearOutputValue; //经济类型 private String ecoType; + private String ecoTypeName; //主要负责人 private String contacts; //主要负责人手机号 @@ -87,10 +88,6 @@ public class CorpInfoE extends BaseE { private String longitude; //纬度 private String latitude; - //单位注册登记类型 - private String regType; - //行业监管部门 - private String industryDepartment; //法定代表人 private String lrName; //法人手机号 diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java index 3731326..48b8689 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java @@ -63,6 +63,8 @@ public class CorpInfoXgfE extends BaseE { private BigDecimal yearOutputValue; //经济类型 private String ecoType; + + private String ecoTypeName; //主要负责人 private String contacts; //主要负责人手机号 @@ -81,10 +83,7 @@ public class CorpInfoXgfE extends BaseE { private String longitude; //纬度 private String latitude; - //单位注册登记类型 - private String regType; - //行业监管部门 - private String industryDepartment; + //法定代表人 private String lrName; //法人手机号 diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java index 99b2a11..f5a0e25 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java @@ -94,6 +94,8 @@ public class CorpInfoDO extends BaseDO { //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; + @ApiModelProperty(value = "经济类型名称") + private String ecoTypeName; //主要负责人 @ApiModelProperty(value = "主要负责人") private String contacts; @@ -121,12 +123,6 @@ public class CorpInfoDO extends BaseDO { //纬度 @ApiModelProperty(value = "纬度") private String latitude; - //单位注册登记类型 - @ApiModelProperty(value = "单位注册登记类型") - private String regType; - //行业监管部门 - @ApiModelProperty(value = "行业监管部门") - private String industryDepartment; //法定代表人 @ApiModelProperty(value = "法定代表人") private String lrName;