hbwri/skjcmanager.git

			@@ -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() != 2) {
			if (one == null \|\| one.getStatus() != 2) {
			throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
			}
			}
			@@ -235,20 +235,20 @@
			List<SgDeviceGxStepDO> sgDeviceGxStepDOs = sgGxStepMapper.getDeviceGXList(sgDeviceDO.getId());

			if (sgDeviceGxStepDOs != null) {
			int countStatus = 0;
			for (SgDeviceGxStepDO sgDeviceGxStepDO : sgDeviceGxStepDOs) {
			countStatus = +sgDeviceGxStepDO.getStatus();

			}
			int size = sgDeviceGxStepDOs.size();
			if (countStatus != 0 && (size * 2) / countStatus == 1) {
			// int countStatus = 0;
			// for (SgDeviceGxStepDO sgDeviceGxStepDO : sgDeviceGxStepDOs) {
			// countStatus = +sgDeviceGxStepDO.getStatus();
			//
			// }
			// int size = sgDeviceGxStepDOs.size(); //4
			boolean allStatusesAreTwo = sgDeviceGxStepDOs.stream()
			.allMatch(s -> s.getStatus() == 2);
			if (allStatusesAreTwo) {
			//如果设备下全部工序审核完成
			sgDeviceDO.setStatus(2);
			sgDeviceMapper.updateById(sgDeviceDO);
			deviceFinishCount++;
			}


			}
			}
			if (deviceFinishCount == sgDeviceDOS.size()) {

			@@ -11,6 +11,7 @@
			import cn.gistack.sm.sg.service.SgProjectInfoService;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			import com.baomidou.mybatisplus.core.toolkit.StringUtils;
			import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -118,8 +119,14 @@
			public Map<String, Long> projectCount(ProjectSearchDTO searchDTO) {
			Map<String, Long> map = new HashMap<>();
			LambdaQueryChainWrapper<SgProjectInfoDO> wrapper = new LambdaQueryChainWrapper<>(sgProjectInfoMapper);
			String projectName = searchDTO.getProjectName();
			Integer status = searchDTO.getStatus();
			if (StringUtils.isNotBlank(projectName)){
			wrapper.like(SgProjectInfoDO::getProjectName,searchDTO.getProjectName());
			}
			if (status!=null){
			wrapper.eq(SgProjectInfoDO::getStatus,searchDTO.getStatus());
			}
			List<SgProjectInfoDO> list = wrapper.list();
			List<SgProjectInfoDO> pending = list.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
			List<SgProjectInfoDO> progress = list.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());

	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java	20 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java	7 ●●●●● patch \| view \| raw \| blame \| history