diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 094171f5b..f72fca8ff 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -7,6 +7,8 @@ import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; +import com.api.browser.util.ConditionFactory; +import com.api.browser.util.ConditionType; import com.cloudstore.eccom.pc.table.WeaTable; import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom; import com.cloudstore.eccom.pc.table.WeaTableColumn; @@ -47,6 +49,7 @@ import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; import weaver.general.Util; import weaver.hrm.User; +import weaver.systeminfo.SystemEnv; import java.util.*; import java.util.function.Function; @@ -870,11 +873,7 @@ public class SIArchivesBiz { * @return */ public Map getSearchCondition(User user) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - Map dataMap = new HashMap<>(); - try { - List addGroups = new ArrayList<>(); - List searchItems = new LinkedList<>(); + List userStatusOptions = Arrays.stream(UserStatusEnum.values()).map(e -> new SearchConditionOption(String.valueOf(e.getValue()), e.getDescription())).collect(Collectors.toList()); List list = new SISchemeBiz().listAll(); @@ -890,25 +889,114 @@ public class SIArchivesBiz { .collect(Collectors.toList()) .stream().map(item -> new SearchConditionOption(item.getId().toString(), item.getSchemeName())).collect(Collectors.toList()); - searchItems.add(SalaryFormItemUtil.inputItem(user, "require", 2, 6, 3, 10, "姓名", "userName")); - searchItems.add(SalaryFormItemUtil.inputItem(user, "require", 2, 6, 3, 10, "工号", "jobNum")); - searchItems.add(SalaryFormItemUtil.browserItem(user,2,6,3,false,"部门","require","57","departmentIds")); - searchItems.add(SalaryFormItemUtil.selectItem(user,userStatusOptions, 2, 6, 6, false, "状态","statuses")); - searchItems.add(SalaryFormItemUtil.browserItem(user,2,6,3,false,"岗位","require","278","positions")); - searchItems.add(SalaryFormItemUtil.rangeDateItem(user,2,6,3,"入职日期","require","hireDate","hireDate")); - searchItems.add(SalaryFormItemUtil.rangeDateItem(user,2,6,3,"离职日期","require","dimissionDate","dimissionDate")); - searchItems.add(SalaryFormItemUtil.selectItem(user,schemeOption, 2, 6, 6, false, "社保方案","siSchemeId")); - searchItems.add(SalaryFormItemUtil.selectItem(user,fundOption, 2, 6, 6, false, "公积金方案","fundSchemeId")); - searchItems.add(SalaryFormItemUtil.selectItem(user,otherOption, 2, 6, 6, false, "其它福利方案","otherSchemeId")); - addGroups.add(new SearchConditionGroup("常用条件",true,searchItems)); - dataMap.put("items",addGroups); - }finally { - sqlSession.close(); - } + Map apidatas = new HashMap(); + ConditionFactory conditionFactory = new ConditionFactory(user); + + //条件组 + List addGroups = new ArrayList(); + + List conditionItems = new ArrayList(); + + //文本输入框 + SearchConditionItem username = conditionFactory.createCondition(ConditionType.INPUT,25034, "username"); + username.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + username.setFieldcol(16); //条件输入框所占宽度，默认值18 + username.setLabelcol(8); + username.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + username.setLabel("姓名"); //设置文本值 这个将覆盖多语言标签的值 + conditionItems.add(username); + + //文本输入框 + SearchConditionItem jobNum = conditionFactory.createCondition(ConditionType.INPUT,25034, "jobNum"); + username.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + username.setFieldcol(16); //条件输入框所占宽度，默认值18 + username.setLabelcol(8); + username.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + username.setLabel("工号"); //设置文本值 这个将覆盖多语言标签的值 + conditionItems.add(jobNum); + + + SearchConditionItem departmentIds = conditionFactory.createCondition(ConditionType.BROWSER,502327,"departmentIds", "57"); + departmentIds.setColSpan(2); + departmentIds.setFieldcol(16); + departmentIds.setLabelcol(8); + departmentIds.setIsQuickSearch(true); + departmentIds.setLabel("部门"); + conditionItems.add(departmentIds); + + + SearchConditionItem statuses = conditionFactory.createCondition(ConditionType.SELECT,502327,"statuses"); + statuses.setOptions(userStatusOptions); + statuses.setColSpan(2); + statuses.setFieldcol(16); + statuses.setLabelcol(8); + statuses.setIsQuickSearch(true); + statuses.setLabel("状态"); + conditionItems.add(statuses); + + + + SearchConditionItem positions = conditionFactory.createCondition(ConditionType.BROWSER,502327,"positions", "278"); + positions.setColSpan(2); + positions.setFieldcol(16); + positions.setLabelcol(8); + positions.setIsQuickSearch(true); + positions.setLabel("岗位"); + conditionItems.add(positions); + + + SearchConditionItem hireDate = conditionFactory.createCondition(ConditionType.TIMEPICKER,502327,new String[]{"hireDate", "hireDate"}); + hireDate.setColSpan(2); + hireDate.setFieldcol(16); + hireDate.setViewAttr(8); + hireDate.setLabel("入职日期"); + conditionItems.add(hireDate); + + + SearchConditionItem dimissionDate = conditionFactory.createCondition(ConditionType.TIMEPICKER,502327,new String[]{"dimissionDate", "dimissionDate"}); + dimissionDate.setColSpan(2); + dimissionDate.setFieldcol(16); + dimissionDate.setViewAttr(8); + dimissionDate.setLabel("离职日期"); + conditionItems.add(dimissionDate); + + + SearchConditionItem siSchemeId = conditionFactory.createCondition(ConditionType.SELECT,502327,"siSchemeId"); + siSchemeId.setOptions(schemeOption); + siSchemeId.setColSpan(2); + siSchemeId.setFieldcol(16); + siSchemeId.setLabelcol(8); + siSchemeId.setIsQuickSearch(true); + siSchemeId.setLabel("社保方案"); + conditionItems.add(siSchemeId); + + + SearchConditionItem fundSchemeId = conditionFactory.createCondition(ConditionType.SELECT,502327,"fundSchemeId"); + fundSchemeId.setOptions(fundOption); + fundSchemeId.setColSpan(2); + fundSchemeId.setFieldcol(16); + fundSchemeId.setLabelcol(8); + fundSchemeId.setIsQuickSearch(true); + fundSchemeId.setLabel("公积金方案"); + conditionItems.add(fundSchemeId); + + SearchConditionItem otherSchemeId = conditionFactory.createCondition(ConditionType.SELECT,502327,"otherSchemeId"); + otherSchemeId.setOptions(otherOption); + otherSchemeId.setColSpan(2); + otherSchemeId.setFieldcol(16); + otherSchemeId.setLabelcol(8); + otherSchemeId.setIsQuickSearch(true); + otherSchemeId.setLabel("其它福利方案"); + conditionItems.add(otherSchemeId); + + addGroups.add(new SearchConditionGroup("常用条件",true,conditionItems)); + apidatas.put("condition",addGroups); + return apidatas; + + - return dataMap; } } diff --git a/src/com/engine/salary/web/SIArchivesController.java b/src/com/engine/salary/web/SIArchivesController.java index 4ba2f1dfb..94b7f704c 100644 --- a/src/com/engine/salary/web/SIArchivesController.java +++ b/src/com/engine/salary/web/SIArchivesController.java @@ -53,7 +53,7 @@ public class SIArchivesController { * @param response * @return */ - @POST + @GET @Path("/getSearchCondition") @Produces(MediaType.APPLICATION_JSON) public String getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {