productDev/yunyibao.git

			@@ -185,6 +185,7 @@
			for (DuSolution s : solutions){
			DuSolution ns = new DuSolution();
			BeanUtils.copyProperties(s, ns);
			ns.setId(null);
			ns.setDispatchUnitId(newVersion.getId());
			ns.setCheckDate(update.getEditDate());
			ns.setStatus(Constants.ONE);
			@@ -215,6 +216,7 @@
			}
			DuWorktype nw = new DuWorktype();
			BeanUtils.copyProperties(w, nw);
			nw.setId(null);
			nw.setCreateDate(new Date());
			nw.setCheckDate(update.getEditDate());
			nw.setStatus(Constants.ONE);
			@@ -498,7 +500,7 @@
			DuSolution duSolution = duSolutionMapper.selectOne(new QueryWrapper<DuSolution>().lambda().eq(DuSolution::getDispatchUnitId,saveDispatchUnitDTO.getId())
			.eq(DuSolution::getIsdeleted,Constants.ZERO)
			.eq(DuSolution::getSolutionId,saveDuSolutionDTO.getSolutionId()).last("limit 1"));
			Integer duSolutionNum = duSolutionMapper.selectCount(new QueryWrapper<DuSolution>().lambda().eq(DuSolution::getDispatchUnitId,saveDuSolutionDTO.getId()));
			Integer duSolutionNum = duSolutionMapper.selectCount(new QueryWrapper<DuSolution>().lambda().eq(DuSolution::getDispatchUnitId,saveDuSolutionDTO.getId())).intValue();
			if(Objects.isNull(duSolution)){
			duSolution = new DuSolution();
			duSolution.setCreateDate(new Date());
			@@ -530,7 +532,7 @@
			.eq(DuWorktype::getWorkTypeId,saveDuWorkTypeDTO.getWorkTypeId()))>0){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+saveDuSolutionDTO.getSolutionName()+"】该方案下"+saveDuWorkTypeDTO.getWorkTypeName()+"该工种已存在");
			}
			Integer duWorkTypeNum = duWorktypeMapper.selectCount(new QueryWrapper<DuWorktype>().lambda().eq(DuWorktype::getDuSolutionId,duSolution.getId()));
			Integer duWorkTypeNum = duWorktypeMapper.selectCount(new QueryWrapper<DuWorktype>().lambda().eq(DuWorktype::getDuSolutionId,duSolution.getId())).intValue();
			DuWorktype duWorktype = new DuWorktype();
			duWorktype.setCreateDate(new Date());
			duWorktype.setCreator(loginUserInfo.getId());