监督检查统计导出

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/controller/THazardWorkPlanCheckController.java

 package com.testor.module.hazard.controller;
 
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
 import com.testor.common.core.utils.PageUtils;
 import com.testor.module.emergency.model.vo.TContingencyPlanVO;
 import com.testor.module.hazard.model.domain.THazardLicenseSignatureRecord;
@@ -157,12 +159,21 @@ public class THazardWorkPlanCheckController extends SuperController
 		return baseResponse;
 	}
 
-	@ApiOperation(value = "导出PC端监督检查管理列表 ", notes = "Get TSafeHazardOrg By Id")
+	@ApiOperation(value = "导出PC端监督检查管理列表", notes = "导出PC端监督检查管理列表")
 	@PostMapping(value = "/exportEntity")
-	public BaseResponse exportEntity(@RequestBody THazardWorkPlanCheckParam param, HttpServletResponse response) {
-		BaseResponse baseResponse = new BaseResponse<>();
+	public void exportEntity(@RequestBody THazardWorkPlanCheckParam param, HttpServletResponse response) {
+		try {
 			tHazardWorkPlanCheckService.exportEntity(param, response);
-		return baseResponse;
+		} catch (Exception e) {
+			response.reset();
+			response.setContentType("application/json");
+			response.setCharacterEncoding("utf-8");
+			try {
+				response.getWriter().println(JSON.toJSONString("导出失败: " + e.getMessage()));
+			} catch (IOException ex) {
+				throw new RuntimeException(ex);
+			}
+		}
 	}
 
 	@ApiOperation(value = "获取 危险作业计划监督检查详情 ", notes = "Get THazardWorkPlanCheck By Id")

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java

@@ -125,6 +125,9 @@ public class THazardWorkPlanCheckServiceImpl extends SuperServiceImpl<THazardWor
     public void exportEntity(THazardWorkPlanCheckParam param, HttpServletResponse response) {
         try{
             List<HazardWorkPlanCheckVO> hazardWorkPlanCheckVOList = new ArrayList<>();
+
+            param.setStartTime(montageStartTime(param.getStartTime()));
+            param.setEndTime(montageEndTime(param.getEndTime()));
             List<THazardWorkPlanCheck> tHazardWorkPlanCheckPage = this.baseMapper.selectTHazardWorkPlanCheckManageExportList(param);
 
             int i = 1;