|
|
@@ -63,7 +63,7 @@ import java.util.StringJoiner;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
- * 生成调薪
|
|
|
+ * 生成调薪情况
|
|
|
* 实体标识:nckd_saladjtracker
|
|
|
* @author W.Y.C
|
|
|
* @date 2025/11/24 13:14
|
|
|
@@ -104,6 +104,7 @@ public class SalaryAdjOpPlugin extends AbstractOperationServicePlugIn implements
|
|
|
PermItemConst.ITEM_VIEW, "hrpi_empposorgrel.adminorg", new HashMap<>());
|
|
|
// 构建考核周期查询条件
|
|
|
QFilter perfManagerFilter = buildPerfManagerFilter(userAdminOrgWithSub);
|
|
|
+ perfManagerFilter.and(PerfManagerFormConstant.NCKD_SALARYADJUSTGENFLAG,QCP.not_equals,EnableEnum.YES.getCode());
|
|
|
QueryFieldBuilder perfManagerQueryFieldBuilder = buildPerfManagerQueryFieldBuilder();
|
|
|
DynamicObjectCollection perfManagerList = QueryServiceHelper.query(PerfManagerFormConstant.PERFMANAGER_ENTITYID, perfManagerQueryFieldBuilder.buildSelect(), new QFilter[]{perfManagerFilter});
|
|
|
|
|
|
@@ -426,6 +427,7 @@ public class SalaryAdjOpPlugin extends AbstractOperationServicePlugIn implements
|
|
|
perfManager.set(PerfManagerFormConstant.NCKD_WHYEND, "调档后结束");
|
|
|
perfManager.set(PerfManagerFormConstant.NCKD_THESTATUS, "2");
|
|
|
perfManager.set(PerfManagerFormConstant.NCKD_LOCKUSER, currUser);
|
|
|
+ perfManager.set(PerfManagerFormConstant.NCKD_SALARYADJUSTGENFLAG, EnableEnum.YES.getCode());
|
|
|
LocalDateTime beginDate = DateUtil.toLocalDateTime(perfManager.getDate(PerfManagerFormConstant.NCKD_BEGINYEAR));
|
|
|
LocalDateTime endDate = DateUtil.toLocalDateTime(perfManager.getDate(PerfManagerFormConstant.NCKD_ENDYEAR));
|
|
|
//第一年考核结果
|
|
|
@@ -478,6 +480,7 @@ public class SalaryAdjOpPlugin extends AbstractOperationServicePlugIn implements
|
|
|
OperateOption option = OperateOption.create();
|
|
|
option.setVariableValue(OperateOptionConst.IGNOREINTERACTION, Boolean.TRUE + "");
|
|
|
option.setVariableValue("isUpdate", Boolean.TRUE + "");
|
|
|
+ //保存当前考核周期
|
|
|
OperationResult operationResult = SaveServiceHelper.saveOperate(FormConstant.SAVE_OP, PerfManagerFormConstant.PERFMANAGER_ENTITYID, perfManagerArray, option);
|
|
|
if (!operationResult.isSuccess()) {
|
|
|
StringJoiner errorMsgJoiner = new StringJoiner(StrFormatter.LINE_SEPARATOR);
|
|
|
@@ -490,6 +493,7 @@ public class SalaryAdjOpPlugin extends AbstractOperationServicePlugIn implements
|
|
|
}
|
|
|
throw new ValidationException("保存考核周期失败,原因:" + errorMsg);
|
|
|
} else {
|
|
|
+ //生成新周期
|
|
|
OperateOption addPerfManagerOption = OperateOption.create();
|
|
|
addPerfManagerOption.setVariableValue(OperateOptionConst.IGNOREINTERACTION, Boolean.TRUE + "");
|
|
|
addPerfManagerOption.setVariableValue("cyclegenerate", Boolean.TRUE + "");
|
|
|
@@ -502,6 +506,7 @@ public class SalaryAdjOpPlugin extends AbstractOperationServicePlugIn implements
|
|
|
}
|
|
|
throw new ValidationException(errorMsg.toString());
|
|
|
} else {
|
|
|
+ //生成调薪情况
|
|
|
OperationResult salAdjTrackerResult = SaveServiceHelper.saveOperate(FormConstant.SAVE_OP, SalAdjTrackerConstant.SALADJTRACKER_ENTITYID, addSalAdjTrackerList.toArray(new DynamicObject[0]), OperateOption.create());
|
|
|
if (!salAdjTrackerResult.isSuccess()) {
|
|
|
StringJoiner errorMsgJoiner = new StringJoiner(StrFormatter.LINE_SEPARATOR);
|