From ff9808690438f097086ca2345ac9883cde5c3fe7 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Tue, 4 Nov 2025 08:49:29 +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 | 28 +++++++++---------- .../basic/info/dto/CorpInfoUpdateCmd.java | 28 +++++++++---------- .../basic/info/dto/CorpInfoXgfUpdateCmd.java | 28 +++++++++---------- .../basic/info/domain/model/CorpInfoE.java | 28 +++++++++---------- .../basic/info/domain/model/CorpInfoXgfE.java | 28 +++++++++---------- .../persistence/dataobject/CorpInfoDO.java | 28 +++++++++---------- 6 files changed, 84 insertions(+), 84 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 36db005..bbc7950 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 @@ -138,33 +138,33 @@ public class CorpInfoAddCmd extends Command { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; + private Integer whetherHygieneFlag; @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) - private Integer whetherHazards; + private Integer whetherHazardsFlag; @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) - private Integer whetherScarce; + private Integer whetherScarceFlag; @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) - private Integer whetherFire; + private Integer whetherFireFlag; @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) - private Integer whetherConfined; + private Integer whetherConfinedFlag; @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) - private Integer whetherPowder; + private Integer whetherPowderFlag; @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) - private Integer whetherLightning; + private Integer whetherLightningFlag; @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; + private Integer whetherPipelineFlag; @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; + private Integer whetherActinogenFlag; @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; } 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 31a52de..35c868f 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 @@ -142,33 +142,33 @@ public class CorpInfoUpdateCmd extends Command { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; + private Integer whetherHygieneFlag; @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) - private Integer whetherHazards; + private Integer whetherHazardsFlag; @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) - private Integer whetherScarce; + private Integer whetherScarceFlag; @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) - private Integer whetherFire; + private Integer whetherFireFlag; @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) - private Integer whetherConfined; + private Integer whetherConfinedFlag; @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) - private Integer whetherPowder; + private Integer whetherPowderFlag; @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) - private Integer whetherLightning; + private Integer whetherLightningFlag; @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; + private Integer whetherPipelineFlag; @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; + private Integer whetherActinogenFlag; @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; } 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 a1809e7..7847c8e 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 @@ -140,33 +140,33 @@ public class CorpInfoXgfUpdateCmd extends Command { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate licenseEnd; @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true) - private Integer whetherHygiene; + private Integer whetherHygieneFlag; @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true) - private Integer whetherHazards; + private Integer whetherHazardsFlag; @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true) - private Integer whetherScarce; + private Integer whetherScarceFlag; @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true) - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true) - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true) - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true) - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true) - private Integer whetherFire; + private Integer whetherFireFlag; @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true) - private Integer whetherConfined; + private Integer whetherConfinedFlag; @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true) - private Integer whetherPowder; + private Integer whetherPowderFlag; @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true) - private Integer whetherLightning; + private Integer whetherLightningFlag; @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true) - private Integer whetherPipeline; + private Integer whetherPipelineFlag; @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true) - private Integer whetherActinogen; + private Integer whetherActinogenFlag; @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true) - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; /* @ApiModelProperty(value = "用工形式", name = "employmentformList", required = true) private List employmentformList; @ApiModelProperty(value = "选取形式", name = "selectfromList", required = true) 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 f68f2c0..896377d 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 @@ -128,33 +128,33 @@ public class CorpInfoE extends BaseE { //营业执照结束时间 private LocalDate licenseEnd; //有无职业卫生信息,1:是,0:否 - private Integer whetherHygiene; + private Integer whetherHygieneFlag; //有无重大危险源,1:是,0:否 - private Integer whetherHazards; + private Integer whetherHazardsFlag; //是否有稀缺大型应急物资或设施,1:是,0:否 - private Integer whetherScarce; + private Integer whetherScarceFlag; //是否涉及危化品,1:是,0:否 - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; //有无特种设备,1:是,0:否 - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; //有无特存种作业人员,1:是,0:否 - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; //是否涉及煤气,1:是,0:否 - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; //是否属于消防重点单位,1:是,0:否 - private Integer whetherFire; + private Integer whetherFireFlag; //是否在有限空间作业,1:是,0:否 - private Integer whetherConfined; + private Integer whetherConfinedFlag; //是否存在涉爆粉尘作业,1:是,0:否 - private Integer whetherPowder; + private Integer whetherPowderFlag; //是否涉及防雷防静电,1:是,0:否 - private Integer whetherLightning; + private Integer whetherLightningFlag; //是否涉及危化品管道,1:是,0:否 - private Integer whetherPipeline; + private Integer whetherPipelineFlag; //是否持有放射源,1:是,0:否 - private Integer whetherActinogen; + private Integer whetherActinogenFlag; //是否涉及液氨制冷,1:是,0:否 - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; 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 5f44a07..e9f5613 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 @@ -126,33 +126,33 @@ public class CorpInfoXgfE extends BaseE { //营业执照结束时间 private LocalDate licenseEnd; //有无职业卫生信息,1:是,0:否 - private Integer whetherHygiene; + private Integer whetherHygieneFlag; //有无重大危险源,1:是,0:否 - private Integer whetherHazards; + private Integer whetherHazardsFlag; //是否有稀缺大型应急物资或设施,1:是,0:否 - private Integer whetherScarce; + private Integer whetherScarceFlag; //是否涉及危化品,1:是,0:否 - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; //有无特种设备,1:是,0:否 - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; //有无特存种作业人员,1:是,0:否 - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; //是否涉及煤气,1:是,0:否 - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; //是否属于消防重点单位,1:是,0:否 - private Integer whetherFire; + private Integer whetherFireFlag; //是否在有限空间作业,1:是,0:否 - private Integer whetherConfined; + private Integer whetherConfinedFlag; //是否存在涉爆粉尘作业,1:是,0:否 - private Integer whetherPowder; + private Integer whetherPowderFlag; //是否涉及防雷防静电,1:是,0:否 - private Integer whetherLightning; + private Integer whetherLightningFlag; //是否涉及危化品管道,1:是,0:否 - private Integer whetherPipeline; + private Integer whetherPipelineFlag; //是否持有放射源,1:是,0:否 - private Integer whetherActinogen; + private Integer whetherActinogenFlag; //是否涉及液氨制冷,1:是,0:否 - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; } 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 13357be..80a4495 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 @@ -184,46 +184,46 @@ public class CorpInfoDO extends BaseDO { private LocalDate licenseEnd; //有无职业卫生信息,1:是,0:否 @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") - private Integer whetherHygiene; + private Integer whetherHygieneFlag; //有无重大危险源,1:是,0:否 @ApiModelProperty(value = "有无重大危险源,1:是,0:否") - private Integer whetherHazards; + private Integer whetherHazardsFlag; //是否有稀缺大型应急物资或设施,1:是,0:否 @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") - private Integer whetherScarce; + private Integer whetherScarceFlag; //是否涉及危化品,1:是,0:否 @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") - private Integer whetherChemicals; + private Integer whetherChemicalsFlag; //有无特种设备,1:是,0:否 @ApiModelProperty(value = "有无特种设备,1:是,0:否") - private Integer whetherSpecialequipment; + private Integer whetherSpecialequipmentFlag; //有无特存种作业人员,1:是,0:否 @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") - private Integer whetherSpecialpeople; + private Integer whetherSpecialpeopleFlag; //是否涉及煤气,1:是,0:否 @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") - private Integer whetherCoalgas; + private Integer whetherCoalgasFlag; //是否属于消防重点单位,1:是,0:否 @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") - private Integer whetherFire; + private Integer whetherFireFlag; //是否在有限空间作业,1:是,0:否 @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") - private Integer whetherConfined; + private Integer whetherConfinedFlag; //是否存在涉爆粉尘作业,1:是,0:否 @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") - private Integer whetherPowder; + private Integer whetherPowderFlag; //是否涉及防雷防静电,1:是,0:否 @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") - private Integer whetherLightning; + private Integer whetherLightningFlag; //是否涉及危化品管道,1:是,0:否 @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") - private Integer whetherPipeline; + private Integer whetherPipelineFlag; //是否持有放射源,1:是,0:否 @ApiModelProperty(value = "是否持有放射源,1:是,0:否") - private Integer whetherActinogen; + private Integer whetherActinogenFlag; //是否涉及液氨制冷,1:是,0:否 @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") - private Integer whetherLiquidammonia; + private Integer whetherLiquidammoniaFlag; //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version;