潘钊 / bsth_control · Commits

Commit fde4f69efdfbd52b92d3603cf4cc05ebe6feca06

Authored by 廖磊
1 parent 5ec0823f

批量导出 去掉sql注释

Inline Side-by-side
Showing 9 changed files with 34 additions and 81 deletions
src/main/java/com/bsth/repository/oil/CdlRepository.java
  View file @fde4f69
... ... @@ -15,8 +15,6 @@ import com.bsth.repository.BaseRepository;
15 15  
16 16 @Repository
17 17 public interface CdlRepository extends BaseRepository<Cdl, Integer>{
18   - @Transactional
19   - @Modifying
20 18 @Query(value="SELECT * FROM bsth_c_cdl ",nativeQuery=true)
21 19 List<Cdl> obtainCdl();
22 20 }
... ...
src/main/java/com/bsth/repository/oil/CwjyRepository.java
  View file @fde4f69
... ... @@ -20,8 +20,6 @@ public interface CwjyRepository extends BaseRepository&lt;Cwjy, Integer&gt;{
20 20 * @param rq
21 21 * @return
22 22 */
23   - @Transactional
24   - @Modifying
25 23 @Query(value="SELECT a.gsdm as gsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
26 24 + "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh FROM bsth_c_cwjy a "+
27 25 " left join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days(?1) and jylx=1) b " +
... ...
src/main/java/com/bsth/repository/oil/CylRepository.java
  View file @fde4f69
... ... @@ -13,8 +13,6 @@ import com.bsth.repository.BaseRepository;
13 13  
14 14 @Repository
15 15 public interface CylRepository extends BaseRepository<Cyl, Integer>{
16   - @Transactional
17   - @Modifying
18 16 @Query(value="SELECT * FROM bsth_c_cyl where nbbm like %?1% and gsdm like %?2%",nativeQuery=true)
19 17 List<Cyl> obtainCyl(String nbbm,String gsdm);
20 18 }
... ...
src/main/java/com/bsth/repository/oil/DlbRepository.java
  View file @fde4f69
... ... @@ -18,8 +18,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
18 18 * @param rq
19 19 * @return
20 20 */
21   - @Transactional
22   - @Modifying
23 21 @Query(value="SELECT a.* FROM bsth_c_dlb a where to_days(?1)-to_days(a.rq)=1"
24 22 + " and jcsx=(select max(b.jcsx) from bsth_c_dlb b where a.nbbm=b.nbbm and "
25 23 + " to_days(?1)-to_days(b.rq)=1 ) and ssgsdm like %?2% and fgsdm like %?3% and "
... ... @@ -30,8 +28,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
30 28 * @param rq
31 29 * @return
32 30 */
33   - @Transactional
34   - @Modifying
35 31 @Query(value="SELECT * FROM bsth_c_dlb where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
36 32 + " and fgsdm like %?3%"
37 33 + " and xlbm like %?4% and nbbm like %?5% order by ?6 asc",nativeQuery=true)
... ... @@ -53,8 +49,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
53 49 * @param xlbm
54 50 * @return
55 51 */
56   - @Transactional
57   - @Modifying
58 52 @Query(value="select nbbm,count(nbbm) from bsth_c_dlb where to_days(?1)=to_days(rq) and "
59 53 + " ssgsdm like %?2% "
60 54 + " and fgsdm like %?3%"
... ... @@ -62,8 +56,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
62 56 + " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
63 57 List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
64 58  
65   - @Transactional
66   - @Modifying
67 59 @Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where to_days(?1)=to_days(rq) and "
68 60 + " ssgsdm like %?2% "
69 61 + " and fgsdm like %?3%"
... ... @@ -81,8 +73,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
81 73 + " and s.nbbm in ?5 ")
82 74 List<Object[]> sumDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
83 75  
84   - @Transactional
85   - @Modifying
86 76 @Query(value="select ifnull(cdl,0),ifnull(hd,0),ifnull(sh,0) from bsth_c_dlb "
87 77 + " where to_days(?1)=to_days(rq) "
88 78 + " and ssgsdm like %?2% "
... ... @@ -92,8 +82,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
92 82 List<Object[]> sumDlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
93 83  
94 84  
95   - @Transactional
96   - @Modifying
97 85 @Query(value="UPDATE bsth_c_dlb SET " +
98 86 " czcd= ?2,"+
99 87 " jzcd = ?3, " +
... ...
src/main/java/com/bsth/repository/oil/JdlRepository.java
  View file @fde4f69
... ... @@ -22,24 +22,16 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
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 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
26   - @Modifying
27 25 @Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4%",nativeQuery=true)
28 26 List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm);
29 27  
30 28  
31   - @Transactional
32   - @Modifying
33 29 @Query(value="SELECT * FROM bsth_c_jdl where rq = ?",nativeQuery=true)
34 30 List<Jdl> JdlList( String rq);
35 31  
36   - @Transactional
37   - @Modifying
38 32 @Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4 and jdz = ?5",nativeQuery=true)
39 33 List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm, String jdz);
40 34  
41   - @Transactional
42   - @Modifying
43 35 @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)
44 36 void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jdz);
45 37  
... ...
src/main/java/com/bsth/repository/oil/YlbRepository.java
  View file @fde4f69
... ... @@ -19,8 +19,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
19 19 * @param rq
20 20 * @return
21 21 */
22   - @Transactional
23   - @Modifying
24 22 @Query(value="SELECT a.* FROM bsth_c_ylb a where to_days(?1)-to_days(a.rq)=1"
25 23 + " and jcsx=(select max(b.jcsx) from bsth_c_ylb b where a.nbbm=b.nbbm and "
26 24 + " to_days(?1)-to_days(b.rq)=1 ) and ssgsdm like %?2% and fgsdm like %?3% and "
... ... @@ -32,8 +30,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
32 30 * 获取当天日期前的最大的日期中最大进出顺序的数据
33 31 *
34 32 */
35   - @Transactional
36   - @Modifying
37 33 @Query(value="select y.* from (select max(d.id) as id ,d.nbbm from ("
38 34 + " select b.rq,b.nbbm,max(b.jcsx) as jcsx from ("
39 35 + " select max(t.rq) as rq ,t.nbbm from bsth_c_ylb t "
... ... @@ -55,21 +51,15 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
55 51 * @param rq
56 52 * @return
57 53 */
58   - @Transactional
59   - @Modifying
60 54 @Query(value="SELECT * FROM bsth_c_ylb where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
61 55 + " and fgsdm like %?3%"
62 56 + " and xlbm like %?4% and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
63 57 List<Ylb> obtainYl(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
64 58  
65 59  
66   - @Transactional
67   - @Modifying
68 60 @Query(value="SELECT * FROM bsth_c_ylb where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 ",nativeQuery=true)
69 61 List<Ylb> queryListYlb(String rq,String nbbm,String jgh);
70 62  
71   - @Transactional
72   - @Modifying
73 63 @Query(value="SELECT * FROM bsth_c_ylb where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4 order by ?5 asc",nativeQuery=true)
74 64 List<Ylb> checkYlb(String rq,String nbbm,String jgh,String xlbm,String px);
75 65 /**
... ... @@ -77,8 +67,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
77 67 * @param rq
78 68 * @return
79 69 */
80   - @Transactional
81   - @Modifying
82 70 @Query(value="select ifnull(jzl,0),ifnull(zlc,0),ifnull(sh,0) from bsth_c_ylb where nbbm=?1 and rq=?2 and xlbm like %?3% and ssgsdm like %?4% and fgsdm like %?5%",nativeQuery=true)
83 71 List<Object[]> sumLcYl(String nbbm,Date rq,String xlbm,String fgsbm,String gsbm);
84 72  
... ... @@ -89,8 +77,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
89 77 * @param xlbm
90 78 * @return
91 79 */
92   - @Transactional
93   - @Modifying
94 80 @Query(value="select nbbm,count(nbbm) from bsth_c_ylb where to_days(?1)=to_days(rq) and "
95 81 + " ssgsdm like %?2% "
96 82 + " and fgsdm like %?3%"
... ... @@ -124,8 +110,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
124 110 + " and s.nbbm in ?5 ")
125 111 List<Object[]> sumYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
126 112  
127   - @Transactional
128   - @Modifying
129 113 @Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_c_ylb "
130 114 + " where to_days(?1)=to_days(rq) "
131 115 + " and ssgsdm like %?2% "
... ...
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
  View file @fde4f69
... ... @@ -17,23 +17,15 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
17 17 * @param rq
18 18 * @return
19 19 */
20   - @Transactional
21   - @Modifying
22 20 @Query(value="SELECT * FROM bsth_c_ylxxb where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
23 21 List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
24 22  
25   - @Transactional
26   - @Modifying
27 23 @Query(value="SELECT * FROM bsth_c_ylxxb where to_days(?1)=to_days(yyrq) and ssgs=?2",nativeQuery=true)
28 24 List<Ylxxb> checkYlxx(String rq,String gs);
29 25  
30   - @Transactional
31   - @Modifying
32 26 @Query(value="SELECT * FROM bsth_c_ylxxb where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
33 27 List<Ylxxb> obtainYlxx2(String rq,String nbbm);
34 28  
35   - @Transactional
36   - @Modifying
37 29 @Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and "
38 30 + "to_days(s.yyrq) = to_days(?2)",nativeQuery=true)
39 31 List<Ylxxb> queryListYlxxb(String clZbh,String date);
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @fde4f69
... ... @@ -52,6 +52,7 @@ import com.google.common.base.Splitter;
52 52 import com.google.common.collect.Lists;
53 53 import org.apache.commons.lang3.StringEscapeUtils;
54 54 import org.apache.commons.lang3.StringUtils;
  55 +import org.drools.compiler.lang.dsl.DSLMapParser.statement_return;
55 56 import org.joda.time.format.DateTimeFormat;
56 57 import org.joda.time.format.DateTimeFormatter;
57 58 import org.slf4j.Logger;
... ... @@ -804,6 +805,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
804 805 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
805 806 //计算里程和班次数，并放入Map里
806 807 Map<String, Object> map = this.MapById(scheduleRealInfos.get(0).getId());
  808 +
  809 + map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
  810 + map.put("remMileage",culateMieageService.culateLbgl(lists));
  811 + map.put("addMileage", culateMieageService.culateLjgl(lists));
  812 + double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
  813 + map.put("yygl", yygl);
  814 + double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
  815 + map.put("ksgl",ksgl);
  816 + map.put("realMileage", Arith.add(yygl ,ksgl));
  817 + map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
  818 + map.put("cjbc", culateMieageService.culateLbbc(lists));
  819 + map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
  820 + int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
  821 + map.put("sjbc", sjbc);
807 822 // map=new HashMap<String,Object>();
808 823 Map<String, Object> maps;
809 824 for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
... ... @@ -834,19 +849,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
834 849 }
835 850  
836 851  
837   - map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
838   - map.put("remMileage",culateMieageService.culateLbgl(lists));
839   - map.put("addMileage", culateMieageService.culateLjgl(lists));
840   - double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
841   - map.put("yygl", yygl);
842   - double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
843   - map.put("ksgl",ksgl);
844   - map.put("realMileage", Arith.add(yygl ,ksgl));
845   - map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
846   - map.put("cjbc", culateMieageService.culateLbbc(lists));
847   - map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
848   - int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
849   - map.put("sjbc", sjbc);
850 852  
851 853 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
852 854  
... ... @@ -4133,7 +4135,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4133 4135 return new ArrayList<Map<String, Object>>();
4134 4136 }
4135 4137  
4136   - public List<ScheduleRealInfo> exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
  4138 + public void exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
4137 4139 ReportUtils ee = new ReportUtils();
4138 4140 ReportRelatedUtils rru = new ReportRelatedUtils();
4139 4141 List<Iterator<?>> list = new ArrayList<Iterator<?>>();
... ... @@ -4151,6 +4153,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4151 4153 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
4152 4154 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
4153 4155 Map<String, Object> map = this.MapById(scheduleRealInfos.get(0).getId());
  4156 + //计算里程和班次数，并放入Map里
  4157 + map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
  4158 + map.put("remMileage",culateMieageService.culateLbgl(lists));
  4159 + map.put("addMileage", culateMieageService.culateLjgl(lists));
  4160 + double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
  4161 + map.put("yygl", yygl);
  4162 + double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
  4163 + map.put("ksgl",ksgl);
  4164 + map.put("realMileage", Arith.add(yygl ,ksgl));
  4165 + map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
  4166 + map.put("cjbc", culateMieageService.culateLbbc(lists));
  4167 + map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
  4168 + int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
  4169 + map.put("sjbc", sjbc);
  4170 +
4154 4171 Map<String, Object> maps;
4155 4172 for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
4156 4173 maps = new HashMap<String, Object>();
... ... @@ -4179,27 +4196,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4179 4196 }
4180 4197 }
4181 4198  
4182   - //计算里程和班次数，并放入Map里
4183   - map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
4184   - map.put("remMileage",culateMieageService.culateLbgl(lists));
4185   - map.put("addMileage", culateMieageService.culateLjgl(lists));
4186   - double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
4187   - map.put("yygl", yygl);
4188   - double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
4189   - map.put("ksgl",ksgl);
4190   - map.put("realMileage", Arith.add(yygl ,ksgl));
4191   - map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
4192   - map.put("cjbc", culateMieageService.culateLbbc(lists));
4193   - map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
4194   - int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
4195   - map.put("sjbc", sjbc);
4196   -
  4199 +
4197 4200 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
4198 4201  
4199 4202 list.add(listMap.iterator());
4200 4203 ee.excelReplace(list, new Object[]{map}, path + "mould/waybill_minhang.xls",
4201 4204 path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
4202   - return scheduleRealInfos;
  4205 +// return scheduleRealInfos;
4203 4206 }
4204 4207  
4205 4208 @Override
... ...
src/main/resources/static/pages/oil/list_ph.html
  View file @fde4f69
... ... @@ -209,7 +209,7 @@
209 209  
210 210 </td>
211 211 <td>
212   - {{obj.jsy}}
  212 + {{obj.jsy}}/{{obj.name}}
213 213 </td>
214 214 <td>
215 215  
... ...