Merge branch 'jiading' of http://61.169.120.202:8888/panzhaov5/bsth_control into jiading

王通
2 parents 4c8feb39 d82efcae
Showing 2 changed files with 4 additions and 3 deletions
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/resources/static/pages/report/oil/oilListMonth.html
@@ -117,8 +117,8 @@ public class CarOutInfoHandler {
                     //删除
                     jdbcTemplate.update("delete from bsth_t_clfcxxb");
                     //重新写入
-                    jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn)" +
-                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                    jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn,sch)" +
+                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)", new BatchPreparedStatementSetter() {
                         @Override
                         public void setValues(PreparedStatement ps, int i) throws SQLException {
                             ScheduleRealInfo sch = pstList.get(i);
@@ -137,6 +137,7 @@ public class CarOutInfoHandler {
                             ps.setString(13, sch.getjName());
                             ps.setString(14, sch.getRemarks());
                             ps.setInt(15, sch.getFcpSn());
+                            ps.setLong(16, sch.getId());
                         }
                         @Override
@@ -194,7 +194,7 @@
 				} else {
 					var temp = tempData[$("#line").val()].split(":");
 					$("#gsdm").val(temp[0]);
-					updateCompany();
+// 					updateCompany();
 					$("#fgsdm").val(temp[1]);
 					$("#gsdm").attr("disabled", true);
 					$("#fgsdm").attr("disabled", true);