productDev/dmMes.git

			@@ -59,7 +59,7 @@
			LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

			SalaryParam insert = new SalaryParam();
			insert.setRootDepartId(salaryParam.getRootDepartId());
			insert.setRootDepartId(principal.getRootDepartment().getId());
			insert.setDepartId(salaryParam.getDepartId());
			insert.setProcedureId(salaryParam.getProcedureId());
			insert.setMaterialId(salaryParam.getMaterialId());
			@@ -158,7 +158,7 @@
			LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			SalaryParamDTO model = pageWrap.getModel();
			model.setRootDepartId(principal.getRootDepartment().getId());
			model.setDepartId(principal.getComDepartment().getId());
			// model.setDepartId(principal.getComDepartment().getId());
			IPage<SalaryParamVO> salaryParamVOIPage = salaryParamMapper.selectPage(page, model);
			if (!CollectionUtils.isEmpty(salaryParamVOIPage.getRecords())){
			salaryParamVOIPage.getRecords().forEach(s->s.setSalary(s.getSalary().divide(new BigDecimal(100))));

			@@ -384,7 +384,7 @@
			if(p.getPlanDate() == null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第【"+(index+2)+"】行【计划结束日期】数据错误，正确格式为：yyyy-MM-dd（如2022-06-07）！");
			}
			if(p.getPlanDate().getTime() <= p.getStartDate().getTime()){
			if(p.getPlanDate().getTime() < p.getStartDate().getTime()){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第【"+(index+2)+"】行【计划开始日期】要早于【计划结束日期】！");
			}
			if(StringUtils.isBlank(p.getMaterialCode())){

	server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史