hbwri/skjcmanager.git

			@@ -4,6 +4,8 @@
			import cn.gistack.alerts.sms.vo.SmsResultVO;
			import cn.gistack.resource.feign.IOssClient;
			import cn.gistack.resource.vo.MyMultipartFile;
			import cn.gistack.sm.intelligentCall.service.CallService;
			import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
			import cn.gistack.sm.sjztmd.entity.AttResBase;
			import cn.gistack.sm.sjztmd.feign.IAttResBaseClient;
			import cn.gistack.sm.sjztmd.feign.ISjztMdClient;
			@@ -47,10 +49,11 @@

			private final ISmsRecordClient smsRecordClient;

			private final CallService callService;

			@Override
			@GetMapping(GENERATE_DAY_REPORT_FLOOD)
			public String generateDayReportFlood(String isShow) throws Exception{



			//获取总览、大中库、明细数据
			@@ -73,6 +76,12 @@
			vo.setResCode("0");
			List<SmsResultVO> dxyjList = smsRecordClient.smsSuccessList(vo);

			//外呼统计
			CallTaskResultVO callTaskResult = new CallTaskResultVO();
			callTaskResult.setStartTime(yesterday.format(formatter));
			callTaskResult.setEndTime(yesterday.format(formatter));
			List<CallTaskResultVO> whtjList = (List<CallTaskResultVO>) callService.getCallResultListTemp(null, callTaskResult);

			HashMap<String,String> over10Params = new HashMap<>();
			//small_start_stag=0&small_end_stag=2&mid_start_stag=0&mid_end_stag=2&big_start_stag=0&big_end_stag=2
			over10Params.put("small_start_stag", "0.1");
			@@ -89,7 +98,7 @@
			List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow,over10Params);
			byte[] data = null;
			if (MyDateUtils.isTodayInFloodSeason()){
			data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList,dxyjList);
			data = WordUtil.GetOverInfo(totalList, dzkList, overDetailList, szInfoList, dxyjList, whtjList);
			}else {
			data= WordUtil.GetNotInSeasonOverInfo(totalList,dzkList,overDetailList,szInfoList,totalOverList,totalOver10List);