批量导出去掉sql注释

廖磊
1 parent 5ec0823f
Showing 9 changed files with 34 additions and 81 deletions
src/main/java/com/bsth/repository/oil/CdlRepository.java
src/main/java/com/bsth/repository/oil/CwjyRepository.java
src/main/java/com/bsth/repository/oil/CylRepository.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/oil/JdlRepository.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
@@ -15,8 +15,6 @@ import com.bsth.repository.BaseRepository;
 @Repository
 public interface CdlRepository extends BaseRepository<Cdl, Integer>{
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_cdl ",nativeQuery=true)
 	List<Cdl> obtainCdl();
 }
@@ -20,8 +20,6 @@ public interface CwjyRepository extends BaseRepository&lt;Cwjy, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT a.gsdm as gsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
 			+ "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
    " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days(?1) and jylx=1) b " +
@@ -13,8 +13,6 @@ import com.bsth.repository.BaseRepository;
 @Repository
 public interface CylRepository extends BaseRepository<Cyl, Integer>{
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_cyl where nbbm like %?1% and gsdm like %?2%",nativeQuery=true)
 	List<Cyl> obtainCyl(String nbbm,String gsdm);
 }
@@ -18,8 +18,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_dlb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_dlb b where a.nbbm=b.nbbm and "
 			+ " 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;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " 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;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="select nbbm,count(nbbm) from bsth_c_dlb where to_days(?1)=to_days(rq) and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
@@ -62,8 +56,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
-	@Transactional
-	@Modifying
 	@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 "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
@@ -81,8 +73,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " and s.nbbm in ?5 ")
 	List<Object[]> sumDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
-	@Transactional
-	@Modifying
 	@Query(value="select ifnull(cdl,0),ifnull(hd,0),ifnull(sh,0) from bsth_c_dlb "
 			+ " where to_days(?1)=to_days(rq) "
 			+ " and ssgsdm like %?2% "
@@ -92,8 +82,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	List<Object[]> sumDlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
-	@Transactional
-    @Modifying
 	@Query(value="UPDATE bsth_c_dlb SET " +
 				" czcd= ?2,"+
 				" jzcd = ?3, " +
@@ -22,24 +22,16 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
     			 "?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)
 	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate);
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4%",nativeQuery=true)
 	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm);
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_jdl where rq = ?",nativeQuery=true)
 	List<Jdl> JdlList( String rq);
-	@Transactional
-	@Modifying
 	@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)
 	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm, String jdz);
-	@Transactional
-	@Modifying
 	@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)
 	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jdz);
@@ -19,8 +19,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_ylb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_ylb b where a.nbbm=b.nbbm and "
 			+ " 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;{
 	 * 获取当天日期前的最大的日期中最大进出顺序的数据
 	 * 
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="select y.* from (select max(d.id) as id ,d.nbbm from ("
 			+ " select b.rq,b.nbbm,max(b.jcsx) as jcsx from ("
 			+ " 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;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
 	List<Ylb> obtainYl(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 ",nativeQuery=true)
 	List<Ylb> queryListYlb(String rq,String nbbm,String jgh);
-	@Transactional
-	@Modifying
 	@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)
 	List<Ylb> checkYlb(String rq,String nbbm,String jgh,String xlbm,String px);
 	/**
@@ -77,8 +67,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@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)
 	List<Object[]> sumLcYl(String nbbm,Date rq,String xlbm,String fgsbm,String gsbm);
@@ -89,8 +77,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="select nbbm,count(nbbm) from bsth_c_ylb where to_days(?1)=to_days(rq) and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
@@ -124,8 +110,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and s.nbbm in ?5 ")
 	List<Object[]> sumYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
-	@Transactional
-	@Modifying
 	@Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_c_ylb "
 			+ " where to_days(?1)=to_days(rq) "
 			+ " and ssgsdm like %?2% "
@@ -17,23 +17,15 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
 	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and ssgs=?2",nativeQuery=true)
 	List<Ylxxb> checkYlxx(String rq,String gs);
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
 	List<Ylxxb> obtainYlxx2(String rq,String nbbm);
-	@Transactional
-	@Modifying
 	@Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and "
 			+ "to_days(s.yyrq) = to_days(?2)",nativeQuery=true)
 	List<Ylxxb> queryListYlxxb(String clZbh,String date);
@@ -52,6 +52,7 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.drools.compiler.lang.dsl.DSLMapParser.statement_return;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
@@ -804,6 +805,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
       //计算里程和班次数，并放入Map里
         Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
+
+        map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
 //      map=new HashMap<String,Object>();
         Map<String, Object> maps;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
@@ -834,19 +849,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
-        map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
-        map.put("remMileage",culateMieageService.culateLbgl(lists));
-        map.put("addMileage", culateMieageService.culateLjgl(lists));
-        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
-        map.put("yygl", yygl);
-        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
-        map.put("ksgl",ksgl);
-        map.put("realMileage", Arith.add(yygl ,ksgl));
-        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
-        map.put("cjbc", culateMieageService.culateLbbc(lists));
-        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
-        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
-        map.put("sjbc", sjbc);
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
@@ -4133,7 +4135,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return new ArrayList<Map<String, Object>>();
     }
-    public  List<ScheduleRealInfo> exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
+    public  void exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
         ReportUtils ee = new ReportUtils();
         ReportRelatedUtils rru = new ReportRelatedUtils();
         List<Iterator<?>> list = new ArrayList<Iterator<?>>();
@@ -4151,6 +4153,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
         Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
+        //计算里程和班次数，并放入Map里
+        map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
+
         Map<String, Object> maps;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
                 maps = new HashMap<String, Object>();
@@ -4179,27 +4196,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
         }
-        //计算里程和班次数，并放入Map里
-        map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
-        map.put("remMileage",culateMieageService.culateLbgl(lists));
-        map.put("addMileage", culateMieageService.culateLjgl(lists));
-        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
-        map.put("yygl", yygl);
-        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
-        map.put("ksgl",ksgl);
-        map.put("realMileage", Arith.add(yygl ,ksgl));
-        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
-        map.put("cjbc", culateMieageService.culateLbbc(lists));
-        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
-        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
-        map.put("sjbc", sjbc);
-
+      
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
         list.add(listMap.iterator());
         ee.excelReplace(list, new Object[]{map}, path + "mould/waybill_minhang.xls",
                 path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
-        return scheduleRealInfos;
+//        return scheduleRealInfos;
     }
     @Override
@@ -209,7 +209,7 @@
         </td>
         <td>
-            {{obj.jsy}}
+            {{obj.jsy}}/{{obj.name}}
         </td>
         <td>