代码提交

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptResponsibilityServiceImpl.java

@@ -300,6 +300,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 		}
 		if (StringUtils.isNotEmpty(instId)) {
 			responsibility.setInstId(instId);
+			responsibility.setStage("流程启动");
 		}
 		boolean b = super.saveOrUpdate(responsibility);
 		return b;

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationServiceImpl.java

@@ -382,7 +382,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					throw new CustomException("初始化明细失败");
 				}
 			}
-			organizationEvaluation.setStage("流程启动");
+			organizationEvaluation.setStage("数据已生成");
 			baseMapper.updateById(organizationEvaluation);
 		}
 
@@ -429,7 +429,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 
 
 				//判断多块牌子  是否在该序列加权平均
-				List<MultipleBrand> dkpz = multipleBrandService.getMultipleBranList2(evaluationRule.getOrganizationId(), "", "", evaluationRule.getEvaluationCycle(), evaluationRule.getYear(), "");
+				List<MultipleBrand> dkpz = multipleBrandService.getMultipleBranList2(evaluationRule.getOrganizationId(), "", "", evaluationRule.getEvaluationCycle(), evaluationRule.getYear(), organizationEvaluation.getMonth());
 				List<MultipleBrand> filteredList = dkpz.stream()
 					.filter(multipleBrand -> !"0".equals(multipleBrand.getParentId()))
 					.collect(Collectors.toList());
@@ -519,7 +519,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					throw new CustomException("初始化明细失败");
 				}
 			}
-			organizationEvaluation.setStage("流程启动");
+			organizationEvaluation.setStage("数据已生成");
 			baseMapper.updateById(organizationEvaluation);
 		}
 		return true;
@@ -544,7 +544,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				throw new CustomException("编号" + organizationEvaluation.getOrganizationEvaluationCode() + "的考评已启动;不允许重复操作");
 			}
 
-			organizationEvaluation.setStage("流程启动");
+			organizationEvaluation.setStage("数据已生成");
 			baseMapper.updateById(organizationEvaluation);
 
 			List<String> evaluationRuleIds = Arrays.asList(organizationEvaluation.getOrganizationEvaluationRuleId().split(","));
@@ -649,6 +649,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 		}
 		if (StringUtils.isNotEmpty(instId)) {
 			evaluation.setInstId(instId);
+			evaluation.setStage("流程启动");
 		}
 		boolean b = super.saveOrUpdate(evaluation);
 		return b;