From e4a22943f1dd8161f0df4160b71fa6d1a0db5e24 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Sat, 1 Nov 2025 10:39:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/web/DepartmentController.java | 2 +- .../basic/info/command/CorpInfoXgfAddExe.java | 2 + .../command/query/DepartmentQueryExe.java | 3 +- .../info/service/DepartmentServiceImpl.java | 2 +- .../basic/info/api/DepartmentServiceI.java | 2 +- .../zcloud/basic/info/dto/CorpInfoAddCmd.java | 2 + .../basic/info/dto/CorpInfoUpdateCmd.java | 2 + .../basic/info/dto/CorpInfoXgfAddCmd.java | 6 ++- .../basic/info/dto/CorpInfoXgfUpdateCmd.java | 2 + .../info/dto/CorpQualificationInfoAddCmd.java | 2 +- .../dto/CorpQualificationInfoUpdateCmd.java | 2 +- .../basic/info/dto/DepartmentAddCmd.java | 18 ++++----- .../basic/info/dto/DepartmentTreeQry.java | 40 +++++++++++++++++++ .../basic/info/dto/DepartmentUpdateCmd.java | 21 +++++----- .../info/dto/clientobject/CorpInfoCO.java | 2 + .../info/dto/clientobject/CorpInfoXgfCO.java | 2 + .../info/dto/clientobject/DepartmentCO.java | 2 +- .../basic/info/domain/model/CorpInfoE.java | 3 ++ .../basic/info/domain/model/CorpInfoXgfE.java | 3 ++ .../basic/info/domain/model/DepartmentE.java | 2 +- .../persistence/dataobject/CorpInfoDO.java | 2 + .../persistence/dataobject/DepartmentDO.java | 2 +- 22 files changed, 94 insertions(+), 30 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 233d4db..de973b8 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -87,7 +87,7 @@ public class DepartmentController { } @ApiOperation("所有数据") @PostMapping("/listTree") - public List listTree(@Validated @RequestBody DepartmentQry qry) { + public List listTree(@Validated @RequestBody DepartmentTreeQry qry) { return departmentService.listTree(qry); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java index 7c84725..7063d6f 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java @@ -9,6 +9,7 @@ import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd; import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor; import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor; import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum; +import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.gateway.CorpFormGateway; import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway; import com.zcloud.basic.info.domain.model.CorpFormE; @@ -49,6 +50,7 @@ public class CorpInfoXgfAddExe { BeanUtils.copyProperties(cmd, corpInfoXgfE); Long corpInfoId ; try { + corpInfoXgfE.setType(CorpTypeEnum.serviceProvider.getCode()); corpInfoId = corpInfoXgfGateway.addInfo(corpInfoXgfE); } catch (Exception e) { throw new RuntimeException(e); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index 932ce60..b46d3ba 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -7,6 +7,7 @@ import com.zcloud.basic.info.domain.model.DepartmentE; import com.zcloud.basic.info.dto.CorpDepartmentQry; import com.zcloud.basic.info.dto.DepartmentPageQry; import com.zcloud.basic.info.dto.DepartmentQry; +import com.zcloud.basic.info.dto.DepartmentTreeQry; import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO; @@ -46,7 +47,7 @@ public class DepartmentQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - public List listTree(DepartmentQry departmentQry) { + public List listTree(DepartmentTreeQry departmentQry) { Map parmas = PageQueryHelper.toHashMap(departmentQry); List pageResponse = departmentRepository.listTree(parmas); if(CollUtil.isEmpty(pageResponse)) { diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java index 7378bd8..c8256b4 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java @@ -60,7 +60,7 @@ public class DepartmentServiceImpl implements DepartmentServiceI { } @Override - public List listTree(DepartmentQry qry) { + public List listTree(DepartmentTreeQry qry) { return departmentQueryExe.listTree(qry); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java index ca41794..84362b5 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java @@ -26,7 +26,7 @@ public interface DepartmentServiceI { void removeBatch(Long[] ids); - List listTree(DepartmentQry qry); + List listTree(DepartmentTreeQry qry); DepartmentCO info(Long id); 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 7b09358..1d61d80 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 @@ -51,6 +51,8 @@ public class CorpInfoAddCmd extends Command { private LocalDate firstServeDate; @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; + @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) + private String scaleName; @ApiModelProperty(value = "成立时间", name = "createDate", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate createDate; 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 b23e882..659fb91 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 @@ -54,6 +54,8 @@ public class CorpInfoUpdateCmd extends Command { private LocalDate firstServeDate; @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; + @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) + private String scaleName; @ApiModelProperty(value = "成立时间", name = "createDate", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate createDate; 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 82a6981..8fb6842 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 @@ -24,7 +24,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class CorpInfoXgfAddCmd extends Command { - @ApiModelProperty(value = "企业名称", name = "corpName", required = true) + @ApiModelProperty(value = "企业名称,汉字30以内", name = "corpName", required = true) @NotEmpty(message = "企业名称不能为空") private String corpName; @@ -49,7 +49,7 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "邮编", name = "postalCode", required = true) private String postalCode; - @ApiModelProperty(value = "所属区域", name = "companyArea", required = true) + @ApiModelProperty(value = "所属区域,汉字160以内", name = "companyArea", required = true) private String companyArea; @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true) @@ -58,6 +58,8 @@ public class CorpInfoXgfAddCmd extends Command { @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; + @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) + private String scaleName; @ApiModelProperty(value = "成立时间", name = "createDate", required = true) @JsonFormat(pattern = "yyyy-MM-dd") 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 8c4b3bc..637bcdc 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 @@ -55,6 +55,8 @@ public class CorpInfoXgfUpdateCmd extends Command { private LocalDate firstServeDate; @ApiModelProperty(value = "规模", name = "scale", required = true) private String scale; + @ApiModelProperty(value = "规模名称", name = "scaleName", required = true) + private String scaleName; @ApiModelProperty(value = "成立时间", name = "createDate", required = true) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate createDate; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoAddCmd.java index d220419..e2502ec 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoAddCmd.java @@ -32,7 +32,7 @@ public class CorpQualificationInfoAddCmd extends Command { @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) @NotNull(message = "企业id不能为空") private Long corpinfoId; - @ApiModelProperty(value = "资质名称", name = "qualificationName", required = true) + @ApiModelProperty(value = "资质名称,汉字30以内", name = "qualificationName", required = true) @NotEmpty(message = "资质名称不能为空") private String qualificationName; @ApiModelProperty(value = "证书有效期", name = "validityTime", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java index 53ae8a9..4595ab3 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpQualificationInfoUpdateCmd.java @@ -33,7 +33,7 @@ public class CorpQualificationInfoUpdateCmd extends Command { @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) @NotEmpty(message = "企业id不能为空") private Long corpinfoId; - @ApiModelProperty(value = "资质名称", name = "qualificationName", required = true) + @ApiModelProperty(value = "资质名称,汉字30以内", name = "qualificationName", required = true) @NotEmpty(message = "资质名称不能为空") private String qualificationName; @ApiModelProperty(value = "证书有效期", name = "validityTime", 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 52bf847..80b497e 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 @@ -25,43 +25,43 @@ public class DepartmentAddCmd extends Command { @ApiModelProperty(value = "部门id", name = "departmentId", required = true) private String departmentId; - @ApiModelProperty(value = "名称", name = "name", required = true) + @ApiModelProperty(value = "名称,汉字30以内", name = "name", required = true) @NotEmpty(message = "名称不能为空") private String name; @ApiModelProperty(value = "父部门id", name = "parentId", required = true) @NotNull(message = "父部门id不能为空") private Long parentId; - @ApiModelProperty(value = "负责人", name = "headman", required = true) + @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true) private String headman; @ApiModelProperty(value = "负责人手机号", name = "phone", required = true) private String phone; - @ApiModelProperty(value = "地址", name = "address", required = true) + @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) private String level; - @ApiModelProperty(value = "部门级别名称", name = "levelName", required = true) + @ApiModelProperty(value = "部门级别名称,汉字30以内", name = "levelName", required = true) private String levelName; @ApiModelProperty(value = "部门排序", name = "depOrder", required = true) private Integer depOrder; @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "isSupervise", required = true) private Integer isSupervise; - @ApiModelProperty(value = "0安监部门1消防部门", name = "state", required = true) + @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门", name = "state", required = true) private Integer state; - @ApiModelProperty(value = "主管领导", name = "leaderCharge", required = true) + @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true) private String leaderCharge; - @ApiModelProperty(value = "分管领导人", name = "lrman", required = true) + @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true) private String lrman; @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true) private Integer category; - @ApiModelProperty(value = "单位类型名称", name = "deptTypeName", required = true) + @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 = "部门类型名称", name = "typeName", required = true) + @ApiModelProperty(value = "部门类型名称,汉字30以内", name = "typeName", required = true) private String typeName; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java new file mode 100644 index 0000000..760226c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java @@ -0,0 +1,40 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-30 10:10:48 + */ +@Data +public class DepartmentTreeQry { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + /** + * 名称模糊查询 + */ + @ApiModelProperty(value = "名称模糊查询", name = "likeName") + private String likeName; + + @ApiModelProperty(value = "企业id", name = "eqCorpInfoId") + private String eqCorpInfoId; + @ApiModelProperty(value = "父id", name = "eqParentId") + private String eqParentId; + + +} + 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 95b4574..0c3f3db 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 @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; /** @@ -22,46 +23,46 @@ import java.time.LocalDateTime; @AllArgsConstructor public class DepartmentUpdateCmd extends Command { @ApiModelProperty(value = "主键", name = "id", required = true) - @NotEmpty(message = "主键不能为空") + @NotNull(message = "主键不能为空") private Long id; @ApiModelProperty(value = "部门id", name = "departmentId", required = true) private String departmentId; - @ApiModelProperty(value = "名称", name = "name", required = true) + @ApiModelProperty(value = "名称,汉字30以内", name = "name", required = true) @NotEmpty(message = "名称不能为空") private String name; @ApiModelProperty(value = "父部门id", name = "parentId", required = true) private Long parentId; - @ApiModelProperty(value = "负责人", name = "headman", required = true) + @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true) private String headman; @ApiModelProperty(value = "负责人手机号", name = "phone", required = true) private String phone; - @ApiModelProperty(value = "地址", name = "address", required = true) + @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) private String level; - @ApiModelProperty(value = "部门级别名称", name = "levelName", required = true) + @ApiModelProperty(value = "部门级别名称,汉字30以内", name = "levelName", required = true) private String levelName; @ApiModelProperty(value = "部门排序", name = "depOrder", required = true) private Integer depOrder; @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "isSupervise", required = true) private Integer isSupervise; - @ApiModelProperty(value = "0安监部门1消防部门", name = "state", required = true) + @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门", name = "state", required = true) private Integer state; - @ApiModelProperty(value = "主管领导", name = "leaderCharge", required = true) + @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true) private String leaderCharge; - @ApiModelProperty(value = "分管领导人", name = "lrman", required = true) + @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true) private String lrman; @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true) private Integer category; - @ApiModelProperty(value = "单位类型名称", name = "deptTypeName", required = true) + @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 = "部门类型名称", name = "typeName", required = true) + @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 f84a849..42d5ed1 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 @@ -56,6 +56,8 @@ public class CorpInfoCO extends ClientObject { //规模 @ApiModelProperty(value = "规模") private String scale; + @ApiModelProperty(value = "规模名称") + private String scaleName; //成立时间 @ApiModelProperty(value = "成立时间") private LocalDate createDate; 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 f284e14..09232e1 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 @@ -58,6 +58,8 @@ public class CorpInfoXgfCO extends ClientObject { //规模 @ApiModelProperty(value = "规模") private String scale; + @ApiModelProperty(value = "规模名称") + private String scaleName; //成立时间 @ApiModelProperty(value = "成立时间") private LocalDate createDate; 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 04a3bac..0470705 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 @@ -52,7 +52,7 @@ public class DepartmentCO extends ClientObject { @ApiModelProperty(value = "是否监管部门 0-否 1-是") private Integer isSupervise; //0安监部门1消防部门 - @ApiModelProperty(value = "0安监部门1消防部门") + @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门") private Integer state; //主管领导 @ApiModelProperty(value = "主管领导") 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 b55b3f2..af1d689 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 @@ -2,6 +2,7 @@ package com.zcloud.basic.info.domain.model; import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -46,6 +47,8 @@ public class CorpInfoE extends BaseE { private LocalDate firstServeDate; //规模 private String scale; + //规模名称 + private String scaleName; //成立时间 private LocalDate createDate; //企业状态 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 862c58c..3baac3d 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 @@ -1,6 +1,7 @@ package com.zcloud.basic.info.domain.model; import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -40,6 +41,8 @@ public class CorpInfoXgfE extends BaseE { private LocalDate firstServeDate; //规模 private String scale; + //规模名称 + private String scaleName; //成立时间 private LocalDate createDate; //企业状态 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 ac4de1b..b1dd64c 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 @@ -41,7 +41,7 @@ public class DepartmentE extends BaseE { private Integer depOrder; //是否监管部门 0-否 1-是 private Integer isSupervise; - //0安监部门1消防部门 + //安全管理部门,0安监部门1消防部门 private Integer state; //主管领导 private String leaderCharge; 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 fa45202..3fef893 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 @@ -62,6 +62,8 @@ public class CorpInfoDO extends BaseDO { //规模 @ApiModelProperty(value = "规模") private String scale; + @ApiModelProperty(value = "规模名称") + private String scaleName; //成立时间 @ApiModelProperty(value = "成立时间") private LocalDate createDate; 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 ef8b0eb..0f57cbf 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 @@ -55,7 +55,7 @@ public class DepartmentDO extends BaseDO { @ApiModelProperty(value = "是否监管部门 0-否 1-是") private Integer isSupervise; //0安监部门1消防部门 - @ApiModelProperty(value = "0安监部门1消防部门") + @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门") private Integer state; //主管领导 @ApiModelProperty(value = "主管领导")