潘钊 / bsth_control · Commits

Commit 7d3877550fc5387a70fab54fd01668b65af46e6b

Authored by 王通
2 parents 4c8feb39 d82efcae

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

Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
  View file @7d38775
... ... @@ -117,8 +117,8 @@ public class CarOutInfoHandler {
117 117 //删除
118 118 jdbcTemplate.update("delete from bsth_t_clfcxxb");
119 119 //重新写入
120   - 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)" +
121   - " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
  120 + 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)" +
  121 + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)", new BatchPreparedStatementSetter() {
122 122 @Override
123 123 public void setValues(PreparedStatement ps, int i) throws SQLException {
124 124 ScheduleRealInfo sch = pstList.get(i);
... ... @@ -137,6 +137,7 @@ public class CarOutInfoHandler {
137 137 ps.setString(13, sch.getjName());
138 138 ps.setString(14, sch.getRemarks());
139 139 ps.setInt(15, sch.getFcpSn());
  140 + ps.setLong(16, sch.getId());
140 141 }
141 142  
142 143 @Override
... ...
src/main/resources/static/pages/report/oil/oilListMonth.html
  View file @7d38775
... ... @@ -194,7 +194,7 @@
194 194 } else {
195 195 var temp = tempData[$("#line").val()].split(":");
196 196 $("#gsdm").val(temp[0]);
197   - updateCompany();
  197 +// updateCompany();
198 198 $("#fgsdm").val(temp[1]);
199 199 $("#gsdm").attr("disabled", true);
200 200 $("#fgsdm").attr("disabled", true);
... ...