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

潘钊
2 parents 8006f719 d40f83dd
Showing 22 changed files with 387 additions and 248 deletions
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/entity/mcy_forms/Shifday.java
src/main/java/com/bsth/entity/mcy_forms/Shiftuehiclemanth.java
src/main/java/com/bsth/entity/mcy_forms/Vehicleloading.java
src/main/java/com/bsth/entity/mcy_forms/Waybillday.java
src/main/java/com/bsth/entity/schedule/BEntity.java
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/EmployeeConfigInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/operationservice.html
src/main/resources/static/pages/forms/statement/shifday.html
src/main/resources/static/pages/forms/statement/shiftuehiclemanth.html
src/main/resources/static/pages/forms/statement/singledata.html
src/main/resources/static/pages/forms/statement/vehicleloading.html
src/main/resources/static/pages/forms/statement/waybillday.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
 package com.bsth.controller.schedule;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
+import com.bsth.entity.schedule.BEntity;
+import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.BService;
 import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.sys.SysUserService;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpSession;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * 基础控制器。
@@ -21,12 +23,24 @@ import java.util.Map;
 public class BController<T, ID extends Serializable> {
     @Autowired
     protected BService<T, ID> bService;
+    @Autowired
+    private SysUserService sysUserService;
     // CRUD 操作
     // Create操作
     @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody T t) {
-        T t_saved = bService.save(t);
+    public Map<String, Object> save(@RequestBody T t, HttpSession httpSession) {
+        // 判定T是否是BEntity的子类，增加新的字段
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        BEntity t_b = null;
+        if (t instanceof BEntity) {
+            t_b = (BEntity) t;
+            t_b.setCreateBy(sysUser);
+            t_b.setCreateDate(new Date());
+        }
+
+        T t_saved = bService.save((T) t_b);
         Map<String, Object> rtn = new HashMap<>();
         rtn.put("status", ResponseCode.SUCCESS);
         rtn.put("data", t_saved);
@@ -34,8 +48,21 @@ public class BController&lt;T, ID extends Serializable&gt; {
     }
     // Update操作
     @RequestMapping(value="/{id}", method = RequestMethod.POST)
-    public Map<String, Object> update(@RequestBody T t) {
-        return save(t);
+    public Map<String, Object> update(@RequestBody T t, HttpSession httpSession) {
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        BEntity t_b = null;
+        if (t instanceof BEntity) {
+            t_b = (BEntity) t;
+            t_b.setUpdateBy(sysUser);
+            t_b.setUpdateDate(new Date());
+        }
+
+        T t_updated = bService.save((T) t_b);
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", t_updated);
+        return rtn;
     }
     // Research操作
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@@ -97,9 +124,10 @@ public class BController&lt;T, ID extends Serializable&gt; {
     // Delete操作
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public Map<String, Object> delete(@PathVariable("id") ID id) {
+    public Map<String, Object> delete(@PathVariable("id") ID id, HttpSession httpSession) {
         Map<String, Object> rtn = new HashMap<>();
         try {
+            // 由于种种原因，这里不保存用户和操作时间了
             bService.delete(id);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (ScheduleException exp) {
@@ -34,7 +34,36 @@ public class Shifday {
 	private String sjbc;//实际班次
+	private String jgh;
+	private String zbh;
+	
+	private String rq;
+	
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getZbh() {
+		return zbh;
+	}
+
+	public void setZbh(String zbh) {
+		this.zbh = zbh;
+	}
+
 	public String getJhlc() {
 		return jhlc;
 	}
@@ -20,7 +20,24 @@ public class Shiftuehiclemanth {
 	private String sjbc;//实际班次
-	
+	private String jgh;
+	private String zbh;
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getZbh() {
+		return zbh;
+	}
+
+	public void setZbh(String zbh) {
+		this.zbh = zbh;
+	}
+
 	public String getCjbc() {
 		return cjbc;
 	}
@@ -24,6 +24,26 @@ public class Vehicleloading {
 	private String sjbc;//实际班次
+	private String jgh;//驾驶员工号
+	
+	private String zbh;//车辆自编号
+	
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getZbh() {
+		return zbh;
+	}
+
+	public void setZbh(String zbh) {
+		this.zbh = zbh;
+	}
+
 	public String getLs() {
 		return ls;
 	}
@@ -20,9 +20,29 @@ public class Waybillday {
 	private String zlc;//里程
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
 	private String yl;//用油
 	private String nbbm;//机油 
+	
+	private String jgh;//员工号
+	
+	private String rq;//日期
 	public String getCarPlate() {
 		return carPlate;
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * Created by xu on 16/12/14.
+ */
+@MappedSuperclass
+public class BEntity {
+
+    /** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser updateBy;
+
+    /** 创建日期 */
+    @Column(updatable = false, name = "create_date")
+    private Date createDate;
+    /** 修改日期 */
+    @Column(name = "update_date")
+    private Date updateDate;
+
+    public SysUser getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
+
+    public SysUser getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
@@ -2,7 +2,6 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
@@ -21,7 +20,7 @@ import java.util.Date;
         })
 })
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class CarConfigInfo implements Serializable {
+public class CarConfigInfo extends BEntity implements Serializable {
     /** 主健Id */
     @Id
@@ -59,20 +58,6 @@ public class CarConfigInfo implements Serializable {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public CarConfigInfo() {}
     public CarConfigInfo(Object id, Object xlid, Object xlname, Object clid) {
         if (id != null) {
@@ -164,38 +149,6 @@ public class CarConfigInfo implements Serializable {
         this.isSwitch = isSwitch;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -3,13 +3,12 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.hibernate.annotations.Formula;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
-import java.util.Date;
+import java.io.Serializable;
 /**
  * 人员配置信息。
@@ -24,7 +23,7 @@ import java.util.Date;
     })
 })
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class EmployeeConfigInfo {
+public class EmployeeConfigInfo extends BEntity implements Serializable {
     /** 主键Id */
     @Id
@@ -55,20 +54,6 @@ public class EmployeeConfigInfo {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public EmployeeConfigInfo() {}
     public EmployeeConfigInfo(Object id, Object xlid, Object xlname, Object jsyid, Object spyid) {
@@ -156,36 +141,4 @@ public class EmployeeConfigInfo {
     public void setIsCancel(Boolean isCancel) {
         this.isCancel = isCancel;
     }
-
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
 package com.bsth.entity.sys;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import javax.persistence.*;
 import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-
 @Entity
 @Table(name = "bsth_c_sys_user")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class SysUser {
 	@Id
@@ -64,16 +64,22 @@ public class FormsServiceImpl implements FormsService {
 				// System.out.println(arg0.getObject("yl"));
 				// wbd.setYl(arg0.getString("yl"));
 				// wbd.setNbbm(arg0.getString("nbbm"));
-				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC2(arg0.getString("j_gh"), arg0.getString("cl_zbh"),
-						arg0.getString("schedule_date"));
-				wbd.setJzl1(maps.get("ksgl").toString());
-				wbd.setZlc(maps.get("realMileage").toString());
-
+				wbd.setRq(arg0.getString("schedule_date"));
+				wbd.setJgh(arg0.getString("j_gh"));
 				return wbd;
 			}
 		});
+		
+		for(int i=0;i<list.size();i++){
+			Waybillday w=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+			maps = scheduleRealInfoService.findKMBC2(w.getJgh(), w.getCarPlate(),
+					w.getRq());
+			w.setJzl1(maps.get("ksgl").toString());
+			w.setZlc(maps.get("realMileage").toString());
+
+		}
 		return list;
 	}
@@ -102,6 +108,9 @@ public class FormsServiceImpl implements FormsService {
 				return lin;
 			}
 		});
+		
+		
+		
 		return list;
 	}
@@ -111,12 +120,13 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Shiftuehiclemanth> shiftuehiclemanth(Map<String, Object> map) {
-		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
+		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 " 
 		        + " from bsth_c_s_sp_info_real r "
 				+ " where  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') "
 				+ " and  to_days('" + map.get("endDate").toString() + "') " 
 				+ " and r.xl_bm='"+ map.get("line").toString() + "'" 
 				+ " AND r.gs_bm is not null"
+				+ " and r.bc_type not in('in','out')"
 			/*	+ " and r.gs_bm='"+map.get("gsdmManth").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmManth").toString()+"'"*/
 				+ " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name" 
@@ -130,26 +140,29 @@ public class FormsServiceImpl implements FormsService {
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shiftuehiclemanth shif = new Shiftuehiclemanth();
 				shif.setjName(arg0.getString("j_name"));
-                
-				Map<String, Object> maps = new HashMap<>();
-
-				maps = scheduleRealInfoService.findKMBC1(arg0.getString("j_name"), arg0.getString("cl_zbh"), startDate,
-						endDate);
-
-				shif.setJhlc(maps.get("jhlc").toString());
-				shif.setEmptMileage(maps.get("ksgl").toString());
-				shif.setRemMileage(maps.get("remMileage").toString());
-				shif.setAddMileage(maps.get("addMileage").toString());
-				shif.setTotalm(maps.get("realMileage").toString());
-				shif.setCjbc(maps.get("cjbc").toString());
-				shif.setLjbc(maps.get("ljbc").toString());
-				shif.setSjbc(maps.get("sjbc").toString());
-
+				shif.setJgh(arg0.getString("j_gh"));
+		        shif.setZbh(arg0.getString("cl_zbh"));
 				return shif;
-
 			}
 		});
+		
+		for(int i=0;i<list.size();i++){
+			Shiftuehiclemanth s=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+
+			maps = scheduleRealInfoService.findKMBC1(s.getjName(),s.getZbh(), startDate,
+					endDate);
+
+			s.setJhlc(maps.get("jhlc").toString());
+			s.setEmptMileage(maps.get("ksgl").toString());
+			s.setRemMileage(maps.get("remMileage").toString());
+			s.setAddMileage(maps.get("addMileage").toString());
+			s.setTotalm(maps.get("realMileage").toString());
+			s.setCjbc(maps.get("cjbc").toString());
+			s.setLjbc(maps.get("ljbc").toString());
+			s.setSjbc(maps.get("sjbc").toString());
+		}
 		return list;
 	}
@@ -157,10 +170,11 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Shifday> shifday(Map<String, Object> map) {
 		String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
-				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name   "
+				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type   "
 				+ " FROM bsth_c_s_sp_info_real r " 
 				+ " where to_days(r.schedule_date)=to_days('"
 				+  map.get("date").toString() + "') and r.xl_bm=" + map.get("line").toString()
+				+ " and r.bc_type not in('in','out')"
 				/*+ " and r.gs_bm='"+map.get("gsdmShif").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'"*/
 				+ " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
@@ -175,25 +189,34 @@ public class FormsServiceImpl implements FormsService {
 				shifday.setsName(arg0.getString("s_name") == null ? "" : arg0.getString("s_name").toString());
 				shifday.setLpName(arg0.getString("r.lp_name").toString());
 				shifday.setCarPlate(arg0.getString("cl_zbh").toString());
-
-				Map<String, Object> map = new HashMap<>();
-				map = scheduleRealInfoService.findKMBC2(arg0.getString("j_gh"), arg0.getString("cl_zbh"),
-						arg0.getString("schedule_date"));
-				shifday.setJhlc(map.get("jhlc").toString());// 计划里程
-				//shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程
-				shifday.setYygl(map.get("yygl").toString());// 营运里程
-				shifday.setEmptMileage(map.get("ksgl").toString());// 空驶里程
-				shifday.setRemMileage(map.get("remMileage").toString());// 抽减里程
-				shifday.setAddMileage(map.get("addMileage").toString());// 增加里程
-				shifday.setTotalm(map.get("realMileage").toString());// 总里程
-				shifday.setJhbc(map.get("jhbc").toString());// 计划班次
-				//shifday.setSjjhbc(map.get("sjjhbc").toString());//实际计划班次
-				shifday.setCjbc(map.get("cjbc").toString());// 抽减班次
-				shifday.setLjbc(map.get("ljbc").toString());// 增加班次
-				shifday.setSjbc(map.get("sjbc").toString());// 实际班次
+				shifday.setJgh(arg0.getString("j_gh"));
+				shifday.setZbh(arg0.getString("cl_zbh"));
+				shifday.setRq(arg0.getString("schedule_date"));
 				return shifday;
 			}
+			
 		});
+		
+		for(int i=0;i<list.size();i++){
+			Shifday shi=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+			maps = scheduleRealInfoService.findKMBC2(shi.getJgh(), shi.getCarPlate(),
+					shi.getRq());
+			shi.setJhlc(maps.get("jhlc").toString());// 计划里程
+			//shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程
+			shi.setYygl(maps.get("yygl").toString());// 营运里程
+			shi.setEmptMileage(maps.get("ksgl").toString());// 空驶里程
+			shi.setRemMileage(maps.get("remMileage").toString());// 抽减里程
+			shi.setAddMileage(maps.get("addMileage").toString());// 增加里程
+			shi.setTotalm(maps.get("realMileage").toString());// 总里程
+			shi.setJhbc(maps.get("jhbc").toString());// 计划班次
+			//shifday.setSjjhbc(map.get("sjjhbc").toString());//实际计划班次
+			shi.setCjbc(maps.get("cjbc").toString());// 抽减班次
+			shi.setLjbc(maps.get("ljbc").toString());// 增加班次
+			shi.setSjbc(maps.get("sjbc").toString());// 实际班次
+
+		}
+
 		return list;
 	}
@@ -240,20 +263,20 @@ public class FormsServiceImpl implements FormsService {
 				Changetochange chan = new Changetochange();
 				chan.setRq(rq);
-				chan.setGs(arg0.getString("gs").toString());
-				chan.setFgs(arg0.getString("fgs").toString());
-				chan.setXl(arg0.getString("xl").toString());
-				chan.setLp(arg0.getString("lp").toString());
-				chan.setFssj(arg0.getString("fssj").toString());
-				chan.setXgsj(arg0.getString("xgsj").toString());
-				chan.setPcch(arg0.getString("pcch").toString());
-				chan.setPcry(arg0.getString("pcry").toString());
-				chan.setJhch(arg0.getString("jhch").toString());
-				chan.setJhgh(arg0.getString("jhgh").toString());
-				chan.setSjch(arg0.getString("sjch").toString());
-				chan.setSjgh(arg0.getString("sjgh").toString());
-				chan.setYy(arg0.getString("yy").toString());
-				chan.setXgr(arg0.getString("xgr").toString());
+				chan.setGs(arg0.getString("gs"));
+				chan.setFgs(arg0.getString("fgs"));
+				chan.setXl(arg0.getString("xl"));
+				chan.setLp(arg0.getString("lp"));
+				chan.setFssj(arg0.getString("fssj"));
+				chan.setXgsj(arg0.getString("xgsj"));
+				chan.setPcch(arg0.getString("pcch"));
+				chan.setPcry(arg0.getString("pcry"));
+				chan.setJhch(arg0.getString("jhch"));
+				chan.setJhgh(arg0.getString("jhgh"));
+				chan.setSjch(arg0.getString("sjch"));
+				chan.setSjgh(arg0.getString("sjgh"));
+				chan.setYy(arg0.getString("yy"));
+				chan.setXgr(arg0.getString("xgr"));
 				return chan;
 			}
 		});
@@ -279,7 +302,7 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " SELECT r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name  " 
+		String sql = " SELECT r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
 		          + "  FROM bsth_c_s_sp_info_real r "
 		          + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
 		          + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
@@ -309,19 +332,23 @@ public class FormsServiceImpl implements FormsService {
 				sin.setJzl(arg0.getString("JZL"));
 				// sin.setJzl(arg0.getString(""));//非营业性用油
 				sin.setJhjl(arg0.getString("JZL"));
-				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC1(arg0.getString("j_name"), arg0.getString("cl_zbh"), startDate,
-						endDate);
-				//sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
-				sin.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
-				sin.setsName(maps.get("s_name") == null ? "" : maps.get("s_name").toString());
-				sin.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
-				sin.setEmptMileage(maps.get("ksgl") == null ? "" : maps.get("ksgl").toString());
-				sin.setJhjl(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
-
+				
 				return sin;
 			}
 		});
+			for(int i=0;i<list.size();i++){
+				Singledata si=list.get(i);
+				Map<String, Object> maps = new HashMap<>();
+				maps = scheduleRealInfoService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
+						endDate);
+				//sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
+				si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
+				si.setsName(maps.get("s_name") == null ? "" : maps.get("s_name").toString());
+				si.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
+				si.setEmptMileage(maps.get("ksgl") == null ? "" : maps.get("ksgl").toString());
+				si.setJhjl(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
+		
+		}
 		return list;
 	}
@@ -329,7 +356,7 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Operationservice> operationservice(Map<String, Object> map) {
-		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
+		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
 		        + "  FROM bsth_c_s_sp_info_real r "
 		       // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
 		        + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
@@ -338,6 +365,7 @@ public class FormsServiceImpl implements FormsService {
 				+ "  where r.schedule_date_str BETWEEN '"+ map.get("startDate").toString() 
 		        + "'" + "  and '" + map.get("endDate").toString() + "'"
 				+ "  and r.xl_bm='" + map.get("line").toString() + "'" 
+				+ " and r.bc_type not in('in','out')"
 			   /* + " and r.gs_bm='"+map.get("gsdmOperat").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'"*/
 				+ "  AND r.gs_bm is not null"
@@ -373,11 +401,12 @@ public class FormsServiceImpl implements FormsService {
 		return list;
 	}
+
 	// 车辆加注
 	@Override
 	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line, String date) {
-		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name  " 
+		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type  " 
 		        + "  FROM bsth_c_s_sp_info_real r "
 		        + " INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y "
 		        + " where to_days(y.RQ)=to_days('" + date + "')  and y.XLBM= '" + line + "'  GROUP BY  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH) y "
@@ -385,6 +414,7 @@ public class FormsServiceImpl implements FormsService {
 				+ "  where to_days(r.schedule_date_str)=to_days('" + date + "')" 
 		        + "  and r.xl_bm='" + line + "' "
 		        + " AND r.gs_bm is not null"
+		        + " and r.bc_type not in('in','out')"
 		        /* + " and r.gs_bm='"+gsdmVehic +"'"
 				+ " and r.fgs_bm='"+fgsdmVehic +"'"*/
 				+ "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
@@ -402,15 +432,21 @@ public class FormsServiceImpl implements FormsService {
 				ve.setHyl(arg0.getString("YH"));
 				ve.setJzl(arg0.getString("JZL"));
 				// ve.setLs(arg0.getString("").toString());//尿素
-				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC2(arg0.getString("j_gh"), arg0.getString("cl_zbh"),
-						arg0.getString("schedule_date_str"));
-				ve.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
-				ve.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
-				ve.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
+				ve.setJgh(arg0.getString("j_gh").toString());
 				return ve;
 			}
 		});
+		
+		for(int i=0;i<list.size();i++){
+			Vehicleloading v=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+			maps = scheduleRealInfoService.findKMBC2(v.getJgh(), line,
+					date);
+			v.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
+			v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
+			v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
+		}
+		
 		return list;
 	}
@@ -434,20 +470,22 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car from "
-				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl"
+		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car,a.bc_type from "
+				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "'  "
 				+ " and '" + map.get("endDate").toString() + "'  and xl_bm='"+ map.get("line").toString() + "' "
 				+ " AND gs_bm is not null "
+				+ " AND bc_type NOT IN ('in', 'out')"
 				/*+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"*/
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name ) a left JOIN ("
+				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
-				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl  from bsth_c_s_sp_info_real	 "
+				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
 				+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
 				+ "' AND gs_bm is not null "
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name) b ON  t.company=b.gs_bm) b on "
+				+ " AND bc_type NOT IN ('in', 'out')"
+				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm) b on "
 				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
@@ -480,6 +518,7 @@ public class FormsServiceImpl implements FormsService {
 		});
+		
 		return list;
 	}
@@ -503,20 +542,20 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm from "
-				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl"
+		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
+				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
-				+ map.get("line").toString() + "'   AND gs_bm is not null"
+				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
 				/*+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"*/
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name ) a left JOIN ("
-				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
-				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl  from bsth_c_s_sp_info_real	 "
+				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl  "
+				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
 				+ "where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
-				+ "' AND gs_bm is not null "
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name) b ON  t.company=b.gs_bm) b on "
+				+ "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
+				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm) b on "
 				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Executionrate> list = jdbcTemplate.query(sql, new RowMapper<Executionrate>() {
@@ -570,22 +609,27 @@ public class FormsServiceImpl implements FormsService {
 		String rq2 = sdf1.format(d);
 		String rq3 = sdf1.format(d1);
+		
+		
 		rq = rq2 + "-" + rq3;
-		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm from "
-				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl"
+		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
+				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
-				+ map.get("line").toString() + "'   AND gs_bm is not null"
+				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out') "
 				/*+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"*/
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name ) a left JOIN ("
-				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
-				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl  from bsth_c_s_sp_info_real	 "
+				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+				+ "SELECT  COUNT(*"
+				+ ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b."
+				+ "xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
+				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
 				+ "where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
-				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
-				+ "' AND gs_bm is not null "
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name) b ON  t.company=b.gs_bm) b on "
+				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get
+				("line").toString()
+				+ "' AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
+				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm) b on "
 				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Allline> list = jdbcTemplate.query(sql, new RowMapper<Allline>() {
@@ -610,14 +654,19 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcjh(arg0.getString("jbc").toString());
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
+				
 				// tu.setSm(arg0.getString("xl_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
 			}
+			
 		});
