导出添加过滤条件:导出方式

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

@@ -223,7 +223,7 @@ public class ReportController {
      * date 日期 格式yyyy-mm-dd
      */
     @RequestMapping("/exportReport")
-    public HttpRespMsg exportReport(String startDate, String endDate, 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,Integer departmentId) {
         //startDate和endDate间隔不得超过1年
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate start = LocalDate.parse(startDate, dateTimeFormatter);
@@ -233,8 +233,12 @@ public class ReportController {
             httpRespMsg.setError("导出日报时间间隔不得超过1年");
             return httpRespMsg;
         }
+        if (exportType==null){
+            return reportService.exportReport(startDate, endDate,0, projectId,stateKey,departmentId, request);
+        }else {
+            return reportService.exportReport(startDate, endDate,exportType, projectId,stateKey,departmentId, request);
+        }
 
-        return reportService.exportReport(startDate, endDate, projectId,stateKey,departmentId, 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, HttpServletRequest request);
 
-    HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate, Integer projectId,Integer stateKey,Integer departmentId, HttpServletRequest request);
+    HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate,Integer exportType, Integer projectId,Integer stateKey,Integer departmentId, HttpServletRequest request);
 
     HttpRespMsg getReport(String date, HttpServletRequest request);
 

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

@@ -5059,7 +5059,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
     //导出报告
     @Override
-    public HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate, Integer projectId,Integer stateKey,Integer departmentId, HttpServletRequest request) {
+    public HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate,Integer exportType, Integer projectId,Integer stateKey,Integer departmentId, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         DateFormat timeDf = new SimpleDateFormat("yyyy-MM-dd");
         long t0 = System.currentTimeMillis();
@@ -5153,16 +5153,24 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 //                titles.add("项目审核人");
 //                titles.add("审核时间");
 //                titles.add("审核流程");
-                titles.add(MessageUtils.message("excel.fillTime"));
-                titles.add(MessageUtils.message("excel.proReviewer"));
-                titles.add("项目经理");
-                titles.add(MessageUtils.message("excel.auditTime"));
-                titles.add(MessageUtils.message("excel.auditProcess"));
+                if (exportType==0){
+                    titles.add(MessageUtils.message("excel.fillTime"));
+                    titles.add(MessageUtils.message("excel.proReviewer"));
+                    titles.add("项目经理");
+                    titles.add(MessageUtils.message("excel.auditTime"));
+                    titles.add(MessageUtils.message("excel.auditProcess"));
+                }else {
+                    titles.add(MessageUtils.message("excel.fillTime"));
+                    titles.add("项目经理");
+                }
+
+
 //                logDetails = reportLogDetailMapper.selectList(new QueryWrapper<ReportLogDetail>().select("report_id, msg, operator_id, operate_date").eq("company_id", company.getId()).between("work_date", startDate, endDate));
             }
-
-            //titles.add("工作事项");
-            titles.add(MessageUtils.message("excel.workItems"));
+            if (exportType==0) {
+                //titles.add("工作事项");
+                titles.add(MessageUtils.message("excel.workItems"));
+            }
             if(stateKey==1){
                 //titles.add("审核状态");
                 titles.add(MessageUtils.message("excel.auditStatus"));
@@ -5171,8 +5179,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 //titles.add("考勤时长");
                 titles.add(MessageUtils.message("excel.attDuration"));
             }
-            //titles.add("审核流程状态");
-            titles.add(MessageUtils.message("excel.reviewProcessStatus"));
+            if (exportType==0) {
+                //titles.add("审核流程状态");
+                titles.add(MessageUtils.message("excel.reviewProcessStatus"));
+            }
             dataList.add(titles);
             //新增数据行 并且装填数据
             int rowNum = 1;
@@ -5439,11 +5449,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
                 if (timeType.getShowFillauditTime() == 1) {
                     item.add(sdf.format((Date)map.get("time")));
-                    if(needCorpWxTranslate){
-                        String projectAuditorName ="$userName="+String.valueOf(map.get("projectAuditorCorpwxUserId"))+"$";
-                        item.add(projectAuditorName);
-                    }else {
-                        item.add((String)map.get("projectAuditorName"));
+                    if (exportType==0){
+                        if(needCorpWxTranslate){
+                            String projectAuditorName ="$userName="+String.valueOf(map.get("projectAuditorCorpwxUserId"))+"$";
+                            item.add(projectAuditorName);
+                        }else {
+                            item.add((String)map.get("projectAuditorName"));
+                        }
                     }
                     if(needCorpWxTranslate){
                         String projectManagerName ="$userName="+String.valueOf(map.get("projectManagerCorpwxUserId"))+"$";
@@ -5451,11 +5463,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }else {
                         item.add((String)map.get("projectManagerName"));
                     }
-                    //分组审核通过或者项目审核通过都显示
-                    if (map.get("projectAuditTime") != null && ((Integer)map.get("projectAuditState") == 1 || (Integer)map.get("groupAuditState") == 1)) {
-                        item.add(sdf.format((Date)map.get("projectAuditTime")));
-                    } else {
-                        item.add("");
+                    if (exportType==0) {
+                        //分组审核通过或者项目审核通过都显示
+                        if (map.get("projectAuditTime") != null && ((Integer) map.get("projectAuditState") == 1 || (Integer) map.get("groupAuditState") == 1)) {
+                            item.add(sdf.format((Date) map.get("projectAuditTime")));
+                        } else {
+                            item.add("");
+                        }
                     }
                     StringBuilder sb = new StringBuilder();
                     boolean isFirst = true;
@@ -5511,9 +5525,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             sb.append(msg);
                         }
                     }
-                    item.add(sb.toString());
+                    if (exportType==0) {
+                        item.add(sb.toString());
+                    }
+                }
+                if (exportType==0) {
+                    item.add((String) map.get("content"));
                 }
