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

feat(): 修改核实状态赋值逻辑，更换导出时间字段

dev
lishiwei 2026-07-20 09:11:37 +08:00
parent 5f3d891cef
commit ae65b5c41e
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java
View File

@ -119,12 +119,35 @@ public class SafetyEnvironmentalInspectionUpdateExe {
// 删除检查核实人数据 及对应待办信息
List<SafetyEnvironmentalInspectionUserDO> deleteUserList = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(safetyEnvironmentalInspectionE.getInspectionId(),2);
// 保存旧核实记录的状态，用于重建后恢复
Map<Long, Integer> oldVerifyStatusMap = deleteUserList.stream()
.filter(u -> u.getUserId() != null)
.collect(Collectors.toMap(
SafetyEnvironmentalInspectionUserDO::getUserId,
u -> u.getStatus() != null ? u.getStatus() : 0,
(existing, replacement) -> existing));
for (SafetyEnvironmentalInspectionUserDO deleteUser : deleteUserList){
messageNoticeExe.sendMessageDeleteEvent(deleteUser.getId());
}
safetyEnvironmentalInspectionUserRepository.deleteByInspectionId(safetyEnvironmentalInspectionE.getInspectionId(), 2);
// 新增检查核实人数据
safetyEnvironmentalInspectionUserRepository.batchInsert(BeanUtil.copyToList(insUserList, SafetyEnvironmentalInspectionUserDO.class));
// 恢复之前已核实的用户状态
if (!oldVerifyStatusMap.isEmpty()) {
List<SafetyEnvironmentalInspectionUserDO> newUserList =
safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(safetyEnvironmentalInspectionE.getInspectionId(), 2);
for (SafetyEnvironmentalInspectionUserDO newUser : newUserList) {
Integer oldStatus = oldVerifyStatusMap.get(newUser.getUserId());
if (oldStatus != null && oldStatus > 0) {
SafetyEnvironmentalInspectionUserDO updateDO = new SafetyEnvironmentalInspectionUserDO();
updateDO.setInspectionId(safetyEnvironmentalInspectionE.getInspectionId());
updateDO.setUserId(newUser.getUserId());
updateDO.setType(2);
updateDO.setStatus(oldStatus);
safetyEnvironmentalInspectionUserRepository.editUserInfo(updateDO);
}
}
}
// 删除检查内容
List<SafetyEnvironmentalInspectionContentDO> deleteContentList = safetyEnvironmentalInspectionContentRepository.listAllByInspectionId(safetyEnvironmentalInspectionE.getInspectionId());

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

@ -37,6 +37,7 @@ import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@ -192,6 +193,20 @@ public class SafetyEnvironmentalInspectionQueryExe {
inspection.setStatusName(InspectionStatusEnum.getNameByStatus(inspection.getStatus()));
});
List<SafetyEnvironmentalInspectionExportEntity> safetyEnvironmentalInspectionExportEntities = safetyEnvironmentalInspectionCoConvertor.converDOsToExcelEntitys(safetyEnvironmentalInspectionDOs);
// 填充检查时间（timeStart - timeEnd）
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
for (int i = 0; i < safetyEnvironmentalInspectionExportEntities.size(); i++) {
SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionDOs.get(i);
String timeStart = inspectionDO.getTimeStart() != null ? inspectionDO.getTimeStart().format(dtf) : "";
String timeEnd = inspectionDO.getTimeEnd() != null ? inspectionDO.getTimeEnd().format(dtf) : "";
if (!timeStart.isEmpty() && !timeEnd.isEmpty()) {
safetyEnvironmentalInspectionExportEntities.get(i).setCheckTime(timeStart + "-" + timeEnd);
} else if (!timeStart.isEmpty()) {
safetyEnvironmentalInspectionExportEntities.get(i).setCheckTime(timeStart);
} else if (!timeEnd.isEmpty()) {
safetyEnvironmentalInspectionExportEntities.get(i).setCheckTime(timeEnd);
}
}
try {
ExcelUtils.exportExcel(httpServletResponse, SafetyEnvironmentalInspectionExportEntity.class, "安全环保检查信息", safetyEnvironmentalInspectionExportEntities);
} catch (IOException e) {