+		
+		
+		
 		return list;
 	}
-}
 \ No newline at end of file
+}
@@ -83,7 +83,9 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
         Map<String, Object> param = new HashMap<>();
         if (employeeConfigInfo.getIsCancel()) {
             validate_jsy(employeeConfigInfo);
-            validate_spy(employeeConfigInfo);
+            if (employeeConfigInfo.getSpy() != null) {
+                validate_spy(employeeConfigInfo);
+            }
             employeeConfigInfo.setIsCancel(false);
         } else {
             param.clear();
@@ -79,7 +79,7 @@
 								<th>消耗量</th>
 								<th>行驶公里(含空放里程)</th>
 								<th>空驶里程</th>
-								<th>实际班次(包含空放把班次)</th>
+								<th>实际班次(包含空放班次)</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -147,7 +147,6 @@ $(function(){
 		for(var code in result){
 			data.push({id: code, text: result[code]});
 		}
-		console.log(data);
 		initPinYinSelect2('#line',data,'');
 	})
@@ -137,7 +137,6 @@
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
-			console.log(data);
 			initPinYinSelect2('#line',data,'');
 		})
@@ -142,7 +142,6 @@
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
-			console.log(data);
 			initPinYinSelect2('#line',data,'');
 		})
@@ -167,7 +166,6 @@
 		            } 
                     obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
                 }); 
