车辆加油导入excel添加驾驶员工号一列

娄高锋
1 parent 8526b84d
Showing 3 changed files with 13 additions and 11 deletions
src/main/java/com/bsth/repository/oil/CwjyRepository.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/resources/static/pages/forms/export/import_Jygl.xls
@@ -40,14 +40,15 @@ public interface CwjyRepository extends BaseRepository&lt;Cwjy, Integer&gt;{
 	@Transactional
     @Modifying
     @Query(value="INSERT INTO bsth_c_ylxxb("+
-    			 "gsdm, yyrq, nbbm, jzl, stationid, bz, createtime, nylx, jylx)" +
-    			 " VALUES(" +
-    			 "?1,str_to_date(?2,'%Y-%m-%d'),?3,?4,?5,?6,str_to_date(?7,'%Y-%m-%d %H:%i:%s'), '0', '1') ", nativeQuery=true)
-	void import_insertData(String gsbm, String rq, String nbbm, String jzl, String jyz, String remarks, String createtime);
+    			 "gsdm, yyrq, nbbm, jsy, jzl, stationid, bz, createtime, nylx, jylx) " +
+    			 "VALUES(" +
+    			 "?1,str_to_date(?2,'%Y-%m-%d'),?3,?4,?5,?6,?7,str_to_date(?8,'%Y-%m-%d %H:%i:%s'), '0', '1') ", nativeQuery=true)
+	void import_insertData(String gsbm, String rq, String nbbm, String jsy, String jzl, String jyz, String remarks, String createtime);
 	@Transactional
     @Modifying
-	@Query(value="UPDATE bsth_c_ylxxb set jzl = ?1 where gsdm = ?2 and yyrq = ?3 and nbbm = ?4 and jylx = '1' ",nativeQuery=true)
-	void import_UpdateJzl(String jdl, String gsbm, String rq, String nbbm);
+	@Query(value="UPDATE bsth_c_ylxxb set jzl = ?1, jsy = ?2, stationid = ?3, bz = ?4 "
+			   + "where gsdm = ?5 and yyrq = ?6 and nbbm = ?7 and jylx = '1' ",nativeQuery=true)
+	void import_UpdateJzl(String jzl, String jsy, String jyz, String remarks, String gsbm, String rq, String nbbm);
 }
@@ -511,9 +511,10 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				String[] split = text.split(",");
 				String rq = split[0].trim();
 				String nbbm = split[1].trim();
-				double jzl = Double.valueOf(split[2].trim().length()!=0?split[2]:"0");
-				String jyz = split[3].trim();
-				String remarks = split[4].trim();
+				String jsy = split[2].trim();
+				double jzl = Double.valueOf(split[3].trim().length()!=0?split[3]:"0");
+				String jyz = split[4].trim();
+				String remarks = split[5].trim();
 				if(rq.trim().length() == 0){
 					rq = sdf.format(new Date());
 				}
@@ -521,10 +522,10 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				List<Double> jzl_ = repository.import_queryBySame(gsbm, rq, nbbm);
 //				
 				if(jzl_.size() == 0){
-					repository.import_insertData(gsbm, rq, nbbm,
+					repository.import_insertData(gsbm, rq, nbbm, jsy, 
 							df.format(jzl), jyz, remarks, sd.format(new Date()));
 				}else{
-					repository.import_UpdateJzl(df.format(jzl), gsbm, rq, nbbm);
+					repository.import_UpdateJzl(df.format(jzl), jsy, jyz, remarks, gsbm, rq, nbbm);
 				}
 			}
 			wb.close();