| | |
|---|
| | | 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() + "的审批！"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | @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); |
|---|
