hbwri/skjcmanager.git

			@@ -51,6 +51,12 @@
			WHERE
			1 = 1
			<!-- AND userR.is_his = 0 -->
			<if test="dto.projectName != null and dto.projectName != ''">
			and report.PROGRAM_NAME like CONCAT(CONCAT('%',#{dto.projectName}),'%')
			</if>
			<if test="dto.deviceName != null and dto.deviceName != ''">
			and de.device_name like CONCAT(CONCAT('%', #{dto.deviceName}), '%')
			</if>
			<if test="dto.userId != null and dto.userId != ''">
			and userR.user_id = #{dto.userId}
			</if>

			@@ -99,7 +99,7 @@
			SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
			String deviceType = sgDeviceDO.getDeviceType();
			List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
			.eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).list();
			.eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).orderByAsc(SgGxConfigDO::getSgOrder).list();
			List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
			if (CollectionUtils.isEmpty(roIds)){
			throw new ServiceException("请完成工序角色配置！");
			@@ -304,12 +304,12 @@
			Long userId = AuthUtil.getUserId();
			searchDTO.setUserId(userId);
			searchDTO.setApprovalStatus(0);
			Long pending = sgProgressReportMapper.countList(searchDTO);
			List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
			searchDTO.setApprovalStatus(1);
			Long over = sgProgressReportMapper.countList(searchDTO);
			List<SgProgressReportVO> over= sgProgressReportMapper.queryList(searchDTO);
			Map<String, Long> map = new HashMap<>();
			map.put("pending",pending);
			map.put("over",over);
			map.put("pending", Long.valueOf(pending.size()));
			map.put("over",Long.valueOf(over.size()));
			return map;
			}

	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml	6 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java	10 ●●●●● patch \| view \| raw \| blame \| history