Merge branch 'main' of http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_basic_info_gwj

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;
 
 }
 

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;
 
 }
 

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<CorpInfoXgfItemCmd> employmentformList;
     @ApiModelProperty(value = "选取形式", name = "selectfromList", required = true)

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;
 
 
 

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;
 
 }
 

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;