From 64a9132d66d46aae8e561b5240eb1ad55468af67 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 3 Nov 2025 15:17:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BC=81=E4=B8=9A=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=97=A0=E7=94=A8=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 | 8 +---- .../basic/info/dto/CorpInfoUpdateCmd.java | 9 ++--- .../basic/info/dto/CorpInfoXgfUpdateCmd.java | 7 ---- .../basic/info/dto/DepartmentAddCmd.java | 23 +------------ .../basic/info/dto/DepartmentUpdateCmd.java | 24 ++----------- .../info/dto/clientobject/CorpInfoCO.java | 10 +----- .../info/dto/clientobject/CorpInfoXgfCO.java | 9 ----- .../info/dto/clientobject/DepartmentCO.java | 34 +------------------ .../basic/info/domain/model/CorpInfoE.java | 6 ---- .../basic/info/domain/model/CorpInfoXgfE.java | 8 ++--- .../basic/info/domain/model/DepartmentE.java | 22 ------------ .../persistence/dataobject/CorpInfoDO.java | 10 +----- .../persistence/dataobject/DepartmentDO.java | 33 ------------------ 13 files changed, 11 insertions(+), 192 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 4125171..a391d12 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 @@ -46,9 +46,6 @@ public class CorpInfoAddCmd extends Command { private String postalCode; @ApiModelProperty(value = "所属区域", name = "companyArea", required = true) private String companyArea; - @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate firstServeDate; @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) @@ -68,10 +65,7 @@ public class CorpInfoAddCmd extends Command { private String addressBusiness; @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true) private String addressOffice; - @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true) - private BigDecimal fixedAssets; - @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true) - private BigDecimal yearOutputValue; + @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", 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 97e7e32..0ae0ba7 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 @@ -49,9 +49,7 @@ public class CorpInfoUpdateCmd extends Command { private String postalCode; @ApiModelProperty(value = "所属区域", name = "companyArea", required = true) private String companyArea; - @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate firstServeDate; + @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) @@ -71,10 +69,7 @@ public class CorpInfoUpdateCmd extends Command { private String addressBusiness; @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true) private String addressOffice; - @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true) - private BigDecimal fixedAssets; - @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true) - private BigDecimal yearOutputValue; + @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true) 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 0adba80..57e9b38 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 @@ -50,9 +50,6 @@ public class CorpInfoXgfUpdateCmd extends Command { private String postalCode; @ApiModelProperty(value = "所属区域", name = "companyArea", required = true) private String companyArea; - @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate firstServeDate; @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) @@ -72,10 +69,6 @@ public class CorpInfoXgfUpdateCmd extends Command { private String addressBusiness; @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true) private String addressOffice; - @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true) - private BigDecimal fixedAssets; - @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true) - private BigDecimal yearOutputValue; @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) private String ecoType; @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java index 80b497e..a31bf75 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java @@ -31,12 +31,7 @@ public class DepartmentAddCmd extends Command { @ApiModelProperty(value = "父部门id", name = "parentId", required = true) @NotNull(message = "父部门id不能为空") private Long parentId; - @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true) - private String headman; - @ApiModelProperty(value = "负责人手机号", name = "phone", required = true) - private String phone; - @ApiModelProperty(value = "地址,汉字80以内", name = "address", required = true) - private String address; + @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) private Long corpinfoId; @ApiModelProperty(value = "部门级别编码", name = "level", required = true) @@ -47,22 +42,6 @@ public class DepartmentAddCmd extends Command { private Integer depOrder; @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "isSupervise", required = true) private Integer isSupervise; - @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门", name = "state", required = true) - private Integer state; - @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true) - private String leaderCharge; - @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true) - private String lrman; - @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true) - private Integer category; - @ApiModelProperty(value = "单位类型名称,汉字30以内", name = "deptTypeName", required = true) - private String deptTypeName; - @ApiModelProperty(value = "单位类型编码", name = "deptType", required = true) - private String deptType; - @ApiModelProperty(value = "部门类型编码", name = "type", required = true) - private String type; - @ApiModelProperty(value = "部门类型名称,汉字30以内", name = "typeName", required = true) - private String typeName; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java index 0c3f3db..9b053f2 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java @@ -32,12 +32,7 @@ public class DepartmentUpdateCmd extends Command { private String name; @ApiModelProperty(value = "父部门id", name = "parentId", required = true) private Long parentId; - @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true) - private String headman; - @ApiModelProperty(value = "负责人手机号", name = "phone", required = true) - private String phone; - @ApiModelProperty(value = "地址,汉字80以内", name = "address", required = true) - private String address; + @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) private Long corpinfoId; @ApiModelProperty(value = "部门级别编码", name = "level", required = true) @@ -48,22 +43,7 @@ public class DepartmentUpdateCmd extends Command { private Integer depOrder; @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "isSupervise", required = true) private Integer isSupervise; - @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门", name = "state", required = true) - private Integer state; - @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true) - private String leaderCharge; - @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true) - private String lrman; - @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true) - private Integer category; - @ApiModelProperty(value = "单位类型名称,汉字30以内", name = "deptTypeName", required = true) - private String deptTypeName; - @ApiModelProperty(value = "单位类型编码", name = "deptType", required = true) - private String deptType; - @ApiModelProperty(value = "部门类型编码", name = "type", required = true) - private String type; - @ApiModelProperty(value = "部门类型名称,汉字30以内", name = "typeName", required = true) - private String typeName; + } 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 faae602..3d5cdeb 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 @@ -50,9 +50,7 @@ public class CorpInfoCO extends ClientObject { //所属区域 @ApiModelProperty(value = "所属区域") private String companyArea; - //开始服务日期 - @ApiModelProperty(value = "开始服务日期") - private LocalDate firstServeDate; + //规模 @ApiModelProperty(value = "规模") private String scale; @@ -79,12 +77,6 @@ public class CorpInfoCO extends ClientObject { //企事业单位办公地址 @ApiModelProperty(value = "企事业单位办公地址") private String addressOffice; - //固定资产 - @ApiModelProperty(value = "固定资产") - private BigDecimal fixedAssets; - //年产值 - @ApiModelProperty(value = "年产值") - private BigDecimal yearOutputValue; //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; 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 34fc0fa..6feda4d 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 @@ -52,9 +52,6 @@ public class CorpInfoXgfCO extends ClientObject { //所属区域 @ApiModelProperty(value = "所属区域") private String companyArea; - //开始服务日期 - @ApiModelProperty(value = "开始服务日期") - private LocalDate firstServeDate; //规模 @ApiModelProperty(value = "规模") private String scale; @@ -81,12 +78,6 @@ public class CorpInfoXgfCO extends ClientObject { //企事业单位办公地址 @ApiModelProperty(value = "企事业单位办公地址") private String addressOffice; - //固定资产 - @ApiModelProperty(value = "固定资产") - private BigDecimal fixedAssets; - //年产值 - @ApiModelProperty(value = "年产值") - private BigDecimal yearOutputValue; //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java index 0470705..0aa9d4d 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java @@ -27,15 +27,6 @@ public class DepartmentCO extends ClientObject { //父部门id @ApiModelProperty(value = "父部门id") private Long parentId; - //负责人 - @ApiModelProperty(value = "负责人") - private String headman; - //负责人手机号 - @ApiModelProperty(value = "负责人手机号") - private String phone; - //地址 - @ApiModelProperty(value = "地址") - private String address; //所属企业 @ApiModelProperty(value = "所属企业") private Long corpinfoId; @@ -51,30 +42,7 @@ public class DepartmentCO extends ClientObject { //是否监管部门 0-否 1-是 @ApiModelProperty(value = "是否监管部门 0-否 1-是") private Integer isSupervise; - //0安监部门1消防部门 - @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门") - private Integer state; - //主管领导 - @ApiModelProperty(value = "主管领导") - private String leaderCharge; - //分管领导人 - @ApiModelProperty(value = "分管领导人") - private String lrman; - //部门类别:1.行业监管 2.综合监管 - @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管") - private Integer category; - //单位类型名称 - @ApiModelProperty(value = "单位类型名称") - private String deptTypeName; - //单位类型编码 - @ApiModelProperty(value = "单位类型编码") - private String deptType; - //部门类型编码 - @ApiModelProperty(value = "部门类型编码") - private String type; - //部门类型名称 - @ApiModelProperty(value = "部门类型名称") - private String typeName; + //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version; 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 07e73d7..a4363fe 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 @@ -43,8 +43,6 @@ public class CorpInfoE extends BaseE { private String postalCode; //所属区域 private String companyArea; - //开始服务日期 - private LocalDate firstServeDate; //规模 private String scale; //规模名称 @@ -63,10 +61,6 @@ public class CorpInfoE extends BaseE { private String addressBusiness; //企事业单位办公地址 private String addressOffice; - //固定资产 - private BigDecimal fixedAssets; - //年产值 - private BigDecimal yearOutputValue; //经济类型 private String ecoType; private String ecoTypeName; 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 d56e30f..cebfc21 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 @@ -37,8 +37,7 @@ public class CorpInfoXgfE extends BaseE { private String postalCode; //所属区域 private String companyArea; - //开始服务日期 - private LocalDate firstServeDate; + //规模 private String scale; //规模名称 @@ -57,10 +56,7 @@ public class CorpInfoXgfE extends BaseE { private String addressBusiness; //企事业单位办公地址 private String addressOffice; - //固定资产 - private BigDecimal fixedAssets; - //年产值 - private BigDecimal yearOutputValue; + //经济类型 private String ecoType; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java index b1dd64c..5ab0b89 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java @@ -25,12 +25,6 @@ public class DepartmentE extends BaseE { private String name; //父部门id private Long parentId; - //负责人 - private String headman; - //负责人手机号 - private String phone; - //地址 - private String address; //所属企业 private Long corpinfoId; //部门级别编码 @@ -41,22 +35,6 @@ public class DepartmentE extends BaseE { private Integer depOrder; //是否监管部门 0-否 1-是 private Integer isSupervise; - //安全管理部门,0安监部门1消防部门 - private Integer state; - //主管领导 - private String leaderCharge; - //分管领导人 - private String lrman; - //部门类别:1.行业监管 2.综合监管 - private Integer category; - //单位类型名称 - private String deptTypeName; - //单位类型编码 - private String deptType; - //部门类型编码 - private String type; - //部门类型名称 - private String typeName; } 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 b2782ce..0d6388a 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 @@ -56,9 +56,7 @@ public class CorpInfoDO extends BaseDO { //所属区域 @ApiModelProperty(value = "所属区域") private String companyArea; - //开始服务日期 - @ApiModelProperty(value = "开始服务日期") - private LocalDate firstServeDate; + //规模 @ApiModelProperty(value = "规模") private String scale; @@ -85,12 +83,6 @@ public class CorpInfoDO extends BaseDO { //企事业单位办公地址 @ApiModelProperty(value = "企事业单位办公地址") private String addressOffice; - //固定资产 - @ApiModelProperty(value = "固定资产") - private BigDecimal fixedAssets; - //年产值 - @ApiModelProperty(value = "年产值") - private BigDecimal yearOutputValue; //经济类型 @ApiModelProperty(value = "经济类型") private String ecoType; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java index 0f57cbf..8da0221 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java @@ -30,15 +30,6 @@ public class DepartmentDO extends BaseDO { //父部门id @ApiModelProperty(value = "父部门id") private Long parentId; - //负责人 - @ApiModelProperty(value = "负责人") - private String headman; - //负责人手机号 - @ApiModelProperty(value = "负责人手机号") - private String phone; - //地址 - @ApiModelProperty(value = "地址") - private String address; //所属企业 @ApiModelProperty(value = "所属企业") private Long corpinfoId; @@ -54,30 +45,6 @@ public class DepartmentDO extends BaseDO { //是否监管部门 0-否 1-是 @ApiModelProperty(value = "是否监管部门 0-否 1-是") private Integer isSupervise; - //0安监部门1消防部门 - @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门") - private Integer state; - //主管领导 - @ApiModelProperty(value = "主管领导") - private String leaderCharge; - //分管领导人 - @ApiModelProperty(value = "分管领导人") - private String lrman; - //部门类别:1.行业监管 2.综合监管 - @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管") - private Integer category; - //单位类型名称 - @ApiModelProperty(value = "单位类型名称") - private String deptTypeName; - //单位类型编码 - @ApiModelProperty(value = "单位类型编码") - private String deptType; - //部门类型编码 - @ApiModelProperty(value = "部门类型编码") - private String type; - //部门类型名称 - @ApiModelProperty(value = "部门类型名称") - private String typeName; }