|
|
@@ -262,19 +262,19 @@ public class PerfManagerSaveOpPlugin extends AbstractOperationServicePlugIn impl
|
|
|
// 判断周期是否重叠并获取重叠信息,已结束周期使用实际结束时间
|
|
|
String overlapInfo = getCycleOverlapInfo(beginYear, endYear, null, dbBeginYear, dbEndYear, dbActEndYear);
|
|
|
if (StringUtils.isNotBlank(overlapInfo)) {
|
|
|
- addFatalErrorMessage(rowDataEntity,
|
|
|
+ /*addFatalErrorMessage(rowDataEntity,
|
|
|
StrFormatter.format("人员【{}】的考核周期与已有周期在{}重叠,请检查!",
|
|
|
- personName, overlapInfo));
|
|
|
+ personName, overlapInfo));*/
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//判断beginYear和dbBeginYear的年份是否相同
|
|
|
if (isSameYear(beginYear, dbBeginYear)) {
|
|
|
- addFatalErrorMessage(rowDataEntity,
|
|
|
+ /*addFatalErrorMessage(rowDataEntity,
|
|
|
StrFormatter.format("人员【{}】已经存在周期开始年份【{}】的周期,无需进行创建。",
|
|
|
personName,
|
|
|
- beginYear.getYear()));
|
|
|
+ beginYear.getYear()));*/
|
|
|
}
|
|
|
}
|
|
|
|