隐患排查调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/hazard/IotHazardController.java

@@ -18,6 +18,8 @@ import cn.iocoder.yudao.module.pms.dal.mysql.qhse.hazard.IotHazardMapper;
 import cn.iocoder.yudao.module.pms.service.qhse.hazard.IotHazardService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.dict.DictDataService;
@@ -59,6 +61,8 @@ public class IotHazardController {
     private DeptService deptService;
     @Autowired
     private DictDataService dictDataService;
+    @Autowired
+    private AdminUserApi adminUserApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建QHSE隐患排查及整改")
@@ -107,6 +111,12 @@ public class IotHazardController {
                     iotHazardRespVO.setDeptName(dept.getName());
                 }
             }
+            if (StringUtils.isNotBlank(iotHazardRespVO.getCorrectPersonName())) {
+                AdminUserRespDTO user = adminUserApi.getUser(iotHazardRespVO.getCorrectPerson());
+                if(Objects.nonNull(user)){
+                    iotHazardRespVO.setCorrectPersonName(user.getNickname());
+                }
+            }
             return iotHazardRespVO;
         }).collect(Collectors.toList());
         return success(new PageResult<>(collect, pageResult.getTotal()));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/hazard/vo/IotHazardRespVO.java

@@ -35,6 +35,8 @@ public class IotHazardRespVO {
     @Schema(description = "整改人")
     private Long correctPerson;
 
+    private String correctPersonName;
+
     @Schema(description = "地点", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("地点")
     private String address;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/qhse/CertJob.java

@@ -91,6 +91,7 @@ public class CertJob implements JobHandler {
                         //如果相差不到90天了就进行预警
                         if (maxDate.isAfter(LocalDateTime.now()) && ChronoUnit.DAYS.between(LocalDateTime.now(), maxDate) < 90) {
                             item.setAlertWarn(true);
+                            item.setExpired(false);
                         }
                         iotMeasureBookMapper.updateById(item);
                     });