-               console.log(result);
 		        var singledata = template('singledata',{list:result});
                 // 把渲染好的模版html文本追加到表格中
 		        $('#forms tbody').html(singledata);
@@ -130,7 +130,6 @@
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
-			console.log(data);
 			initPinYinSelect2('#line',data,'');
 		})
@@ -129,7 +129,6 @@
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
-			console.log(data);
 			initPinYinSelect2('#line',data,'');
 		})
@@ -17,15 +17,18 @@
                 <td></td>
                 <td>
                     <div>
-                        <sa-Select3 model="ctrl.searchCondition()"
-                                    name="xl"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.searchCondition()['xl.lineCode_eq']}}"
+                        <sa-Select5 name="xl"
+                                    model="ctrl.searchCondition()"
+                                    cmaps="{'xl.lineCode_eq' : 'lineCode'}"
                                     dcname="xl.lineCode_eq"
                                     icname="lineCode"
-                                    icnames="name"
-                                    datatype="xl">
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
+                                    required >
+                        </sa-Select5>
                     </div>
                 </td>
                 <td>
@@ -169,8 +169,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             self.toggleBusConfig = function(id) {
                 BusConfig.delete({id: id}, function(result) {
-                    if (result.message) { // 暂时这样做，之后全局拦截
-                        alert("失败：" + result.message);
+                    if (result.msg) { // 暂时这样做，之后全局拦截
+                        alert("失败：" + result.msg);
                     } else {
                         self.doPage();
                     }
@@ -222,9 +222,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 提交方法
             self.submit = function() {
-                self.busConfigForSave.$save(function() {
-                    $state.go("busConfig");
-                });
+                if (id) {
+                    // 更新
+                    self.busConfigForSave.$save({id: id}, function() {
+                        $state.go("busConfig");
+                    });
+                } else {
+                    // 保存
+                    self.busConfigForSave.$save(function() {
+                        $state.go("busConfig");
+                    });
+                }
             };
 }]);
@@ -121,8 +121,8 @@
                         </sa-Select5>
                         <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
                                remote-Validation
-                               remotevtype="ec_jsy"
-                               remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
+                               remotevtype="ec_spy"
+                               remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
                                 />
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -18,17 +18,18 @@
                 <td></td>
                 <td>
                     <div>
-                        <sa-Select3 model="ctrl.searchCondition()"
-                                    name="xl"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.searchCondition()['xl.lineCode_eq']}}"
+                        <sa-Select5 name="xl"
+                                    model="ctrl.searchCondition()"
+                                    cmaps="{'xl.lineCode_eq' : 'lineCode'}"
                                     dcname="xl.lineCode_eq"
                                     icname="lineCode"
-                                    dcname2="xl.company_eq"
-                                    icname2="company"
-                                    icnames="name"
-                                    datatype="xl">
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
+                                    required >
+                        </sa-Select5>
                     </div>
                 </td>
                 <td></td>
@@ -170,8 +170,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.toggleEmpConfig = function(id) {
                 EmpConfig.delete({id: id}, function(result) {
-                    if (result.message) { // 暂时这样做，之后全局拦截
-                        alert("失败：" + result.message);
+                    if (result.msg) { // 暂时这样做，之后全局拦截
+                        alert("失败：" + result.msg);
                     } else {
                         self.doPage();
                     }
@@ -220,9 +220,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     self.employeeConfigForSave.spy = null;
                 }
-                self.employeeConfigForSave.$save(function() {
-                    $state.go("employeeConfig");
-                });
+                if (id) {
+                    // 更新
+                    self.employeeConfigForSave.$save({id: id}, function() {
+                        $state.go("employeeConfig");
+                    });
+                } else {
+                    // 保存
+                    self.employeeConfigForSave.$save(function() {
+                        $state.go("employeeConfig");
+                    });
+                }
             };
 }]);