-                item.add((String) map.get("content"));
                 if(stateKey==1){
                     Integer state = (Integer) map.get("state");
                     switch (state){
@@ -5541,55 +5559,57 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     item.add(cellValue);
                 }
                 //审核流程状态
-                Integer packageEngineering = company.getPackageEngineering();
-                if (packageEngineering.equals(0)){
-                    if(String.valueOf(map.get("state")).equals("1")){
-                        item.add("——");
-                    }else if (String.valueOf(map.get("state")).equals("-1")){
-                        item.add("导入待审核");
-                    } else {
-                        //部门审核
-                        if(String.valueOf(map.get("isDeptAudit")).equals("1")){
-                            String deptAuditorId = map.get("deptAuditorName")+"";
-                            String departmentName = map.get("departmentName") + "";
-                            for (User userItem : userList) {
-                                if (userItem.getId().equals(deptAuditorId)){
-                                    if(needCorpWxTranslate){
-                                        String deptAuditorName ="$userName="+ userItem.getCorpwxRealUserid() +"$";
-                                        departmentName = "$departmentName=" + departmentName + "$";
-                                        if(timeType.getReportAuditType()==4){
-                                            departmentName = map.get("buDepartmentName") + "";
+                if (exportType==0) {
+                    Integer packageEngineering = company.getPackageEngineering();
+                    if (packageEngineering.equals(0)) {
+                        if (String.valueOf(map.get("state")).equals("1")) {
+                            item.add("——");
+                        } else if (String.valueOf(map.get("state")).equals("-1")) {
+                            item.add("导入待审核");
+                        } else {
+                            //部门审核
+                            if (String.valueOf(map.get("isDeptAudit")).equals("1")) {
+                                String deptAuditorId = map.get("deptAuditorName") + "";
+                                String departmentName = map.get("departmentName") + "";
+                                for (User userItem : userList) {
+                                    if (userItem.getId().equals(deptAuditorId)) {
+                                        if (needCorpWxTranslate) {
+                                            String deptAuditorName = "$userName=" + userItem.getCorpwxRealUserid() + "$";
                                             departmentName = "$departmentName=" + departmentName + "$";
-                                            item.add("待项目所属BU[" + departmentName + "](" + deptAuditorName + ")审核");
-                                        }else {
-                                            item.add("待" + departmentName + "(" + deptAuditorName + ")审核");
-                                        }
-                                    }else {
-                                        if(timeType.getReportAuditType()==4){
-                                            departmentName = map.get("buDepartmentName") + "";
-                                            item.add("待项目所属BU[" + departmentName + "](" + userItem.getName() + ")审核");
-                                        }else {
-                                            item.add("待" + departmentName + "(" + userItem.getName() + ")审核");
+                                            if (timeType.getReportAuditType() == 4) {
+                                                departmentName = map.get("buDepartmentName") + "";
+                                                departmentName = "$departmentName=" + departmentName + "$";
+                                                item.add("待项目所属BU[" + departmentName + "](" + deptAuditorName + ")审核");
+                                            } else {
+                                                item.add("待" + departmentName + "(" + deptAuditorName + ")审核");
+                                            }
+                                        } else {
+                                            if (timeType.getReportAuditType() == 4) {
+                                                departmentName = map.get("buDepartmentName") + "";
+                                                item.add("待项目所属BU[" + departmentName + "](" + userItem.getName() + ")审核");
+                                            } else {
+                                                item.add("待" + departmentName + "(" + userItem.getName() + ")审核");
+                                            }
                                         }
+                                        break;
                                     }
-                                    break;
                                 }
-                            }
-                        }else {
-                            //项目审核或分组审核
-                            if (String.valueOf(map.get("projectAuditState")).equals("0") || String.valueOf(map.get("groupAuditState")).equals("0")){
-                                String projectAuditorName = map.get("projectAuditorName")+"";
-                                String projectAuditorId = map.get("projectAuditorId")+"";
-                                if(needCorpWxTranslate){
-                                    for (User userItem : userList) {
-                                        if (userItem.getId().equals(projectAuditorId)){
-                                            projectAuditorName ="$userName="+ userItem.getCorpwxUserid() +"$";
-                                            item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
-                                            break;
+                            } else {
+                                //项目审核或分组审核
+                                if (String.valueOf(map.get("projectAuditState")).equals("0") || String.valueOf(map.get("groupAuditState")).equals("0")) {
+                                    String projectAuditorName = map.get("projectAuditorName") + "";
+                                    String projectAuditorId = map.get("projectAuditorId") + "";
+                                    if (needCorpWxTranslate) {
+                                        for (User userItem : userList) {
+                                            if (userItem.getId().equals(projectAuditorId)) {
+                                                projectAuditorName = "$userName=" + userItem.getCorpwxUserid() + "$";
+                                                item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
+                                                break;
+                                            }
                                         }
+                                    } else {
+                                        item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
                                     }
-                                }else {
-                                    item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
                                 }
                             }
                         }