|
@@ -211,12 +211,25 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
|
|
this.removeRequirementByCondition(new ObeCultureProgramRequirement(obeCultureProgramRequirement.getCultureProgramId(), id));
|
|
this.removeRequirementByCondition(new ObeCultureProgramRequirement(obeCultureProgramRequirement.getCultureProgramId(), id));
|
|
// 删除毕业要求(一级指标)
|
|
// 删除毕业要求(一级指标)
|
|
this.removeById(id);
|
|
this.removeById(id);
|
|
- // 更新sortNum
|
|
|
|
|
|
+ // 更新毕业要求sortNum
|
|
|
|
+ List<ObeCultureProgramRequirement> updateList = new ArrayList<>();
|
|
List<ObeCultureProgramRequirement> list = this.listByCultureProgramIdAndParentId(obeCultureProgramRequirement.getCultureProgramId(), null);
|
|
List<ObeCultureProgramRequirement> list = this.listByCultureProgramIdAndParentId(obeCultureProgramRequirement.getCultureProgramId(), null);
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
- list.get(i).setSortNum(i + 1);
|
|
|
|
|
|
+ int newSortNum = i + 1;
|
|
|
|
+ int sortNum = list.get(i).getSortNum().intValue();
|
|
|
|
+ if (newSortNum - sortNum != 0) {
|
|
|
|
+ list.get(i).setSortNum(newSortNum);
|
|
|
|
+ updateList.add(list.get(i));
|
|
|
|
+ // 修改指标点名称
|
|
|
|
+ List<ObeCultureProgramRequirement> subList = this.listByCultureProgramIdAndParentId(obeCultureProgramRequirement.getCultureProgramId(), list.get(i).getId());
|
|
|
|
+ for (ObeCultureProgramRequirement requirement : subList) {
|
|
|
|
+ requirement.setName(concatRequirementName(newSortNum, requirement.getSortNum()));
|
|
|
|
+ updateList.add(requirement);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
- this.updateBatchById(list);
|
|
|
|
|
|
+ this.updateBatchById(updateList);
|
|
// 更新毕业要求数量
|
|
// 更新毕业要求数量
|
|
obeCultureProgramService.updateRequirementCount(obeCultureProgramRequirement.getCultureProgramId());
|
|
obeCultureProgramService.updateRequirementCount(obeCultureProgramRequirement.getCultureProgramId());
|
|
}
|
|
}
|