|
@@ -10,11 +10,7 @@ import kd.bos.servicehelper.parameter.SystemParamServiceHelper;
|
|
|
import kd.bos.servicehelper.permission.PermissionServiceHelper;
|
|
import kd.bos.servicehelper.permission.PermissionServiceHelper;
|
|
|
import kd.sdk.swc.hsas.business.extpoint.payroll.ICalPersonCalResultCoverExtPlugin;
|
|
import kd.sdk.swc.hsas.business.extpoint.payroll.ICalPersonCalResultCoverExtPlugin;
|
|
|
import kd.sdk.swc.hsas.common.events.calperson.CalResultCoverSalaryItemEventArgs;
|
|
import kd.sdk.swc.hsas.common.events.calperson.CalResultCoverSalaryItemEventArgs;
|
|
|
-
|
|
|
|
|
-import kd.swc.hsas.business.calpayrolltask.CalPayrollTaskHelper;
|
|
|
|
|
-import kd.swc.hsbp.business.servicehelper.SWCDataServiceHelper;
|
|
|
|
|
-import kd.swc.hsbp.common.util.SWCListUtils;
|
|
|
|
|
-
|
|
|
|
|
|
|
+import nckd.jxccl.base.swc.helper.SWCHelper;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -49,12 +45,12 @@ public class CalResultCoverSalaryItemExtPlugin implements ICalPersonCalResultCov
|
|
|
List<Long> userIdList = PermissionServiceHelper.getUsersByRoleNum(wtc_cal_account);
|
|
List<Long> userIdList = PermissionServiceHelper.getUsersByRoleNum(wtc_cal_account);
|
|
|
|
|
|
|
|
Long taskId = event.getCalTaskId();
|
|
Long taskId = event.getCalTaskId();
|
|
|
- DynamicObject task = CalPayrollTaskHelper.queryTaskInfoById(taskId);
|
|
|
|
|
|
|
+ DynamicObject task = SWCHelper.queryTaskInfoById(taskId);
|
|
|
DynamicObject calRuleHisObj = task.getDynamicObject("calrulev");
|
|
DynamicObject calRuleHisObj = task.getDynamicObject("calrulev");
|
|
|
if (calRuleHisObj != null && calRuleHisObj.getLong("id") > 0L && userIdList.contains(userId)) {
|
|
if (calRuleHisObj != null && calRuleHisObj.getLong("id") > 0L && userIdList.contains(userId)) {
|
|
|
- SWCDataServiceHelper helper = new SWCDataServiceHelper("hsas_calrule");
|
|
|
|
|
- DynamicObject calRulev = helper.queryOne(calRuleHisObj.getLong("id"));
|
|
|
|
|
- if (calRulev != null && !SWCListUtils.isEmpty(calRulev.getDynamicObjectCollection("calruleitementry"))) {
|
|
|
|
|
|
|
+
|
|
|
|
|
+ DynamicObject calRulev = SWCHelper.queryOne("hsas_calrule",calRuleHisObj.getLong("id"));
|
|
|
|
|
+ if (calRulev != null && !SWCHelper.isEmpty(calRulev.getDynamicObjectCollection("calruleitementry"))) {
|
|
|
DynamicObjectCollection calRuleItemEntry = calRulev.getDynamicObjectCollection("calruleitementry");
|
|
DynamicObjectCollection calRuleItemEntry = calRulev.getDynamicObjectCollection("calruleitementry");
|
|
|
for (DynamicObject dataItem: calRuleItemEntry ) {
|
|
for (DynamicObject dataItem: calRuleItemEntry ) {
|
|
|
boolean isAccount = dataItem.getBoolean("nckd_cbaccount");
|
|
boolean isAccount = dataItem.getBoolean("nckd_cbaccount");
|