From a70a2061a542c44d06ccdaf9893c66ce0151d1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 14 Mar 2024 11:19:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=94=B9=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AddUpDeductionServiceImpl.java | 35 +------------------ .../impl/AddUpSituationServiceImpl.java | 2 +- .../salary/wrapper/OtherDeductionWrapper.java | 2 +- .../wrapper/SpecialAddDeductionWrapper.java | 2 +- 4 files changed, 4 insertions(+), 37 deletions(-) diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index f56502c0f..1026aaee5 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -132,7 +132,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction conditionItems.add(username); - SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIds", "4"); + SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIds", "57"); departmentName.setInputType("browser"); departmentName.setColSpan(2); departmentName.setFieldcol(16); @@ -152,39 +152,6 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction jobNum.setLabel("工号"); conditionItems.add(jobNum); - -// SearchConditionItem idNo = conditionFactory.createCondition(ConditionType.INPUT, 25034, "idNo"); -// idNo.setInputType("input"); -// idNo.setColSpan(2); -// idNo.setFieldcol(16); -// idNo.setLabelcol(8); -// idNo.setViewAttr(2); -// idNo.setLabel("证件号码"); -// conditionItems.add(idNo); - - //日期范围选项 -// List dateOptions = new ArrayList(); -// dateOptions.add(new SearchConditionOption("6", SalaryI18nUtil.getI18nLabel(32530, user.getLanguage()), true));//指定日期范围(必须为6) -// SearchConditionItem hiredate = conditionFactory.createCondition(ConditionType.RANGEPICKER, 18648, new String[]{"hiredate", "hiredate"}); -// hiredate.setInputType("rangepicker"); -// hiredate.setFormat("yyyy-MM-dd"); -// hiredate.setFieldcol(16); -// hiredate.setLabelcol(8); -// hiredate.setViewAttr(2); -// hiredate.setLabel("入职日期"); -// hiredate.setOptions(dateOptions); -// conditionItems.add(hiredate); - -// -// SearchConditionItem mobile = conditionFactory.createCondition(ConditionType.INPUT, 25034, "mobile"); -// mobile.setInputType("input"); -// mobile.setColSpan(2); -// mobile.setFieldcol(16); -// mobile.setLabelcol(8); -// mobile.setViewAttr(2); -// mobile.setLabel("手机号"); -// conditionItems.add(mobile); - addGroups.add(new SearchConditionGroup("常用条件", true, conditionItems)); apidatas.put("condition", addGroups); diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index e09ef12fe..b147e6b7d 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -114,7 +114,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation conditionItems.add(username); - SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIds", "4"); + SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIds", "57"); departmentName.setInputType("browser"); departmentName.setColSpan(2); departmentName.setFieldcol(16); diff --git a/src/com/engine/salary/wrapper/OtherDeductionWrapper.java b/src/com/engine/salary/wrapper/OtherDeductionWrapper.java index 2494e6f45..514fa7833 100644 --- a/src/com/engine/salary/wrapper/OtherDeductionWrapper.java +++ b/src/com/engine/salary/wrapper/OtherDeductionWrapper.java @@ -76,7 +76,7 @@ public class OtherDeductionWrapper extends Service { conditionItems.add(username); - SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIds", "4"); + SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIds", "57"); departmentName.setInputType("browser"); departmentName.setColSpan(2); departmentName.setFieldcol(16); diff --git a/src/com/engine/salary/wrapper/SpecialAddDeductionWrapper.java b/src/com/engine/salary/wrapper/SpecialAddDeductionWrapper.java index 2cc7905d0..c5e571950 100644 --- a/src/com/engine/salary/wrapper/SpecialAddDeductionWrapper.java +++ b/src/com/engine/salary/wrapper/SpecialAddDeductionWrapper.java @@ -61,7 +61,7 @@ public class SpecialAddDeductionWrapper extends Service { username.setLabel("姓名"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(username); - SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIds", "4"); + SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIds", "57"); departmentName.setInputType("browser"); departmentName.setColSpan(2); departmentName.setFieldcol(16);