| 
					
				 | 
			
			
				@@ -5,21 +5,20 @@ import java.util.ArrayList; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Date;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.List;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import javax.persistence.criteria.CriteriaBuilder;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import javax.persistence.criteria.CriteriaQuery;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import javax.persistence.criteria.Predicate;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import javax.persistence.criteria.Root;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import javax.servlet.http.HttpServletRequest;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import org.springframework.data.jpa.domain.Specification;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Controller;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.ui.Model;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.web.bind.annotation.RequestMapping;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.xt.jygl.common.BaseWebCtl;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.xt.jygl.gkyxtjyfx.hzttltj.entity.FlhwttlhjEntity;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.xt.jygl.gkyxtjyfx.hzttltj.entity.FlhwttlhzEntity;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.xt.jygl.gkyxtjyfx.hzttltj.entity.HzttlEntity;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.xt.jygl.gkyxtjyfx.hzttltj.service.GyttlfxService;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.xt.jygl.gkyxtjyfx.hzttltj.service.HwttlfxService;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.xt.jygl.gkyxtjyfx.hzttltj.service.HzttlfxService;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.xtframe.util.StringUtils;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @Controller
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -27,7 +26,11 @@ import com.xtframe.util.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 public class GyhzttlfxCtl extends BaseWebCtl {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@Autowired
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	private HwttlfxService hwttlfxService;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	private HzttlfxService hzttlfxService;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	@Autowired
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	private GyttlfxService gyttlfxService;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@RequestMapping(value = "/gymtttl/main")
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	public String gymtttl(Model model, final HttpServletRequest request, String tjx, String zzbl, final String startDate, final String endDate, final String menuid) {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -39,20 +42,12 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			start = sdf.format(date1).substring(0, 5) + "01";
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			end = sdf.format(date1);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		Specification<FlhwttlhjEntity> spec = new Specification<FlhwttlhjEntity>() {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			@Override
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			public Predicate toPredicate(Root<FlhwttlhjEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				List<Predicate> list = new ArrayList<Predicate>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					list.add(cb.between(root.get("tj_month").as(String.class), startDate, endDate));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					list.add(cb.between(root.get("tj_month").as(String.class), sdf.format(new Date()).substring(0, 5) + "01", sdf.format(new Date())));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				return cb.and(list.toArray(new Predicate[] {}));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		};
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		List<FlhwttlhjEntity> entityList = query.findAll(spec, FlhwttlhjEntity.class);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		List<HzttlEntity> entityList = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			entityList = gyttlfxService.findBytjmonth(startDate, endDate);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			entityList = gyttlfxService.findBytjmonth(start, end);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 吞吐量
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		List<String> ttl = new ArrayList<String>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 时间区间
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -61,21 +56,21 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		List<String> bl = new ArrayList<String>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		String[] date;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		int year, month;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		FlhwttlhjEntity temp = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		for (FlhwttlhjEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		HzttlEntity temp = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		for (HzttlEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			ttl.add((e.getGK03010202000100020000000000() / 10000) + "");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 比率
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 同比
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if (StringUtils.isEmpty(zzbl) || "tb".equals(zzbl)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			for (FlhwttlhjEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				date = e.gettj_month().split("-");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			for (HzttlEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				date = e.getTj_month().split("-");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				year = Integer.parseInt(date[0]) - 1;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				month = Integer.parseInt(date[1]);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (month < 10) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					temp = hwttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					temp = gyttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					temp = hwttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					temp = gyttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (temp == null || e.getGK03010202000100020000000000() == 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					bl.add("0");
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -86,7 +81,7 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} else if ("hb".equals(zzbl)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			for (int i = 0; i < entityList.size(); i++) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (i == 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					date = entityList.get(i).gettj_month().split("-");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					date = entityList.get(i).getTj_month().split("-");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					year = Integer.parseInt(date[0]);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					month = Integer.parseInt(date[1]);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					if (month == 1) {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -95,9 +90,9 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						month = month - 1;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						if (month < 10) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							temp = hwttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							temp = gyttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							temp = hwttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							temp = gyttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					if (temp == null || entityList.get(i).getGK03010202000100020000000000() == 0) {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -116,7 +111,7 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			for (int i = 0; i < entityList.size(); i++) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (i == 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					date = entityList.get(i).gettj_month().split("-");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					date = entityList.get(i).getTj_month().split("-");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					year = Integer.parseInt(date[0]);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					month = Integer.parseInt(date[1]);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					if (month == 1) {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -125,9 +120,9 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						month = month - 1;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						if (month < 10) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							temp = hwttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							temp = gyttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							temp = hwttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							temp = gyttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					if (temp == null || entityList.get(1).getGK03010202000100020000000000() == 0) {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -147,8 +142,8 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 获取时间区间
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		for (FlhwttlhjEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			dateList.add("'" + e.gettj_month() + "'");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		for (HzttlEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			dateList.add("'" + e.getTj_month() + "'");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		model.addAttribute("bl", bl);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		model.addAttribute("ttl", ttl);
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -171,20 +166,12 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			start = sdf.format(date1).substring(0, 5) + "01";
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			end = sdf.format(date1);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		Specification<FlhwttlhjEntity> spec = new Specification<FlhwttlhjEntity>() {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			@Override
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			public Predicate toPredicate(Root<FlhwttlhjEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				List<Predicate> list = new ArrayList<Predicate>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					list.add(cb.between(root.get("tj_month").as(String.class), startDate, endDate));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					list.add(cb.between(root.get("tj_month").as(String.class), sdf.format(new Date()).substring(0, 5) + "01", sdf.format(new Date())));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				return cb.and(list.toArray(new Predicate[] {}));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		};
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		List<FlhwttlhjEntity> entityList = query.findAll(spec, FlhwttlhjEntity.class);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		List<FlhwttlhzEntity> entityList = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			entityList = hzttlfxService.findBytjmonth(startDate, endDate);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			entityList = hzttlfxService.findBytjmonth(start, end);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 吞吐量
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		List<String> ttl = new ArrayList<String>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 时间区间
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -193,32 +180,32 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		List<String> bl = new ArrayList<String>();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		String[] date;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		int year, month;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		FlhwttlhjEntity temp = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		for (FlhwttlhjEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			ttl.add((e.getGK03010202000000000000000000() - e.getGK03010202000100020000000000()) / 10000 + "");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		FlhwttlhzEntity temp = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		for (FlhwttlhzEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			ttl.add((e.getGK03010202000200020000000000() - e.getGK03010202000200020000000000()) / 10000 + "");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 比率
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 同比
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if (StringUtils.isEmpty(zzbl) || "tb".equals(zzbl)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			for (FlhwttlhjEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			for (FlhwttlhzEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				date = e.gettj_month().split("-");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				year = Integer.parseInt(date[0]) - 1;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				month = Integer.parseInt(date[1]);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (month < 10) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					temp = hwttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					temp = hzttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					temp = hwttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					temp = hzttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				double hz = e.getGK03010202000000000000000000() - e.getGK03010202000100020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				double hz = e.getGK03010202000200020000000000() - e.getGK03010202000200020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (temp == null || hz == 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					bl.add("0");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					bl.add("" + (int) ((hz - (temp.getGK03010202000000000000000000() - temp.getGK03010202000100020000000000())) / (temp.getGK03010202000000000000000000() - temp.getGK03010202000100020000000000()) * 100));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					bl.add("" + (int) ((hz - (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000())) / (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000()) * 100));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} else if ("hb".equals(zzbl)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			for (int i = 0; i < entityList.size(); i++) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				double hz = entityList.get(i).getGK03010202000000000000000000() - entityList.get(i).getGK03010202000100020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				double hz = entityList.get(i).getGK03010202000200020000000000() - entityList.get(i).getGK03010202000200020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (i == 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					date = entityList.get(i).gettj_month().split("-");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					year = Integer.parseInt(date[0]);
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -229,28 +216,28 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						month = month - 1;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						if (month < 10) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							temp = hwttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							temp = hzttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							temp = hwttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							temp = hzttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					if (temp == null || hz == 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						bl.add("0");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						bl.add("" + (int) ((hz - (temp.getGK03010202000000000000000000() - temp.getGK03010202000100020000000000())) / hz * 100));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						bl.add("" + (int) ((hz - (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000())) / hz * 100));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					if (hz == 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						bl.add("0");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						double hzqn = entityList.get(i - 1).getGK03010202000000000000000000() - entityList.get(i - 1).getGK03010202000100020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						double hzqn = entityList.get(i - 1).getGK03010202000200020000000000() - entityList.get(i - 1).getGK03010202000200020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						bl.add("" + (int) ((hz - hzqn) / hzqn * 100));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			for (int i = 0; i < entityList.size(); i++) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				double hz = entityList.get(i).getGK03010202000000000000000000() - entityList.get(i).getGK03010202000100020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				double hz = entityList.get(i).getGK03010202000200020000000000() - entityList.get(i).getGK03010202000200020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if (i == 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					date = entityList.get(i).gettj_month().split("-");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					year = Integer.parseInt(date[0]);
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -261,18 +248,18 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						month = month - 1;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						if (month < 10) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							temp = hwttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							temp = hzttlfxService.findOne(year + "-0" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							temp = hwttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							temp = hzttlfxService.findOne(year + "-" + month);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					if (temp == null || hz == 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						bl.add("0");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						bl.add("" + (int) ((hz - (temp.getGK03010202000000000000000000() - temp.getGK03010202000100020000000000())) / (temp.getGK03010202000000000000000000() - temp.getGK03010202000100020000000000()) * 100));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						bl.add("" + (int) ((hz - (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000())) / (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000()) * 100));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					double hzqn = entityList.get(i - 1).getGK03010202000000000000000000() - entityList.get(i - 1).getGK03010202000100020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					double hzqn = entityList.get(i - 1).getGK03010202000200020000000000() - entityList.get(i - 1).getGK03010202000200020000000000();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					if (hzqn == 0 && hz != 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						bl.add("100");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} else if (hzqn == 0) {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -284,7 +271,7 @@ public class GyhzttlfxCtl extends BaseWebCtl { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// 获取时间区间
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		for (FlhwttlhjEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		for (FlhwttlhzEntity e : entityList) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			dateList.add("'" + e.gettj_month() + "'");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		model.addAttribute("bl", bl);
 
			 |