Commit a5665f260076302608698957f118225e566acded
1 parent
a31ad615
Update
Showing
3 changed files
with
11 additions
and
4 deletions
src/main/java/com/bsth/repository/oil/JdlRepository.java
| @@ -20,7 +20,7 @@ public interface JdlRepository extends BaseRepository<Jdl, Integer>{ | @@ -20,7 +20,7 @@ public interface JdlRepository extends BaseRepository<Jdl, Integer>{ | ||
| 20 | "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date)" + | 20 | "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date)" + |
| 21 | " VALUES(" + | 21 | " VALUES(" + |
| 22 | "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'))", nativeQuery=true) | 22 | "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'))", nativeQuery=true) |
| 23 | - void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, Double jdl, String jdz, String remarks, String createrDate); | 23 | + void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate); |
| 24 | 24 | ||
| 25 | @Transactional | 25 | @Transactional |
| 26 | @Modifying | 26 | @Modifying |
| @@ -35,6 +35,6 @@ public interface JdlRepository extends BaseRepository<Jdl, Integer>{ | @@ -35,6 +35,6 @@ public interface JdlRepository extends BaseRepository<Jdl, Integer>{ | ||
| 35 | @Transactional | 35 | @Transactional |
| 36 | @Modifying | 36 | @Modifying |
| 37 | @Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5 and jdz = ?6",nativeQuery=true) | 37 | @Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5 and jdz = ?6",nativeQuery=true) |
| 38 | - void UpdateJdl(Double jdl, String gsbm, String fgsbm, String rq, String nbbm, String jdz); | 38 | + void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jdz); |
| 39 | 39 | ||
| 40 | } | 40 | } |
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
| @@ -2,6 +2,7 @@ package com.bsth.service.oil.impl; | @@ -2,6 +2,7 @@ package com.bsth.service.oil.impl; | ||
| 2 | 2 | ||
| 3 | import java.io.File; | 3 | import java.io.File; |
| 4 | import java.io.FileInputStream; | 4 | import java.io.FileInputStream; |
| 5 | +import java.text.DecimalFormat; | ||
| 5 | import java.text.SimpleDateFormat; | 6 | import java.text.SimpleDateFormat; |
| 6 | import java.util.ArrayList; | 7 | import java.util.ArrayList; |
| 7 | import java.util.Date; | 8 | import java.util.Date; |
| @@ -34,6 +35,7 @@ public class JdlServiceImpl extends BaseServiceImpl<Jdl, Integer> implements Jdl | @@ -34,6 +35,7 @@ public class JdlServiceImpl extends BaseServiceImpl<Jdl, Integer> implements Jdl | ||
| 34 | public String importExcel(File file, String gsbm, String gsName, String fgsbm, String fgsName) { | 35 | public String importExcel(File file, String gsbm, String gsName, String fgsbm, String fgsName) { |
| 35 | SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); | 36 | SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
| 36 | SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 37 | SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 38 | + DecimalFormat df = new DecimalFormat("######0.00"); | ||
| 37 | List<String> textList = new ArrayList<String>(); | 39 | List<String> textList = new ArrayList<String>(); |
| 38 | try { | 40 | try { |
| 39 | POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file)); | 41 | POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file)); |
| @@ -84,10 +86,10 @@ public class JdlServiceImpl extends BaseServiceImpl<Jdl, Integer> implements Jdl | @@ -84,10 +86,10 @@ public class JdlServiceImpl extends BaseServiceImpl<Jdl, Integer> implements Jdl | ||
| 84 | 86 | ||
| 85 | if(jdl_.size() == 0){ | 87 | if(jdl_.size() == 0){ |
| 86 | repository.insertData(gsbm, gsName, fgsbm, fgsName, rq, nbbm, | 88 | repository.insertData(gsbm, gsName, fgsbm, fgsName, rq, nbbm, |
| 87 | - jdl, jdz, remarks, sd.format(new Date())); | 89 | + df.format(jdl), jdz, remarks, sd.format(new Date())); |
| 88 | }else{ | 90 | }else{ |
| 89 | jdl += jdl_.get(0); | 91 | jdl += jdl_.get(0); |
| 90 | - repository.UpdateJdl(jdl, gsbm, fgsbm, rq, nbbm, jdz); | 92 | + repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm, jdz); |
| 91 | } | 93 | } |
| 92 | } | 94 | } |
| 93 | wb.close(); | 95 | wb.close(); |