潘钊 / bsth_control · Commits

Commit a5665f260076302608698957f118225e566acded

Authored by 娄高锋
1 parent a31ad615

Update

Inline Side-by-side
Showing 3 changed files with 11 additions and 4 deletions
src/main/java/com/bsth/repository/oil/JdlRepository.java
  View file @a5665f2
... ... @@ -20,7 +20,7 @@ public interface JdlRepository extends BaseRepository<Jdl, Integer>{
20 20 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date)" +
21 21 " VALUES(" +
22 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 25 @Transactional
26 26 @Modifying
... ... @@ -35,6 +35,6 @@ public interface JdlRepository extends BaseRepository<Jdl, Integer>{
35 35 @Transactional
36 36 @Modifying
37 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
  View file @a5665f2
... ... @@ -2,6 +2,7 @@ package com.bsth.service.oil.impl;
2 2  
3 3 import java.io.File;
4 4 import java.io.FileInputStream;
  5 +import java.text.DecimalFormat;
5 6 import java.text.SimpleDateFormat;
6 7 import java.util.ArrayList;
7 8 import java.util.Date;
... ... @@ -34,6 +35,7 @@ public class JdlServiceImpl extends BaseServiceImpl<Jdl, Integer> implements Jdl
34 35 public String importExcel(File file, String gsbm, String gsName, String fgsbm, String fgsName) {
35 36 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
36 37 SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  38 + DecimalFormat df = new DecimalFormat("######0.00");
37 39 List<String> textList = new ArrayList<String>();
38 40 try {
39 41 POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
... ... @@ -84,10 +86,10 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
84 86  
85 87 if(jdl_.size() == 0){
86 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 90 }else{
89 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 95 wb.close();
... ...
src/main/resources/static/pages/electricity/jdl/list.html
  View file @a5665f2
  1 +<style>
  2 +.blue{
  3 + background-color: #87CEFF
  4 +}
  5 +</style>
1 6 <div class="page-head">
2 7 <div class="page-title">
3 8 <h1>车辆充电量</h1>
... ...