From 3957f1ae8aa84eb6c2e6f8ea712ac860d21a20e5 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Mon, 3 Nov 2025 17:23:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](main)=20?= =?UTF-8?q?=20-=20=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/dto/CorpInfoAddCmd.java | 34 +++++----- .../basic/info/dto/CorpInfoUpdateCmd.java | 34 +++++----- .../basic/info/dto/CorpInfoXgfAddCmd.java | 2 +- .../basic/info/dto/CorpInfoXgfUpdateCmd.java | 40 ++++++------ .../info/dto/clientobject/CorpInfoCO.java | 63 +++++++++--------- .../info/dto/clientobject/CorpInfoXgfCO.java | 63 +++++++++--------- .../basic/info/domain/model/CorpInfoE.java | 32 +++++---- .../basic/info/domain/model/CorpInfoXgfE.java | 32 +++++---- .../persistence/dataobject/CorpInfoDO.java | 65 +++++++++---------- 9 files changed, 173 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 a391d12..36db005 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 @@ -36,7 +36,7 @@ public class CorpInfoAddCmd extends Command { private Integer xgfLevel; @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) private Integer corOrder; - @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true) private Integer isUse; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) private String code; @@ -78,7 +78,7 @@ public class CorpInfoAddCmd extends Command { private String safetyName; @ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true) private String safetyPhone; - @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true) + @ApiModelProperty(value = "是否规模以上,1:是,0:否", name = "scaleType", required = true) private Integer scaleType; @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true) private BigDecimal areaCovered; @@ -129,8 +129,6 @@ public class CorpInfoAddCmd extends Command { private String streetName; @ApiModelProperty(value = "所属街道编码", name = "street", required = true) private String street; - @ApiModelProperty(value = "公司简介", name = "descr", required = true) - private String descr; @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true) @JsonFormat(pattern = "yyyy-MM-dd") @@ -139,33 +137,33 @@ public class CorpInfoAddCmd extends Command { @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true) + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) private Integer whetherHygiene; - @ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true) + @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) private Integer whetherHazards; - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否", name = "whetherScarce", required = true) + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) private Integer whetherScarce; - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否", name = "whetherChemicals", required = true) + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) private Integer whetherChemicals; - @ApiModelProperty(value = "有无特种设备,1:是,2:否", name = "whetherSpecialequipment", required = true) + @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) private Integer whetherSpecialequipment; - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否", name = "whetherSpecialpeople", required = true) + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) private Integer whetherSpecialpeople; - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否", name = "whetherCoalgas", required = true) + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) private Integer whetherCoalgas; - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否", name = "whetherFire", required = true) + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) private Integer whetherFire; - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否", name = "whetherConfined", required = true) + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) private Integer whetherConfined; - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否", name = "whetherPowder", required = true) + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) private Integer whetherPowder; - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否", name = "whetherLightning", required = true) + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) private Integer whetherLightning; - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否", name = "whetherPipeline", required = true) + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) private Integer whetherPipeline; - @ApiModelProperty(value = "是否持有放射源,1:是,2:否", name = "whetherActinogen", required = true) + @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) private Integer whetherActinogen; - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true) + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) private Integer whetherLiquidammonia; } 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 0ae0ba7..31a52de 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 @@ -39,7 +39,7 @@ public class CorpInfoUpdateCmd extends Command { private Integer xgfLevel; @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) private Integer corOrder; - @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true) private Integer isUse; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) private String code; @@ -82,7 +82,7 @@ public class CorpInfoUpdateCmd extends Command { private String safetyName; @ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true) private String safetyPhone; - @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true) + @ApiModelProperty(value = "是否规模以上,1:是,0:否", name = "scaleType", required = true) private Integer scaleType; @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true) private BigDecimal areaCovered; @@ -133,8 +133,6 @@ public class CorpInfoUpdateCmd extends Command { private String streetName; @ApiModelProperty(value = "所属街道编码", name = "street", required = true) private String street; - @ApiModelProperty(value = "公司简介", name = "descr", required = true) - private String descr; @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true) @JsonFormat(pattern = "yyyy-MM-dd") @@ -143,33 +141,33 @@ public class CorpInfoUpdateCmd extends Command { @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true) + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) private Integer whetherHygiene; - @ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true) + @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) private Integer whetherHazards; - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否", name = "whetherScarce", required = true) + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) private Integer whetherScarce; - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否", name = "whetherChemicals", required = true) + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) private Integer whetherChemicals; - @ApiModelProperty(value = "有无特种设备,1:是,2:否", name = "whetherSpecialequipment", required = true) + @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) private Integer whetherSpecialequipment; - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否", name = "whetherSpecialpeople", required = true) + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) private Integer whetherSpecialpeople; - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否", name = "whetherCoalgas", required = true) + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) private Integer whetherCoalgas; - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否", name = "whetherFire", required = true) + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) private Integer whetherFire; - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否", name = "whetherConfined", required = true) + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) private Integer whetherConfined; - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否", name = "whetherPowder", required = true) + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) private Integer whetherPowder; - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否", name = "whetherLightning", required = true) + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) private Integer whetherLightning; - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否", name = "whetherPipeline", required = true) + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) private Integer whetherPipeline; - @ApiModelProperty(value = "是否持有放射源,1:是,2:否", name = "whetherActinogen", required = true) + @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) private Integer whetherActinogen; - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true) + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) private Integer whetherLiquidammonia; } 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 df3a36c..ee8bc2b 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 @@ -37,7 +37,7 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) private Integer corOrder; - @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true) private Integer isUse; @ApiModelProperty(value = "统一社会信用代码", name = "code", 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 57e9b38..a1809e7 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 @@ -40,7 +40,7 @@ public class CorpInfoXgfUpdateCmd extends Command { private Integer xgfLevel; @ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true) private Integer corOrder; - @ApiModelProperty(value = "是否启用，1:启用,2:关闭", name = "isUse", required = true) + @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "isUse", required = true) private Integer isUse; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) private String code; @@ -81,7 +81,7 @@ public class CorpInfoXgfUpdateCmd extends Command { private String safetyName; @ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true) private String safetyPhone; - @ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true) + @ApiModelProperty(value = "是否规模以上,1:是,0:否", name = "scaleType", required = true) private Integer scaleType; @ApiModelProperty(value = "占地面积", name = "areaCovered", required = true) private BigDecimal areaCovered; @@ -131,9 +131,7 @@ public class CorpInfoXgfUpdateCmd extends Command { private String streetName; @ApiModelProperty(value = "所属街道编码", name = "street", required = true) private String street; - @ApiModelProperty(value = "公司简介", name = "descr", required = true) - private String descr; - + @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseStart; @@ -141,33 +139,33 @@ public class CorpInfoXgfUpdateCmd extends Command { @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true) + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) private Integer whetherHygiene; - @ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true) + @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) private Integer whetherHazards; - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否", name = "whetherScarce", required = true) + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) private Integer whetherScarce; - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否", name = "whetherChemicals", required = true) + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) private Integer whetherChemicals; - @ApiModelProperty(value = "有无特种设备,1:是,2:否", name = "whetherSpecialequipment", required = true) + @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) private Integer whetherSpecialequipment; - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否", name = "whetherSpecialpeople", required = true) + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) private Integer whetherSpecialpeople; - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否", name = "whetherCoalgas", required = true) + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) private Integer whetherCoalgas; - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否", name = "whetherFire", required = true) + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) private Integer whetherFire; - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否", name = "whetherConfined", required = true) + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) private Integer whetherConfined; - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否", name = "whetherPowder", required = true) + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) private Integer whetherPowder; - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否", name = "whetherLightning", required = true) + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) private Integer whetherLightning; - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否", name = "whetherPipeline", required = true) + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) private Integer whetherPipeline; - @ApiModelProperty(value = "是否持有放射源,1:是,2:否", name = "whetherActinogen", required = true) + @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) private Integer whetherActinogen; - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true) + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) private Integer whetherLiquidammonia; /* @ApiModelProperty(value = "用工形式", name = "employmentformList", required = true) private List employmentformList; @@ -182,8 +180,8 @@ public class CorpInfoXgfUpdateCmd extends Command { @ApiModelProperty(value = "基层单位主管部门", name = "superVisecorpDeptList", required = true) private List superVisecorpDeptList; @ApiModelProperty(value = "集团单位", name = "corpTypeList", required = true) - private List corpTypeList; - @ApiModelProperty(value = "密码", name = "passWord", required = true)*/ + private List corpTypeList;*/ + @ApiModelProperty(value = "密码", name = "passWord", required = true) private String passWord; } 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 3d5cdeb..6f34ed0 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 @@ -94,8 +94,8 @@ public class CorpInfoCO extends ClientObject { //安全负责人手机号 @ApiModelProperty(value = "安全负责人手机号") private String safetyPhone; - //是否规模以上,1:是,2:否 - @ApiModelProperty(value = "是否规模以上,1:是,2:否") + //是否规模以上,1:是,0:否 + @ApiModelProperty(value = "是否规模以上,1:是,0:否") private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") @@ -170,56 +170,53 @@ public class CorpInfoCO extends ClientObject { //所属街道编码 @ApiModelProperty(value = "所属街道编码") private String street; - //公司简介 - @ApiModelProperty(value = "公司简介") - private String descr; @ApiModelProperty(value = "营业执照开始时间") private LocalDate licenseStart; //营业执照结束时间 @ApiModelProperty(value = "营业执照结束时间") private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否") + //有无职业卫生信息,1:是,0:否 + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 - @ApiModelProperty(value = "有无重大危险源,1:是,2:否") + //有无重大危险源,1:是,0:否 + @ApiModelProperty(value = "有无重大危险源,1:是,0:否") private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否") + //是否有稀缺大型应急物资或设施,1:是,0:否 + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否") + //是否涉及危化品,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") private Integer whetherChemicals; - //有无特种设备,1:是,2:否 - @ApiModelProperty(value = "有无特种设备,1:是,2:否") + //有无特种设备,1:是,0:否 + @ApiModelProperty(value = "有无特种设备,1:是,0:否") private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否") + //有无特存种作业人员,1:是,0:否 + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否") + //是否涉及煤气,1:是,0:否 + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否") + //是否属于消防重点单位,1:是,0:否 + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否") + //是否在有限空间作业,1:是,0:否 + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否") + //是否存在涉爆粉尘作业,1:是,0:否 + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否") + //是否涉及防雷防静电,1:是,0:否 + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否") + //是否涉及危化品管道,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 - @ApiModelProperty(value = "是否持有放射源,1:是,2:否") + //是否持有放射源,1:是,0:否 + @ApiModelProperty(value = "是否持有放射源,1:是,0:否") private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否") + //是否涉及液氨制冷,1:是,0:否 + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") private Integer whetherLiquidammonia; //乐观锁 @ApiModelProperty(value = "乐观锁") 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 6feda4d..d91311f 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 @@ -95,8 +95,8 @@ public class CorpInfoXgfCO extends ClientObject { //安全负责人手机号 @ApiModelProperty(value = "安全负责人手机号") private String safetyPhone; - //是否规模以上,1:是,2:否 - @ApiModelProperty(value = "是否规模以上,1:是,2:否") + //是否规模以上,1:是,0:否 + @ApiModelProperty(value = "是否规模以上,1:是,0:否") private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") @@ -170,56 +170,53 @@ public class CorpInfoXgfCO extends ClientObject { //所属街道编码 @ApiModelProperty(value = "所属街道编码") private String street; - //公司简介 - @ApiModelProperty(value = "公司简介") - private String descr; @ApiModelProperty(value = "营业执照开始时间") private LocalDate licenseStart; //营业执照结束时间 @ApiModelProperty(value = "营业执照结束时间") private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否") + //有无职业卫生信息,1:是,0:否 + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 - @ApiModelProperty(value = "有无重大危险源,1:是,2:否") + //有无重大危险源,1:是,0:否 + @ApiModelProperty(value = "有无重大危险源,1:是,0:否") private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否") + //是否有稀缺大型应急物资或设施,1:是,0:否 + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否") + //是否涉及危化品,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") private Integer whetherChemicals; - //有无特种设备,1:是,2:否 - @ApiModelProperty(value = "有无特种设备,1:是,2:否") + //有无特种设备,1:是,0:否 + @ApiModelProperty(value = "有无特种设备,1:是,0:否") private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否") + //有无特存种作业人员,1:是,0:否 + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否") + //是否涉及煤气,1:是,0:否 + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否") + //是否属于消防重点单位,1:是,0:否 + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否") + //是否在有限空间作业,1:是,0:否 + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否") + //是否存在涉爆粉尘作业,1:是,0:否 + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否") + //是否涉及防雷防静电,1:是,0:否 + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否") + //是否涉及危化品管道,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 - @ApiModelProperty(value = "是否持有放射源,1:是,2:否") + //是否持有放射源,1:是,0:否 + @ApiModelProperty(value = "是否持有放射源,1:是,0:否") private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否") + //是否涉及液氨制冷,1:是,0:否 + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") private Integer whetherLiquidammonia; //创建人 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 a4363fe..f68f2c0 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 @@ -72,7 +72,7 @@ public class CorpInfoE extends BaseE { private String safetyName; //安全负责人手机号 private String safetyPhone; - //是否规模以上,1:是,2:否 + //是否规模以上,1:是,0:否 private Integer scaleType; //占地面积 private BigDecimal areaCovered; @@ -122,40 +122,38 @@ public class CorpInfoE extends BaseE { private String streetName; //所属街道编码 private String street; - //公司简介 - private String descr; //营业执照开始时间 private LocalDate licenseStart; //营业执照结束时间 private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 + //有无职业卫生信息,1:是,0:否 private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 + //有无重大危险源,1:是,0:否 private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 + //是否有稀缺大型应急物资或设施,1:是,0:否 private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 + //是否涉及危化品,1:是,0:否 private Integer whetherChemicals; - //有无特种设备,1:是,2:否 + //有无特种设备,1:是,0:否 private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 + //有无特存种作业人员,1:是,0:否 private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 + //是否涉及煤气,1:是,0:否 private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 + //是否属于消防重点单位,1:是,0:否 private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 + //是否在有限空间作业,1:是,0:否 private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 + //是否存在涉爆粉尘作业,1:是,0:否 private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 + //是否涉及防雷防静电,1:是,0:否 private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 + //是否涉及危化品管道,1:是,0:否 private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 + //是否持有放射源,1:是,0:否 private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 + //是否涉及液氨制冷,1:是,0:否 private Integer whetherLiquidammonia; 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 cebfc21..5f44a07 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 @@ -69,7 +69,7 @@ public class CorpInfoXgfE extends BaseE { private String safetyName; //安全负责人手机号 private String safetyPhone; - //是否规模以上,1:是,2:否 + //是否规模以上,1:是,0:否 private Integer scaleType; //占地面积 private BigDecimal areaCovered; @@ -120,40 +120,38 @@ public class CorpInfoXgfE extends BaseE { private String streetName; //所属街道编码 private String street; - //公司简介 - private String descr; //营业执照开始时间 private LocalDate licenseStart; //营业执照结束时间 private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 + //有无职业卫生信息,1:是,0:否 private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 + //有无重大危险源,1:是,0:否 private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 + //是否有稀缺大型应急物资或设施,1:是,0:否 private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 + //是否涉及危化品,1:是,0:否 private Integer whetherChemicals; - //有无特种设备,1:是,2:否 + //有无特种设备,1:是,0:否 private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 + //有无特存种作业人员,1:是,0:否 private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 + //是否涉及煤气,1:是,0:否 private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 + //是否属于消防重点单位,1:是,0:否 private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 + //是否在有限空间作业,1:是,0:否 private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 + //是否存在涉爆粉尘作业,1:是,0:否 private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 + //是否涉及防雷防静电,1:是,0:否 private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 + //是否涉及危化品管道,1:是,0:否 private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 + //是否持有放射源,1:是,0:否 private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 + //是否涉及液氨制冷,1:是,0:否 private Integer whetherLiquidammonia; } 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 0d6388a..13357be 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 @@ -42,7 +42,7 @@ public class CorpInfoDO extends BaseDO { @ApiModelProperty(value = "企业再列表中的排序") private Integer corOrder; //是否启用，1:启用,2:关闭 - @ApiModelProperty(value = "是否启用，1:启用,2:关闭") + @ApiModelProperty(value = "是否启用，1:启用,0:关闭") private Integer isUse; //统一社会信用代码 @ApiModelProperty(value = "统一社会信用代码") @@ -100,8 +100,8 @@ public class CorpInfoDO extends BaseDO { //安全负责人手机号 @ApiModelProperty(value = "安全负责人手机号") private String safetyPhone; - //是否规模以上,1:是,2:否 - @ApiModelProperty(value = "是否规模以上,1:是,2:否") + //是否规模以上,1:是,0:否 + @ApiModelProperty(value = "是否规模以上,1:是,0:否") private Integer scaleType; //占地面积 @ApiModelProperty(value = "占地面积") @@ -175,9 +175,6 @@ public class CorpInfoDO extends BaseDO { //所属街道编码 @ApiModelProperty(value = "所属街道编码") private String street; - //公司简介 - @ApiModelProperty(value = "公司简介") - private String descr; //营业执照开始时间 @ApiModelProperty(value = "营业执照开始时间") @@ -185,47 +182,47 @@ public class CorpInfoDO extends BaseDO { //营业执照结束时间 @ApiModelProperty(value = "营业执照结束时间") private LocalDate licenseEnd; - //有无职业卫生信息,1:是,2:否 - @ApiModelProperty(value = "有无职业卫生信息,1:是,2:否") + //有无职业卫生信息,1:是,0:否 + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") private Integer whetherHygiene; - //有无重大危险源,1:是,2:否 - @ApiModelProperty(value = "有无重大危险源,1:是,2:否") + //有无重大危险源,1:是,0:否 + @ApiModelProperty(value = "有无重大危险源,1:是,0:否") private Integer whetherHazards; - //是否有稀缺大型应急物资或设施,1:是,2:否 - @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否") + //是否有稀缺大型应急物资或设施,1:是,0:否 + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") private Integer whetherScarce; - //是否涉及危化品,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品,1:是,2:否") + //是否涉及危化品,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") private Integer whetherChemicals; - //有无特种设备,1:是,2:否 - @ApiModelProperty(value = "有无特种设备,1:是,2:否") + //有无特种设备,1:是,0:否 + @ApiModelProperty(value = "有无特种设备,1:是,0:否") private Integer whetherSpecialequipment; - //有无特存种作业人员,1:是,2:否 - @ApiModelProperty(value = "有无特存种作业人员,1:是,2:否") + //有无特存种作业人员,1:是,0:否 + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") private Integer whetherSpecialpeople; - //是否涉及煤气,1:是,2:否 - @ApiModelProperty(value = "是否涉及煤气,1:是,2:否") + //是否涉及煤气,1:是,0:否 + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") private Integer whetherCoalgas; - //是否属于消防重点单位,1:是,2:否 - @ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否") + //是否属于消防重点单位,1:是,0:否 + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") private Integer whetherFire; - //是否在有限空间作业,1:是,2:否 - @ApiModelProperty(value = "是否在有限空间作业,1:是,2:否") + //是否在有限空间作业,1:是,0:否 + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") private Integer whetherConfined; - //是否存在涉爆粉尘作业,1:是,2:否 - @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否") + //是否存在涉爆粉尘作业,1:是,0:否 + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") private Integer whetherPowder; - //是否涉及防雷防静电,1:是,2:否 - @ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否") + //是否涉及防雷防静电,1:是,0:否 + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") private Integer whetherLightning; - //是否涉及危化品管道,1:是,2:否 - @ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否") + //是否涉及危化品管道,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") private Integer whetherPipeline; - //是否持有放射源,1:是,2:否 - @ApiModelProperty(value = "是否持有放射源,1:是,2:否") + //是否持有放射源,1:是,0:否 + @ApiModelProperty(value = "是否持有放射源,1:是,0:否") private Integer whetherActinogen; - //是否涉及液氨制冷,1:是,2:否 - @ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否") + //是否涉及液氨制冷,1:是,0:否 + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") private Integer whetherLiquidammonia; //乐观锁 @ApiModelProperty(value = "乐观锁")