日报导出 部门支持多选

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -232,7 +232,7 @@ public class ReportController {
      * date 日期 格式yyyy-mm-dd
      */
     @RequestMapping("/exportReport")
-    public HttpRespMsg exportReport(String startDate, String endDate,@RequestParam(required = false) Integer exportType, Integer projectId,@RequestParam(defaultValue = "0") Integer stateKey,Integer departmentId) {
+    public HttpRespMsg exportReport(String startDate, String endDate,@RequestParam(required = false) Integer exportType, Integer projectId,@RequestParam(defaultValue = "0") Integer stateKey,String departmentIds) {
         //startDate和endDate间隔不得超过1年
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate start = LocalDate.parse(startDate, dateTimeFormatter);
@@ -243,9 +243,9 @@ public class ReportController {
             return httpRespMsg;
         }
         if (exportType==null){
-            return reportService.exportReport(startDate, endDate,0, projectId,stateKey,departmentId, request);
+            return reportService.exportReport(startDate, endDate,0, projectId,stateKey,departmentIds, request);
         }else {
-            return reportService.exportReport(startDate, endDate,exportType, projectId,stateKey,departmentId, request);
+            return reportService.exportReport(startDate, endDate,exportType, projectId,stateKey,departmentIds, request);
         }
 
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ReportService.java

@@ -27,7 +27,7 @@ import java.util.Map;
 public interface ReportService extends IService<Report> {
     HttpRespMsg getReportList(String date, Integer deptId, String userId, Integer pageIndex, Integer pageSize, HttpServletRequest request);
 
-    HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate,Integer exportType, Integer projectId,Integer stateKey,Integer departmentId, HttpServletRequest request);
+    HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate,Integer exportType, Integer projectId,Integer stateKey,String departmentIds, HttpServletRequest request);
 
     HttpRespMsg getReport(String date, HttpServletRequest request);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5265,7 +5265,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
     //导出报告
     @Override
-    public HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate,Integer exportType, Integer projectId,Integer stateKey,Integer departmentId, HttpServletRequest request) {
+    public HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate,Integer exportType, Integer projectId,Integer stateKey,String departmentIds, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         DateFormat timeDf = new SimpleDateFormat("yyyy-MM-dd");
         long t0 = System.currentTimeMillis();
@@ -5399,9 +5399,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             //获取部门的所有子部门
             List<Department> departments = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
             Department[] deptArray = departments.toArray(new Department[0]);
-            List<Integer> branchDepartment = null;
-            if(departmentId != null){
-                branchDepartment = departmentService.getBranchDepartment(departmentId,departments);
+            List<Integer> branchDepartment = new ArrayList<>();
+            if(!StringUtils.isEmpty(departmentIds)){
+                String[] deptSplit = departmentIds.split(",");
+                List<String> deptStrList = Arrays.asList(deptSplit);
+                deptStrList.forEach(d->{
+                    List<Integer> department = departmentService.getBranchDepartment(Integer.valueOf(d), departments);
+                    branchDepartment.addAll(department);
+                });
             }
             if (functionList.size() == 0) {
                 //检查是否是部门负责人

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -378,7 +378,7 @@
         <if test="projectId != null">
             AND a.project_id = #{projectId}
         </if>
-        <if test="branchDepartment != null">
+        <if test="branchDepartment != null and branchDepartment.size()>0">
             AND department.department_id in
             <foreach collection="branchDepartment" item="deptId" separator="," close=")" open="(" index="index">
                 #{deptId}