安全生产天数

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

@@ -85,11 +85,11 @@ public class QhseStatController {
         List<IotMeasureCertDO> iotMeasureCertDOS = iotMeasureCertMapper.selectListByDept(iotMeasureCertPageReqVO, ids);
         int totalCert = iotMeasureCertDOS.size();
         long expiredCount = iotMeasureCertDOS.stream().filter(IotMeasureCertDO::getExpired).count();
-        long warnCount = iotMeasureCertDOS.stream().filter(e -> !e.getExpired() && e.getAlertWarn()).count();
+        long warnCount = iotMeasureCertDOS.stream().filter(e -> Objects.nonNull(e.getExpired())&&Objects.nonNull(e.getAlertWarn())&&!e.getExpired() && e.getAlertWarn()).count();
 
         DateTime beforeYear = DateUtil.offsetYear(new Date(), -1);
         IotAccidentReportPageReqVO iotAccidentReportPageReqVO = new IotAccidentReportPageReqVO();
-        iotAccidentReportPageReqVO.setCreateTime(new LocalDateTime[]{monthBegin, LocalDateTime.now()});
+        iotAccidentReportPageReqVO.setCreateTime(new LocalDateTime[]{beforeYear.toLocalDateTime(), LocalDateTime.now()});
         int accidentSize = iotAccidentReportMapper.selectListByDept(iotAccidentReportPageReqVO, ids).size();
         return CommonResult.success(ImmutableMap.of("danger", danger, "monthHazard", monthHazard, "totalHazard", total, "todoHazard", todoSize, "ptwCount", ptwCount,
                 "totdalCert", totalCert,"expiredCert", expiredCount,"warnCert", warnCount, "accident", accidentSize));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/safe/QhseSafeDayController.java

@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.safe.vo.QhseSafeDayResp
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.safe.vo.QhseSafeDaySaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.safe.QhseSafeDayDO;
 import cn.iocoder.yudao.module.pms.service.qhse.safe.QhseSafeDayService;
+import com.google.common.collect.ImmutableMap;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -105,4 +106,37 @@ public class QhseSafeDayController {
                 .orElse(0); // 集合为空时默认 0，可自己改
         return success(minDayNumber);
     }
+
+    @GetMapping("/get/dept/company")
+    @Operation(summary = "获得QHSE_安全生产天数")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PermitAll
+//    @PreAuthorize("@ss.hasPermission('rq:qhse-safe-day:query')")
+    public CommonResult<ImmutableMap> getQhseSafeDayCompany(@RequestParam("deptId") Long id) {
+        //瑞鹰
+        List<QhseSafeDayDO> dayByDept = qhseSafeDayService.getDayByDept(158L);
+        int ryMinDayNumber = dayByDept.stream()
+                .mapToInt(QhseSafeDayDO::getDayNumber) // 映射为 dayNumber
+                .min() // 取最小值
+                .orElse(0); // 集合为空时默认 0，可自己改
+        //瑞恒
+        List<QhseSafeDayDO> rhByDept = qhseSafeDayService.getDayByDept(157L);
+        int rhMinDayNumber = rhByDept.stream()
+                .mapToInt(QhseSafeDayDO::getDayNumber) // 映射为 dayNumber
+                .min() // 取最小值
+                .orElse(0); // 集合为空时默认 0，可自己改
+        //瑞都
+        List<QhseSafeDayDO> rdByDept = qhseSafeDayService.getDayByDept(163L);
+        int rdMinDayNumber = rdByDept.stream()
+                .mapToInt(QhseSafeDayDO::getDayNumber) // 映射为 dayNumber
+                .min() // 取最小值
+                .orElse(0); // 集合为空时默认 0，可自己改
+        List<QhseSafeDayDO> rq = qhseSafeDayService.getByName("瑞气能源");
+        List<QhseSafeDayDO> rl = qhseSafeDayService.getByName("瑞霖能源");
+        List<QhseSafeDayDO> five = qhseSafeDayService.getByName("5#项目");
+
+        return success(ImmutableMap.of("气体增产", rhMinDayNumber,"钻修井",ryMinDayNumber,"酸化压裂",rdMinDayNumber,"瑞气能源",rq.get(0).getDayNumber(),
+                "瑞霖能源",rl.get(0).getDayNumber(),"5#项目",five.get(0).getDayNumber()));
+    }
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/safe/QhseSafeDayService.java

@@ -54,4 +54,5 @@ public interface QhseSafeDayService {
     PageResult<QhseSafeDayDO> getQhseSafeDayPage(QhseSafeDayPageReqVO pageReqVO);
 
     List<QhseSafeDayDO> getDayByDept(Long deptId);
+    List<QhseSafeDayDO> getByName(String name);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/safe/QhseSafeDayServiceImpl.java

@@ -84,4 +84,9 @@ public class QhseSafeDayServiceImpl implements QhseSafeDayService {
         return qhseSafeDayDOS;
     }
 
+    @Override
+    public List<QhseSafeDayDO> getByName(String name) {
+        return qhseSafeDayMapper.selectList("dept_name", name);
+    }
+
 }