qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪酬系统-福利档案高级搜索增加分部字段及相关逻辑

This commit is contained in:
sy 2022-10-31 16:00:46 +08:00
parent cfb682655e
commit 60652dfbde
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/engine/salary/biz/SIArchivesBiz.java
View File

@ -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");

3
src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java
View File

@ -30,6 +30,9 @@ public class InsuranceArchivesListParam extends BaseQueryParam {
//部门(多选)")
private List<BigDecimal> departmentIds;
//分部(多选)")
private List<BigDecimal> subcompanyIds;
private String departmentIdsStr;
//状态(多线)")

18
src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
View File

@ -373,6 +373,12 @@
#{departmentId}
</foreach>
</if>
<if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
AND e.subcompanyid1 IN
<foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
#{subcompanyId}
</foreach>
</if>
<if test="param.statuses != null and param.statuses.size()>0">
AND e.STATUS IN
<foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
@ -440,6 +446,12 @@
#{departmentId}
</foreach>
</if>
<if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
AND e.subcompanyid1 IN
<foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
#{subcompanyId}
</foreach>
</if>
<if test="param.statuses != null and param.statuses.size()>0">
AND e.STATUS IN
<foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
@ -507,6 +519,12 @@
#{departmentId}
</foreach>
</if>
<if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
AND e.subcompanyid1 IN
<foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
#{subcompanyId}
</foreach>
</if>
<if test="param.statuses != null and param.statuses.size()>0">
AND e.STATUS IN
<foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">