直属公司统计指标接口添加日期查询条件

娄高锋
1 parent e20f1eb7
Showing 1 changed file with 25 additions and 22 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -763,6 +763,7 @@ public class BigscreenService {
     	return JSON.parseObject(JSON.toJSONString(resMap));
     }
+    /** 按月份查询统计指标 */
     @GET
     @Path("/selectData/getMonthly/{month}")
     public JSONObject getMonthly(@PathParam("month") String month){
@@ -896,6 +897,8 @@ public class BigscreenService {
     		}
     	}
+    	resMap.put("date", month);
+    	
     	resMap.put("jhzgl", df.format(jhzgl));
     	resMap.put("sjzgl", df.format(sjzgl));
     	resMap.put("jhcc", jhcc);
@@ -925,13 +928,13 @@ public class BigscreenService {
     	return JSON.parseObject(JSON.toJSONString(resMap));
     }
+    /** 按日期查询四家直属公司统计指标 */
     @GET
-    @Path("/selectData/getCompanyData")
-    public List<Map<String, Object>> getCompanyData(){
+    @Path("/selectData/getCompanyData/{date}")
+    public List<Map<String, Object>> getCompanyData(@PathParam("date") String date){
     	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-    	String date = sd.format(new Date());
-    	String date2 = sd.format(new Date(new Date().getTime() - 1l*1000*60*60*24));
+//    	String date = sd.format(new Date());
     	String gpLineSql = "select * from bsth_c_line_plate";
     	List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
@@ -997,7 +1000,7 @@ public class BigscreenService {
     			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
     			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
     			+ " from bsth_c_calc_count "
-    			+ " where date >= '"+date2+"' and date <= '"+date+"'";
+    			+ " where date = '"+date+"'";
     	List<Map<String, Object>> list=jdbcTemplate.query(sql,
 				new RowMapper<Map<String, Object>>(){
@@ -1078,28 +1081,27 @@ public class BigscreenService {
     		if(yyLine.contains(t.get("lineCode").toString())){
     			if(sortMap.get(t.get("gs")) != null){
 	    			Map<String, Object> m = resList.get(sortMap.get(t.get("gs")));
-	    			if(date.equals(t.get("date").toString())){
-	    				mapPut(m, "jhcc", t.get("jhccz").toString());
-	    				mapPut(m, "sjcc", t.get("sjcc").toString());
-	    				mapPut(m, "jhbc", t.get("jhbc").toString());
-	    				mapPut(m, "sjbc", t.get("sjbc").toString());
-	    				mapPut(m, "jhsmbc", t.get("jhsmbcs").toString());
-	    				mapPut(m, "sjsmbc", t.get("sjsmbczds").toString());
-	    				mapPut(m, "jhqqbc", t.get("jhszfcs").toString());
-	    				mapPut(m, "sjqqzd", t.get("sjszfczds").toString());
-	    				if(gpSet.contains(t.get("lineCode").toString())){
-	        				mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString());
-	        				mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString());
-	    				}
-	    			} else {
-	    				mapPut(m, "jhzgl", t.get("jhzgl").toString());
-	    				mapPut(m, "sjzgl", t.get("sjzgl").toString());
-	    			}
+    				mapPut(m, "jhcc", t.get("jhccz").toString());
+    				mapPut(m, "sjcc", t.get("sjcc").toString());
+    				mapPut(m, "jhbc", t.get("jhbc").toString());
+    				mapPut(m, "sjbc", t.get("sjbc").toString());
+    				mapPut(m, "jhsmbc", t.get("jhsmbcs").toString());
+    				mapPut(m, "sjsmbc", t.get("sjsmbczds").toString());
+    				mapPut(m, "jhqqbc", t.get("jhszfcs").toString());
+    				mapPut(m, "sjqqzd", t.get("sjszfczds").toString());
+    				if(gpSet.contains(t.get("lineCode").toString())){
+        				mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString());
+        				mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString());
+    				}
+    				mapPut(m, "jhzgl", t.get("jhzgl").toString());
+    				mapPut(m, "sjzgl", t.get("sjzgl").toString());
     			}
     		}
     	}
     	for(Map<String, Object> m : resList){
+    		m.put("date", date);
+    		
     		m.put("glzxl", new BigDecimal(m.get("jhzgl").toString()).doubleValue()>0?
     				new BigDecimal(m.get("sjzgl").toString()).divide(new BigDecimal(m.get("jhzgl").toString()),
     				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
@@ -1123,6 +1125,7 @@ public class BigscreenService {
     	return resList;
     }
+    /** 报备登记查询接口 */
     @GET
     @Path("/selectData/getReport")
     public List<Map<String, Object>> getReport(){