Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

# Conflicts: # src/main/resources/fatso/handle_real_ctl.js

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
# Conflicts: # src/main/resources/fatso/handle_real_ctl.js
潘钊
2 parents c41da100 f82abec7
Showing 7 changed files with 124 additions and 87 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/entity/mcy_forms/Shiftuehiclemanth.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/package.json
src/main/resources/static/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html
-package com.bsth.controller.realcontrol;
-
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * 相关数据异常检测
- * Created by panzhao on 2017/4/14.
- */
-@RestController
-@RequestMapping("anomalyCheck")
-public class anomalyCheckController {
-
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-    /**
-     * 出现重复班次的车辆
-     * @param nbbm
-     */
-    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
-    public void schRepeat(@RequestParam String nbbm){
-        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
-        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
-
-        Set<ScheduleRealInfo> set = new HashSet<>();
-        for(ScheduleRealInfo sch : list){
-            if(!set.add(sch)){
-                logger.info("出现一次重复班次，班次ID：" + sch.getId());
-            }
-        }
-
-        if(set.size() > 0){
-            dayOfSchedule.replaceByNbbm(nbbm, set);
-        }
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 相关数据异常检测
+ * Created by panzhao on 2017/4/14.
+ */
+@RestController
+@RequestMapping("anomalyCheck")
+public class anomalyCheckController {
+
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+    /**
+     * 出现重复班次的车辆
+     * @param nbbm
+     */
+    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+    public void schRepeat(@RequestParam String nbbm){
+        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+
+        Set<ScheduleRealInfo> set = new HashSet<>();
+        for(ScheduleRealInfo sch : list){
+            if(!set.add(sch)){
+                logger.info("出现一次重复班次，班次ID：" + sch.getId());
+            }
+        }
+
+        if(set.size() > 0){
+            dayOfSchedule.replaceByNbbm(nbbm, set);
+        }
+    }
+}
@@ -22,6 +22,17 @@ public class Shiftuehiclemanth {
 	private String jgh;
 	private String zbh;
+	public String getSgh() {
+		return sgh;
+	}
+
+	public void setSgh(String sgh) {
+		this.sgh = sgh;
+	}
+
+	private String sgh;
+	
+	
 	public String getJgh() {
 		return jgh;
 	}
@@ -156,7 +156,10 @@ public class FormsServiceImpl implements FormsService {
 		if(map.containsKey("fgsdmManth")){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
-		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type,r.s_name,r.lp_name " 
+		String sql = "select"
+				+ " r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name "
+//				+ "r.gs_bm,r.gs_name,"
+//				+ " r.fgs_bm,r.fgs_name,r.bc_type,r.lp_name " 
 		        + " from bsth_c_s_sp_info_real r "
 		    	+ " where 1=1  ";
 		if(map.get("startDate")!=null&&!map.get("startDate").equals("")){
@@ -169,19 +172,23 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("line")!=null&&!map.get("line").equals("")){
 			sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
 		}
-			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
-		if(map.get("gsdmManth")!=null&&!map.get("gsdmManth").equals("")){
-			sql+=" and r.gs_bm='"+map.get("gsdmManth").toString()+"' ";
-		}
+//			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
+//		if(map.get("gsdmManth")!=null&&!map.get("gsdmManth").equals("")){
+			sql+=" and r.gs_bm like'%"+gsdmManth+"%' ";
+//		}
 		if(map.get("fgsdmManth")!=null&&!map.get("fgsdmManth").equals("")){
-			sql+=" and r.fgs_bm='"+map.get("fgsdmManth").toString()+"' ";
+			sql+=" and r.fgs_bm like'%"+fgsdmManth+"%' ";
 		}	
 		if(empnames.equals("售票员")){
 			sql+="and r.s_name is not null AND r.s_name !=''";
 		}
-			sql	+= " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type ";
+			sql	+= " GROUP BY "
+					+ "r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name ";
+//					+ ",r.gs_bm,r.gs_name,"
+//					+ "r.fgs_bm,r.fgs_name,r.bc_type ";
-	
+//			r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,"
+//					+ " r.fgs_bm,r.fgs_name,r.bc_type,r.s_name,r.lp_name
 		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
 			@Override
@@ -191,12 +198,13 @@ public class FormsServiceImpl implements FormsService {
 					shif.setjName(arg0.getString("j_name"));
 				}else if(empnames.equals("售票员")){
 					shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name"));
+			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-				
 				shif.setJgh(arg0.getString("j_gh"));
 		        shif.setZbh(arg0.getString("cl_zbh"));
+//		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
 		});
@@ -208,9 +216,26 @@ public class FormsServiceImpl implements FormsService {
 			Shiftuehiclemanth d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
-					sList.add(s);
+//				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
+//					sList.add(s);
+//				}
+				
+				if(empnames.equals("驾驶员")){
+					if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
+				}else if(empnames.equals("售票员")){
+//					shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name")); 
+					String sgh=s.getsGh()==null?"":s.getsGh();
+					if(d.getSgh().equals(sgh) && d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
+				}else if(empnames.equals("车辆自编号")){
+					if(d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
 				}
+				
 			}
 			double ksgl=culateMileageService.culateKsgl(sList);
@@ -258,13 +283,16 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("fgsdmShif")!=null&&!map.get("fgsdmShif").equals("")){
 			fgsdmShif =map.get("fgsdmShif").toString();
 		}
-		String sql ="select t.* from (select r.schedule_date,r.j_name,IFNULL(r.s_name,'')as s_name,"
-				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name FROM bsth_c_s_sp_info_real r  where 1=1  "
+		String sql ="select t.* from (select r.schedule_date,r.j_name,"
+				+ "IFNULL(r.s_name,'')as s_name,"
+				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name "
+				+ "FROM bsth_c_s_sp_info_real r  where 1=1  "
 				+ " and to_days(r.schedule_date)=to_days('"+date + "')  "
 				+ " and r.xl_bm like '%"+line+"%' "
 				+ " and r.gs_bm  like '%"+gsdmShif+"%' "
 				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' ) t"
-				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm  ";
+				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, "
+				+ "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name  ";
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
@@ -806,7 +834,7 @@ public class FormsServiceImpl implements FormsService {
 				+ " and  y.ssgsdm like '%"+gsbm+"%' "
 				+ " and y.fgsdm like '%"+fgsbm+"%'"
 				+ " ) x"
-				+ " on t.cl_zbh = x.nbbm ";
+				+ " on t.cl_zbh = x.nbbm and t.j_gh=x.jsy";
 		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
 			@Override
@@ -1408,14 +1408,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     	double ljgl=culateService.culateLjgl(lists);
     	 map.put("jhlc", culateService.culateJhgl(list)); //计划里程
-         map.put("remMileage", culateService.culateLbgl(lists)); //烂班公里
+         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
          map.put("addMileage", ljgl); //临加公里
          map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
          map.put("ksgl", ksgl);//空驶公里
          map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
 //         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
          map.put("jhbc", culateService.culateJhbc(list,""));
-         map.put("cjbc", culateService.culateLbbc(lists));
+         map.put("cjbc", culateService.culateLbbc(list));
          map.put("ljbc", culateService.culateLjbc(lists,""));
          map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
          map.put("jcclc", jccgl);
@@ -173,5 +173,4 @@ function write(file, text) {
     });
 }
-
 module.exports = realCtl;
 \ No newline at end of file
-{
-  "name": "fatso",
-  "version": "1.0.0",
-  "description": "子页面js检查、合并、压缩等处理",
-  "main": "start.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "panzhaov5",
-  "license": "ISC",
-  "dependencies": {
-    "cheerio": "^0.20.0",
-    "clean-css": "^4.0.12",
-    "colors": "^1.1.2",
-    "eventproxy": "^0.3.4",
-    "uglify-js": "^2.6.2"
-  }
-}
+{
+  "name": "fatso",
+  "version": "1.0.0",
+  "description": "子页面js检查、合并、压缩等处理",
+  "main": "start.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "panzhaov5",
+  "license": "ISC",
+  "dependencies": {
+    "cheerio": "^0.20.0",
+    "clean-css": "^4.0.12",
+    "colors": "^1.1.2",
+    "eventproxy": "^0.3.4",
+    "uglify-js": "^2.6.2"
+  }
+}
@@ -239,5 +239,4 @@
 			<td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
-</script>
 </script>
 \ No newline at end of file