zcloud_gbs
/
zcloud_gbs_key_project
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善隐患管理功能并优化检查导出功能

main
zhangyue 2026-04-15 15:57:57 +08:00
parent 125c3a626c
commit 320d648274
9 changed files with 91 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAddExe.java
View File

@ -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);

7
web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java
View File

@ -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<String, Object> params = new HashMap<>();
params.put("ids", ids);
List<Long> idsList = Arrays.asList(ids);
params.put("ids", idsList);
List<SafetyEnvironmentalInspectionDO> safetyEnvironmentalInspectionDOs = safetyEnvironmentalInspectionRepository.listAll(params);
safetyEnvironmentalInspectionDOs.stream().forEach(inspection -> {
inspection.setStatusName(InspectionStatusEnum.getNameByStatus(inspection.getStatus()));
});
List<SafetyEnvironmentalInspectionExportEntity> safetyEnvironmentalInspectionExportEntities = safetyEnvironmentalInspectionCoConvertor.converDOsToExcelEntitys(safetyEnvironmentalInspectionDOs);
try {
ExcelUtils.exportExcel(httpServletResponse, SafetyEnvironmentalInspectionExportEntity.class, "安全环保检查信息", safetyEnvironmentalInspectionExportEntities);

7
web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java
View File

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

8
web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java
View File

@ -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)

54
web-domain/src/main/java/com/zcloud/key/project/domain/enums/InspectionStatusEnum.java Normal file
View File

@ -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<Integer, InspectionStatusEnum> 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;
}
}

9
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java
View File

@ -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

7
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java
View File

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

7
web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml
View File

@ -6,6 +6,7 @@
<select id="selectListPage" resultType="com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO">
select
aa.*,
kp.id as project_id,
kp.project_name
from
ai_alarm aa
@ -31,13 +32,17 @@
kp.xgf_master_user_id,
xgfu.name as xgf_master_user_name,
xgfu.department_id as xgf_master_department_id,
xgfd.name as xgf_master_department_name
xgfd.name as xgf_master_department_name,
h.id as hidden_id,
h.hidden_id as hidden_uuid
from
ai_alarm aa
left join key_project kp on kp.key_project_id = aa.key_project_id
left join user xgfu on xgfu.id = kp.xgf_master_user_id
left join department xgfd on xgfd.id = xgfu.department_id
left join hidden h on h.foreign_key = aa.ai_alarm_id and h.delete_enum = 'FALSE'
where aa.id = #{id}
group by aa.id
</select>
</mapper>

1
web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
View File

@ -145,6 +145,7 @@
<select id="listAll" resultType="com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO">
select
ROW_NUMBER() OVER() AS num,
i.*,
kp.project_name,
GROUP_CONCAT(DISTINCT iuu.name) inspection_user_name,