diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAddExe.java index 5de367f..57f8c62 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAddExe.java @@ -25,6 +25,7 @@ public class HiddenAddExe { public boolean execute(HiddenAddCmd cmd) { HiddenE hiddenE = new HiddenE(); BeanUtils.copyProperties(cmd, hiddenE); + hiddenE.setState(1); boolean res = false; try { res = hiddenGateway.add(hiddenE); diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java index e40b368..ef90817 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java @@ -11,6 +11,7 @@ import com.zcloud.key.project.command.convertor.hidden.HiddenFindUserCoConvertor import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionCoConvertor; import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionContentCoConvertor; import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionUserCoConvertor; +import com.zcloud.key.project.domain.enums.InspectionStatusEnum; import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; import com.zcloud.key.project.dto.clientobject.hidden.HiddenFindUserCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; @@ -136,8 +137,12 @@ public class SafetyEnvironmentalInspectionQueryExe { throw new BizException("请勾选要导出的数据"); } Map params = new HashMap<>(); - params.put("ids", ids); + List idsList = Arrays.asList(ids); + params.put("ids", idsList); List safetyEnvironmentalInspectionDOs = safetyEnvironmentalInspectionRepository.listAll(params); + safetyEnvironmentalInspectionDOs.stream().forEach(inspection -> { + inspection.setStatusName(InspectionStatusEnum.getNameByStatus(inspection.getStatus())); + }); List safetyEnvironmentalInspectionExportEntities = safetyEnvironmentalInspectionCoConvertor.converDOsToExcelEntitys(safetyEnvironmentalInspectionDOs); try { ExcelUtils.exportExcel(httpServletResponse, SafetyEnvironmentalInspectionExportEntity.class, "安全环保检查信息", safetyEnvironmentalInspectionExportEntities); diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java index 9b5b320..935e538 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java @@ -29,6 +29,8 @@ public class AiAlarmCO extends ClientObject { private String keyProjectId; @ApiModelProperty(value = "项目名称") private String projectName; + @ApiModelProperty(value = "项目雪花id") + private String projectId; @ApiModelProperty(value = "是否存在隐患 0-否 1-是") private Integer hasHidden; @@ -58,6 +60,11 @@ public class AiAlarmCO extends ClientObject { private String xgfMasterDepartmentId; @ApiModelProperty(value = "相关方单位负责人部门名称") private String xgfMasterDepartmentName; + + @ApiModelProperty(value = "隐患id") + private Long hiddenId; + @ApiModelProperty(value = "隐患id") + private String hiddenUuid; //处置状态 0-待处理 1-已处理 @ApiModelProperty(value = "处置状态 0-待处理 1-已处理") private Integer state; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java index 750b832..4568f80 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java @@ -51,7 +51,6 @@ public class HiddenAddCmd extends Command { private String hiddenDesc; @ApiModelProperty(value = "法律依据", name = "legalBasis", required = true) - @NotEmpty(message = "法律依据不能为空") private String legalBasis; @ApiModelProperty(value = "隐患位置描述", name = "positionDesc", required = true) @@ -71,36 +70,29 @@ public class HiddenAddCmd extends Command { private Integer rectificationType; @ApiModelProperty(value = "整改期限(整改截至日期)", name = "rectificationDeadline", required = true) - @NotEmpty(message = "整改期限(整改截至日期)不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime rectificationDeadline; @ApiModelProperty(value = "整改人企业id", name = "rectificationCorpId", required = true) - @NotNull(message = "整改人企业id不能为空") private Long rectificationCorpId; @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId", required = true) - @NotNull(message = "整改人部门id不能为空") private Long rectificationDepartmentId; @ApiModelProperty(value = "整改人id", name = "rectificationUserId", required = true) - @NotNull(message = "整改人id不能为空") private Long rectificationUserId; @ApiModelProperty(value = "验收人企业id", name = "racceptCorpId", required = true) - @NotNull(message = "验收人企业id不能为空") private Long acceptCorpId; // 隐患视频 @ApiModelProperty(value = "隐患视频", name = "videoUrl", required = true) private String videoUrl; @ApiModelProperty(value = "验收人部门id", name = "acceptDepartmentId", required = true) - @NotNull(message = "验收人部门id不能为空") private Long acceptDepartmentId; @ApiModelProperty(value = "验收人id", name = "acceptUserId", required = true) - @NotNull(message = "验收人id不能为空") private Long acceptUserId; @ApiModelProperty(value = "隐患发现人集合", name = "hiddenFindUserList", required = true) diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/enums/InspectionStatusEnum.java b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/InspectionStatusEnum.java new file mode 100644 index 0000000..e96842c --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/InspectionStatusEnum.java @@ -0,0 +1,54 @@ +package com.zcloud.key.project.domain.enums; + +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 菜单枚举 + */ +@Getter +public enum InspectionStatusEnum { + //'状态(0-暂存,1-待核实,2-待确认,3-待隐患处理,5-检查归档,6-核实打回,7-被检查申辩)‘ + + TEMPORARY_SAVE(0, "暂存"), + WAIT_VERIFY(1, "待核实"), + WAIT_CONFIRM(2, "待确认"), + WAIT_HANDLE(3, "待隐患处理"), + CHECK_ARCHIVE(5, "检查归档"), + WAIT_VERIFY_BACK(6, "核实打回"), + WAIT_BE_CHECKED_DISPUTE(7, "被检查申辩"); + + private final Integer status; + private final String name; + + private static final Map STATUS_MAP = + Arrays.stream(values()) + .collect(Collectors.toMap(InspectionStatusEnum::getStatus, Function.identity())); + + InspectionStatusEnum(Integer status, String name) { + this.status = status; + this.name = name; + } + + public Integer getStatus() { + return status; + } + + public String getName() { + return name; + } + + public static InspectionStatusEnum getByStatus(Integer status) { + return STATUS_MAP.get(status); + } + + public static String getNameByStatus(Integer status) { + InspectionStatusEnum entry = STATUS_MAP.get(status); + return entry != null ? entry.getName() : null; + } + +} diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java index 29089b7..b2d6b99 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java @@ -32,6 +32,15 @@ public class AiAlarmDO extends BaseDO { @ApiModelProperty(value = "项目名称") @TableField(exist = false) private String projectName; + @ApiModelProperty(value = "项目雪花id") + @TableField(exist = false) + private String projectId; + @ApiModelProperty(value = "隐患id") + @TableField(exist = false) + private String hiddenId; + @ApiModelProperty(value = "隐患id") + @TableField(exist = false) + private String hiddenUuid; @ApiModelProperty(value = "是否存在隐患 0-否 1-是") private Integer hasHidden; //视频id diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java index 0c580e4..710e5c7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java @@ -21,6 +21,9 @@ import java.time.LocalDateTime; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class SafetyEnvironmentalInspectionDO extends BaseDO { + @ApiModelProperty(value = "excel导出序号）") + @TableField(exist = false) + private Integer num; //安全环保检查ID（业务ID） @ApiModelProperty(value = "安全环保检查ID（业务ID）") private String inspectionId; @@ -57,6 +60,10 @@ public class SafetyEnvironmentalInspectionDO extends BaseDO { //状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩) @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)") private Integer status; + //状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩) + @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)") + @TableField(exist = false) + private String statusName; //是否申辩过 1-是 0-否 @ApiModelProperty(value = "是否申辩过 1-是 0-否") private Integer defendFlag; diff --git a/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml b/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml index a3f3d92..0a345fe 100644 --- a/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml @@ -6,6 +6,7 @@ diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml index 34b6689..7ca96ab 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml @@ -145,6 +145,7 @@