hbwri/skjcmanager.git

			@@ -46,7 +46,7 @@

			private String smsResultInfo;

			public OverWord(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList, List<SzInfo> szInfoList, List<SmsResultVO> resultVOList, List<CallTaskResultVO> whtjList,String isNew) {
			public OverWord(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList, List<SzInfo> szInfoList, List<SmsResultVO> resultVOList, List<CallTaskResultVO> whtjList, String isNew) {
			this.tm = new SimpleDateFormat("MM月dd日H时").format(new Date());
			this.hour = new SimpleDateFormat("H时").format(new Date());

			@@ -75,7 +75,7 @@
			cityNames = cityNames + callTaskResultVO.getCityName();
			} else {
			//如果存在不添加
			if (cityNames.indexOf(callTaskResultVO.getCityName()) < 0 && cityNameIndex <4) {
			if (cityNames.indexOf(callTaskResultVO.getCityName()) < 0 && cityNameIndex < 4) {
			cityNames = cityNames + "、" + callTaskResultVO.getCityName();
			cityNameIndex = cityNameIndex + 1;
			}
			@@ -88,9 +88,11 @@
			}

			}
			double jtl = Double.valueOf(jtCount) / whtjList.size() * 100;

			double whtjCount = whtjList.size() > 0 ? whtjList.size() : 1;
			double jtl = Double.valueOf(jtCount) / whtjCount * 100;
			String str = StringUtil.format("过去24小时内，发送水库短信预警{}条，抽查{}等水库防汛责任人{}人次，应答率{}，责任人履职情况总体较好。",
			dxyjCount,cityNames,whtjList.size(),String.format("%.2f", jtl) + "%");
			dxyjCount, cityNames, whtjList.size(), String.format("%.2f", jtl) + "%");
			this.smsResultInfo = str;
			}

			@@ -267,12 +269,12 @@
			case "高关水库":
			flse_lim_stag = "118";
			control_z = "117";
			wat_shed_area = "303";
			wat_shed_area = "";
			break;
			case "王英水库":
			flse_lim_stag = "70";
			control_z = "67";
			wat_shed_area = "243";
			wat_shed_area = "";
			break;
			case "吴岭水库":
			flse_lim_stag = "62.20";
			@@ -280,14 +282,14 @@
			wat_shed_area = "102";
			break;
			case "富水水库":
			flse_lim_stag = "57";
			control_z = "55";
			wat_shed_area = "2450";
			flse_lim_stag = "55";
			control_z = "54";
			wat_shed_area = "";
			break;
			case "漳河水库":
			flse_lim_stag = "122.6";
			control_z = "122";
			wat_shed_area = "2212";
			control_z = "121.8";
			wat_shed_area = "";
			break;
			}