diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 84c939c7e..43edbaf0e 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1219,6 +1219,14 @@ public class SIArchivesBiz { positions.setLabel("岗位"); conditionItems.add(positions); + SearchConditionItem subcompanyIds = conditionFactory.createCondition(ConditionType.BROWSER, 502327, "subcompanyIdsStr", "194"); + subcompanyIds.setInputType("browser"); + subcompanyIds.setColSpan(2); + subcompanyIds.setFieldcol(16); + subcompanyIds.setLabelcol(8); + subcompanyIds.setIsQuickSearch(true); + subcompanyIds.setLabel("分部"); + conditionItems.add(subcompanyIds); // SearchConditionItem hireDate = conditionFactory.createCondition(ConditionType.TIMEPICKER,502327,new String[]{"hireDate", "hireDate"}); // hireDate.setInputType("timepicker"); diff --git a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java index 3ff5d8fae..5bac5a942 100644 --- a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java +++ b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java @@ -30,6 +30,9 @@ public class InsuranceArchivesListParam extends BaseQueryParam { //部门(多选)") private List departmentIds; + //分部(多选)") + private List subcompanyIds; + private String departmentIdsStr; //状态(多线)") diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index 4fa4685a7..f5c3abb92 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -373,6 +373,12 @@ #{departmentId} + + AND e.subcompanyid1 IN + + #{subcompanyId} + + AND e.STATUS IN @@ -440,6 +446,12 @@ #{departmentId} + + AND e.subcompanyid1 IN + + #{subcompanyId} + + AND e.STATUS IN @@ -507,6 +519,12 @@ #{departmentId} + + AND e.subcompanyid1 IN + + #{subcompanyId} + + AND e.STATUS IN