Pre Merge pull request !241 from dxfeng/feature/dxf

src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java

@@ -2,9 +2,6 @@ package com.engine.organization.util.saveimport;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.api.browser.bean.SearchConditionItem;
-import com.api.browser.util.ConditionFactory;
-import com.api.browser.util.ConditionType;
 import com.engine.organization.entity.extend.po.ExtendInfoPO;
 import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO;
 import com.engine.organization.entity.staff.bo.StaffBO;
@@ -264,36 +261,6 @@ public class StaffInfoImportUtil {
         List<Map<String, Object>> lsGroup = new ArrayList<>();
         Map<String, Object> groupItem = new HashMap<>();
         List<Object> itemList = new ArrayList<>();
-
-        groupItem.put("title", SystemEnv.getHtmlLabelName(1361, user.getLanguage()));
-        groupItem.put("defaultshow", true);
-
-        SearchConditionItem searchConditionItem;
-        ConditionFactory conditionFactory = new ConditionFactory(user);
-
-        ////导入类型
-        //List<SearchConditionOption> statusOptions = new ArrayList<>();
-        //statusOptions.add(new SearchConditionOption("add", SystemEnv.getHtmlLabelName(611, user.getLanguage()), true));
-        //statusOptions.add(new SearchConditionOption("update", SystemEnv.getHtmlLabelName(17744, user.getLanguage())));
-        //searchConditionItem = conditionFactory.createCondition(ConditionType.SELECT, 24863, "importType", statusOptions);
-        //searchConditionItem.setValue("add");
-        //itemList.add(searchConditionItem);
-
-        //模板文件
-        searchConditionItem = conditionFactory.createCondition(ConditionType.INPUT, 28576, "templet");
-        searchConditionItem.setValue("");
-        itemList.add(searchConditionItem);
-
-        //Excel文件
-        searchConditionItem = conditionFactory.createCondition(ConditionType.RESOURCEIMG, 16630, "excelfile");
-        itemList.add(searchConditionItem);
-
-        groupItem.put("items", itemList);
-        lsGroup.add(groupItem);
-
-
-        itemList = new ArrayList<>();
-        groupItem = new HashMap<>();
         groupItem.put("title", SystemEnv.getHtmlLabelName(33803, Util.getIntValue(user.getLanguage())));
         groupItem.put("defaultshow", true);
         List<Integer> lsPromptLabel = new ArrayList<>(); //提示信息
@@ -306,7 +273,7 @@ public class StaffInfoImportUtil {
             String value = Util.toScreen(SystemEnv.getHtmlLabelName(lsPromptLabel.get(i), user.getLanguage()), user.getLanguage());
             if (i == 0) {
                 value += SystemEnv.getHtmlLabelName(28576, user.getLanguage());
-                item.put("link", "");
+                item.put("link", "/hrm/import/template/staff.xls");
             }
             item.put("value", value);
             itemList.add(item);