rfid线路签卡率报表中添加自编号和路牌字段

ljq
1 parent a219b6f7
Showing 4 changed files with 32 additions and 1 deletions
src/main/java/com/bsth/entity/card_signing/CardSigning.java
src/main/java/com/bsth/service/report/impl/CardSigningServiceImpl.java
src/main/resources/static/pages/forms/mould/cardSheetList2.xls
src/main/resources/static/pages/report/cardInsertion/cardList.html
@@ -20,6 +20,13 @@ public class CardSigning {
     private String xlName;
     //线路代码
     private String xlBm;
+
+    /** 车辆自编号 */
+    private String clZbh;
+
+    /** 路牌名称 */
+    private String lpName;
+    
     //时间
     private String scheduleDateStr;
     //班次数
@@ -212,4 +219,20 @@ public class CardSigning {
     public void setRfidName(String rfidName) {
         this.rfidName = rfidName;
     }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
 }
@@ -198,7 +198,7 @@ public class CardSigningServiceImpl implements CardSigningService {
         String line=map.get("line").toString();
         String date=map.get("date").toString();
         String dir =map.get("dir").toString();
-        String sql="select gs_name,gs_bm,fgs_name,fgs_bm, xl_name,xl_bm,schedule_date_str ,qdz_name,rfid_state,fcsj,fcsj_actual  " +
+        String sql="select gs_name,gs_bm,fgs_name,fgs_bm, xl_name,xl_bm,cl_zbh,lp_name,schedule_date_str ,qdz_name,rfid_state,fcsj,fcsj_actual  " +
                 "from bsth_c_s_sp_info_real where schedule_date_str = '"+date+"' and xl_bm = '"+line+"' and bc_type='normal'  ORDER BY qdz_name,fcsj" ;
         //条件下所有路单
         List<CardSigning> list=jdbcTemplate.query(sql,
@@ -212,6 +212,8 @@ public class CardSigningServiceImpl implements CardSigningService {
                         s.setFgsBm(rs.getString("fgs_bm"));
                         s.setXlName(rs.getString("xl_name"));
                         s.setXlBm(rs.getString("xl_bm"));
+                        s.setClZbh(rs.getString("cl_zbh"));
+                        s.setLpName(rs.getString("lp_name"));
                         s.setScheduleDateStr(rs.getString("schedule_date_str"));
                         s.setQdzName(rs.getString("qdz_name"));
                         s.setRfidState(rs.getInt("rfid_state"));
@@ -249,6 +251,8 @@ public class CardSigningServiceImpl implements CardSigningService {
                 m.put("id",i);
                 m.put("schedule_date_str", c.getScheduleDateStr());
                 m.put("line", c.getXlName());
+                m.put("cl_zbh", c.getClZbh());
+                m.put("lp_name", c.getLpName());
                 m.put("qdz_name", c.getQdzName());
                 m.put("fcsj", c.getFcsj());
                 m.put("fcsj_actual", c.getFcsjActual());
@@ -33,6 +33,8 @@
                             <td></td>
                             <td>日期</td>
                             <td>线路</td>
+                            <td>车辆自编号</td>
+                            <td>路牌名称</td>
                             <td>站点</td>
                             <td>计划时间</td>
                             <td>实际时间</td>
@@ -93,6 +95,8 @@
     <td>{{i+1}}</td>
     <td>{{obj.scheduleDateStr}}</td>
     <td>{{obj.xlName}}</td>
+    <td>{{obj.clZbh}}</td>
+    <td>{{obj.lpName}}</td>
     <td>{{obj.qdzName}}</td>
     <td>{{obj.fcsj}}</td>
     <td>{{obj.fcsjActual}}</td>