导出和批量导出完成

src/com/engine/organization/mapper/resource/ResourceMapper.java

@@ -1,7 +1,6 @@
 package com.engine.organization.mapper.resource;
 
-import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam;
-import com.engine.organization.entity.hrmresource.po.HrmResourcePO;
+
 import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
 import org.apache.ibatis.annotations.Param;
 

src/com/engine/organization/mapper/resource/ResourceMapper.xml

@@ -16,6 +16,7 @@
         left join JCL_ORG_DEPT d on t.department_id = d.id
         left join jcl_org_comp c on t.company_id = c.id
         left join jcl_org_hrmresource t1 on t.manager_id = t1.id
+        where 1 = 1
         <if test="ids != null and ids.size > 0" >
             AND t.id IN
             <foreach collection="ids" open="(" item="id" separator="," close=")">

src/com/engine/organization/service/impl/HrmResourceServiceImpl.java

@@ -235,11 +235,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
         topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
         topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build());
-        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("export").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_Export").build());
         btnDatas.put("topMenu", topMenuList);
         rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
         rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build());
-        rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("export").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_Export").build());
         rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build());
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;

src/com/engine/organization/web/ExportCommonController.java

@@ -21,7 +21,10 @@ import javax.ws.rs.core.StreamingOutput;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author weaver_cl
@@ -39,10 +42,14 @@ public class ExportCommonController {
     @Path("/resource/export")
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
     public Response resourceExport(@Context HttpServletRequest request, @Context HttpServletResponse response,
-                                   @QueryParam("ids") List<Long> ids) {
+                                   @QueryParam("ids") String ids) {
         //HrmResourceSearchParam param = buildResourceParam(request);
+        List<Long> idList = new ArrayList<>();
+        if (StringUtils.isNotBlank(ids)){
+            idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
+        }
         User user = HrmUserVarify.getUser(request, response);
-        XSSFWorkbook workbook = getExportCommonWrapper(user).resourceExport(ids);
+        XSSFWorkbook workbook = getExportCommonWrapper(user).resourceExport(idList);
         String time = LocalDate.now().toString();
         String fileName = "人员导出" + time;
         try {