湖北水库：施工：审批列表过滤

shenyijian

2024-06-18 89f6bee2975d19798914250dab838d677db0716a

湖北水库：施工：审批列表过滤

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java

@@ -84,7 +84,7 @@
                QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
                wrapper1.eq("gx_step_id", gxStepDO.getId());
                SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
                if (one != null && one.getStatus() != 3) {
                if (one != null && one.getStatus() != 2) {
                    throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
                }
            }
@@ -131,6 +131,8 @@
    @Override
    public SgProgressReportVO detail(String id) {
        SgProgressReportVO sgProgressReportVO = sgProgressReportMapper.queryById(id);
        SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(sgProgressReportVO.getGxDeviceId());
        sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
        List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getApprovalTime).list();
        List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
        List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);