Merge remote-tracking branch 'origin/master'

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

@@ -19,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
@@ -91,4 +92,17 @@ public class QhseSafeDayController {
                         BeanUtils.toBean(list, QhseSafeDayRespVO.class));
     }
 
+    @GetMapping("/get/dept/{deptId}")
+    @Operation(summary = "获得QHSE_安全生产天数")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PermitAll
+//    @PreAuthorize("@ss.hasPermission('rq:qhse-safe-day:query')")
+    public CommonResult<Integer> getQhseSafeDayByDept(@RequestParam("deptId") Long id) {
+        List<QhseSafeDayDO> dayByDept = qhseSafeDayService.getDayByDept(id);
+        int minDayNumber = dayByDept.stream()
+                .mapToInt(QhseSafeDayDO::getDayNumber) // 映射为 dayNumber
+                .min() // 取最小值
+                .orElse(0); // 集合为空时默认 0，可自己改
+        return success(minDayNumber);
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/safe/QhseSafeDayMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.safe.vo.QhseSafeDayPage
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.safe.QhseSafeDayDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * QHSE_安全生产天数 Mapper
  *
@@ -25,4 +27,13 @@ public interface QhseSafeDayMapper extends BaseMapperX<QhseSafeDayDO> {
                 .orderByDesc(QhseSafeDayDO::getId));
     }
 
+    default List<QhseSafeDayDO> selectListByDept(QhseSafeDayPageReqVO reqVO,List<Long> deptIds) {
+        return selectList(new LambdaQueryWrapperX<QhseSafeDayDO>()
+                .eqIfPresent(QhseSafeDayDO::getDayNumber, reqVO.getDayNumber())
+                .inIfPresent(QhseSafeDayDO::getDeptId, deptIds)
+                .likeIfPresent(QhseSafeDayDO::getDeptName, reqVO.getDeptName())
+                .eqIfPresent(QhseSafeDayDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(QhseSafeDayDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(QhseSafeDayDO::getId));
+    }
 }

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

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.safe.vo.QhseSafeDaySave
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.safe.QhseSafeDayDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * QHSE_安全生产天数 Service 接口
@@ -52,4 +53,5 @@ public interface QhseSafeDayService {
      */
     PageResult<QhseSafeDayDO> getQhseSafeDayPage(QhseSafeDayPageReqVO pageReqVO);
 
+    List<QhseSafeDayDO> getDayByDept(Long deptId);
 }

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

@@ -7,10 +7,15 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.safe.vo.QhseSafeDayPage
 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.dal.mysql.qhse.safe.QhseSafeDayMapper;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -25,6 +30,8 @@ public class QhseSafeDayServiceImpl implements QhseSafeDayService {
 
     @Resource
     private QhseSafeDayMapper qhseSafeDayMapper;
+    @Autowired
+    private DeptApi deptApi;
 
     @Override
     public Long createQhseSafeDay(QhseSafeDaySaveReqVO createReqVO) {
@@ -69,4 +76,12 @@ public class QhseSafeDayServiceImpl implements QhseSafeDayService {
         return qhseSafeDayMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<QhseSafeDayDO> getDayByDept(Long deptId) {
+        List<Long> collect = deptApi.getChildDeptList(deptId).stream().map(DeptRespDTO::getId).collect(Collectors.toList());
+        QhseSafeDayPageReqVO qhseSafeDayPageReqVO = new QhseSafeDayPageReqVO();
+        List<QhseSafeDayDO> qhseSafeDayDOS = qhseSafeDayMapper.selectListByDept(qhseSafeDayPageReqVO, collect);
+        return qhseSafeDayDOS;
+    }
+
 }