# 统计月报bug修改

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml

@@ -336,8 +336,8 @@
         select
         u.user_id userId
         ,t.auto_video autoVideo
-        ,count(case when t.`STATUS` = 3 then 1 else 0 end) completeTask
-        ,count(case when t.`STATUS` <> 3 then 1 else 0 end) undoneTask
+        ,sum(case when t.`STATUS` = 3 then 1 else 0 end) finishTask
+        ,sum(case when t.`STATUS` <> 3 then 1 else 0 end) undoneTask
         ,sum(TIMESTAMPDIFF(HOUR,t.PLAN_START_TIME,t.PLAN_END_TIME)) hours
         from hz_st_ex_task t,hz_st_ex_task_user u
         where t.id = u.task_id and t.is_deleted = 0 and u.is_deleted = 0

hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java

@@ -42,6 +42,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
 import org.springblade.system.entity.Dept;
@@ -95,6 +96,7 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor
 	private final ISysClient sysClient;
 	private final IInspectTaskReportClient taskReportClient;
 	private final ITicketInfoAllClient ticketInfoAllClient;
+	private final BladeLogger logger;
 
 	/**统计月报线程数量**/
 	private static final int POOL_QUANTITY = 8;
@@ -333,6 +335,7 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor
 	 * @param type
 	 */
 	private void fillReport(XSSFSheet sheet, StationReportAllVO stationReportAllVO, String type) {
+		logger.info("hzims:operational:station:report",JSON.toJSONString(stationReportAllVO));
 		//当前行数
 		int currentRowNum = 0;
 		//填充标题
@@ -366,7 +369,7 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor
 		//小结
 		currentRowNum = this.fillConclusion(stationReportAllVO,currentRowNum,sheet,type);
 		//处理建议合并单元格
-		this.mergeSuggestion(currentRowNum+2,sheet,type);
+		//this.mergeSuggestion(currentRowNum+2,sheet,type);
 	}
 
 	private void mergeSuggestion(int currentRowNum, XSSFSheet sheet, String type) {