潘钊 / bsth_control · Commits

Commit a1aa9da61dc3d6839512c7d525324bf5be20f68e

Authored by 廖磊
1 parent 3a74f934

车辆。充电量

Inline Side-by-side
Showing 17 changed files with 1028 additions and 415 deletions
src/main/java/com/bsth/controller/oil/CwjyController.java
  View file @a1aa9da
@@ -58,7 +58,7 @@ public class CwjyController extends BaseController<Cwjy, Integer>{ @@ -58,7 +58,7 @@ public class CwjyController extends BaseController<Cwjy, Integer>{
58 * @throws 58 * @throws
59 */ 59 */
60 @RequestMapping(value="/savejzl",method = RequestMethod.POST) 60 @RequestMapping(value="/savejzl",method = RequestMethod.POST)
61 - public Map<String, Object> savejzl(Map<String, Object> map){ 61 + public Map<String, Object> savejzl(@RequestParam Map<String, Object> map){
62 Map<String, Object> maps=new HashMap<>(); 62 Map<String, Object> maps=new HashMap<>();
63 try { 63 try {
64 maps = service.savejzl(map); 64 maps = service.savejzl(map);
src/main/java/com/bsth/controller/oil/DlbController.java
  View file @a1aa9da
1 package com.bsth.controller.oil; 1 package com.bsth.controller.oil;
2 2
  3 +import java.util.HashMap;
3 import java.util.List; 4 import java.util.List;
4 import java.util.Map; 5 import java.util.Map;
5 6
@@ -70,11 +71,17 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{ @@ -70,11 +71,17 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
70 List<String> list = Splitter.on(",").trimResults().splitToList(order); 71 List<String> list = Splitter.on(",").trimResults().splitToList(order);
71 return baseService.list(map, new PageRequest(page, size, new Sort(d, list))); 72 return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
72 } 73 }
  74 + @RequestMapping(value = "/dlbList",method = RequestMethod.GET)
  75 + public List<Dlb> dlbList(@RequestParam Map<String, Object> map){
  76 + List<Dlb> list=service.listDlb(map);
  77 + return list;
  78 + }
  79 +
  80 +
73 81
74 @RequestMapping(value = "/obtain",method = RequestMethod.GET) 82 @RequestMapping(value = "/obtain",method = RequestMethod.GET)
75 public Map<String, Object> obtain(@RequestParam Map<String, Object> map){ 83 public Map<String, Object> obtain(@RequestParam Map<String, Object> map){
76 Map<String, Object> list=service.obtain(map); 84 Map<String, Object> list=service.obtain(map);
77 - System.out.println();  
78 return list; 85 return list;
79 } 86 }
80 87
@@ -99,4 +106,22 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{ @@ -99,4 +106,22 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
99 Map<String, Object> list=service.checkDl(map); 106 Map<String, Object> list=service.checkDl(map);
100 return list; 107 return list;
101 } 108 }
  109 +
  110 + @RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
  111 + public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
  112 + Map<String, Object> list=service.sumYlb(map);
  113 + return list;
  114 + }
  115 +
  116 + @RequestMapping(value = "/saveDlbList",method = RequestMethod.POST)
  117 + public Map<String, Object> saveDlbList(@RequestParam Map<String, Object> map){
  118 + Map<String, Object> list=new HashMap<String, Object>();
  119 + try {
  120 + list = service.saveDlbList(map);
  121 + } catch (Exception e) {
  122 + // TODO Auto-generated catch block
  123 + e.printStackTrace();
  124 + }
  125 + return list;
  126 + }
102 } 127 }
src/main/java/com/bsth/data/BasicData.java
  View file @a1aa9da
@@ -68,6 +68,8 @@ public class BasicData implements CommandLineRunner { @@ -68,6 +68,8 @@ public class BasicData implements CommandLineRunner {
68 public static Map<String, Personnel> jsyMap; 68 public static Map<String, Personnel> jsyMap;
69 //售票员工号 和 personnel 对象映射 69 //售票员工号 和 personnel 对象映射
70 public static Map<String, Personnel> spyMap; 70 public static Map<String, Personnel> spyMap;
  71 + //所以员工和personnerl 对象映射
  72 + public static Map<String, Personnel> perMap;
71 //全量员工 工号和姓名对照 73 //全量员工 工号和姓名对照
72 public static Map<String, String> allPerson; 74 public static Map<String, String> allPerson;
73 75
@@ -310,7 +312,7 @@ public class BasicData implements CommandLineRunner { @@ -310,7 +312,7 @@ public class BasicData implements CommandLineRunner {
310 public void loadPersonnelInfo() { 312 public void loadPersonnelInfo() {
311 Iterator<Personnel> iterator = personnelRepository.findAll().iterator(); 313 Iterator<Personnel> iterator = personnelRepository.findAll().iterator();
312 314
313 - Map<String, Personnel> jsyTempMap = new HashMap<>(), spyTempMap = new HashMap<>(); 315 + Map<String, Personnel> jsyTempMap = new HashMap<>(), spyTempMap = new HashMap<>(),perTempMap=new HashMap<>();
314 Map<String, String> allPersonMap = new HashMap<>(); 316 Map<String, String> allPersonMap = new HashMap<>();
315 317
316 Personnel p; 318 Personnel p;
@@ -328,13 +330,15 @@ public class BasicData implements CommandLineRunner { @@ -328,13 +330,15 @@ public class BasicData implements CommandLineRunner {
328 else if (p.getPosts().equals("2")) 330 else if (p.getPosts().equals("2"))
329 spyTempMap.put(jobCode, p); 331 spyTempMap.put(jobCode, p);
330 } 332 }
331 - 333 +
  334 + perTempMap.put(jobCode, p);
332 allPersonMap.put(jobCode, p.getPersonnelName()); 335 allPersonMap.put(jobCode, p.getPersonnelName());
333 } 336 }
334 337
335 jsyMap = jsyTempMap; 338 jsyMap = jsyTempMap;
336 spyMap = spyTempMap; 339 spyMap = spyTempMap;
337 allPerson = allPersonMap; 340 allPerson = allPersonMap;
  341 + perMap = perTempMap;
338 } 342 }
339 } 343 }
340 } 344 }
src/main/java/com/bsth/entity/oil/Dlb.java
  View file @a1aa9da
@@ -55,7 +55,7 @@ public class Dlb { @@ -55,7 +55,7 @@ public class Dlb {
55 private Date edittime; 55 private Date edittime;
56 private Date createtime; 56 private Date createtime;
57 private int nylx; 57 private int nylx;
58 - //进场顺序（根据最先出场和最后进场来关联车辆的存油量） 58 + //进场顺序（根据最先出场和最后进场来关联车辆的存电量）
59 private int jcsx; 59 private int jcsx;
60 60
61 @Transient 61 @Transient
src/main/java/com/bsth/repository/oil/DlbRepository.java
  View file @a1aa9da
@@ -34,4 +34,72 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{ @@ -34,4 +34,72 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
34 @Query(value="SELECT * FROM bsth_c_dlb where to_days(?)=to_days(rq)",nativeQuery=true) 34 @Query(value="SELECT * FROM bsth_c_dlb where to_days(?)=to_days(rq)",nativeQuery=true)
35 List<Dlb> obtainDl(String rq); 35 List<Dlb> obtainDl(String rq);
36 36
  37 + @Query(value="select s from Dlb s "
  38 + + " where to_days(?1)=to_days(s.rq) "
  39 + + " and s.ssgsdm like %?2% "
  40 + + " and s.fgsdm like %?3%"
  41 + + " and s.xlbm like %?4% "
  42 + + " and s.nbbm in ?5 order by nbbm,jcsx")
  43 + List<Dlb> listDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
  44 +
  45 +
  46 + /**
  47 + *
  48 + * @param nbbm
  49 + * @param rq
  50 + * @param xlbm
  51 + * @return
  52 + */
  53 + @Transactional
  54 + @Modifying
  55 + @Query(value="select nbbm,count(nbbm) from bsth_c_dlb where to_days(?1)=to_days(rq) and "
  56 + + " ssgsdm like %?2% "
  57 + + " and fgsdm like %?3%"
  58 + + " and xlbm like %?4% and nbbm like %?5% "
  59 + + " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
  60 + List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
  61 +
  62 + @Transactional
  63 + @Modifying
  64 + @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 "
  65 + + " ssgsdm like %?2% "
  66 + + " and fgsdm like %?3%"
  67 + + " and xlbm like %?4% and nbbm like %?5% "
  68 + + " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
  69 + List<Object[]> checkNbmmDl(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
  70 +
  71 +
  72 +
  73 + @Query(value="select cdl,hd,sh from Dlb s "
  74 + + " where to_days(?1)=to_days(s.rq) "
  75 + + " and s.ssgsdm like %?2% "
  76 + + " and s.fgsdm like %?3%"
  77 + + " and s.xlbm like %?4% "
  78 + + " and s.nbbm in ?5 ")
  79 + List<Object[]> sumDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
  80 +
  81 + @Transactional
  82 + @Modifying
  83 + @Query(value="select ifnull(cdl,0),ifnull(hd,0),ifnull(sh,0) from bsth_c_dlb "
  84 + + " where to_days(?1)=to_days(rq) "
  85 + + " and ssgsdm like %?2% "
  86 + + " and fgsdm like %?3%"
  87 + + " and xlbm like %?4% "
  88 + + " and nbbm like %?5%",nativeQuery=true)
  89 + List<Object[]> sumDlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
  90 +
  91 +
  92 + @Transactional
  93 + @Modifying
  94 + @Query(value="UPDATE bsth_c_dlb SET " +
  95 + " czcd= ?2,"+
  96 + " jzcd = ?3, " +
  97 + " hd = ?4,"+
  98 + " sh = ?5," +
  99 + " shyy = ?6," +
  100 + " yhlx = ?7"+
  101 + " WHERE id = ?1", nativeQuery=true)
  102 + public void dlbUpdate(Integer id,double czcd,double jzcd,double hd, double sh,String shyy,int yhlx);
  103 +
  104 +
37 } 105 }
src/main/java/com/bsth/service/oil/DlbService.java
  View file @a1aa9da
1 package com.bsth.service.oil; 1 package com.bsth.service.oil;
2 2
  3 +import java.util.List;
3 import java.util.Map; 4 import java.util.Map;
4 5
5 import com.bsth.entity.oil.Dlb; 6 import com.bsth.entity.oil.Dlb;
@@ -11,4 +12,10 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{ @@ -11,4 +12,10 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
11 Map<String, Object> sort(Map<String, Object> map); 12 Map<String, Object> sort(Map<String, Object> map);
12 13
13 Map<String, Object> checkDl(Map<String, Object> map); 14 Map<String, Object> checkDl(Map<String, Object> map);
  15 +
  16 + List<Dlb> listDlb(Map<String, Object> map);
  17 +
  18 + Map<String, Object> sumYlb(Map<String, Object> map);
  19 +
  20 + Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception;
14 } 21 }
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
  View file @a1aa9da
@@ -227,6 +227,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw @@ -227,6 +227,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
227 String jsy=jsonObject.getString("jsy"); 227 String jsy=jsonObject.getString("jsy");
228 double jzl=jsonObject.getDoubleValue("jzl"); 228 double jzl=jsonObject.getDoubleValue("jzl");
229 String stationid=jsonObject.getString("stationid"); 229 String stationid=jsonObject.getString("stationid");
  230 + String nbbm=jsonObject.getString("nbbm");
230 int nylx=jsonObject.getIntValue("nylx"); 231 int nylx=jsonObject.getIntValue("nylx");
231 String jyggh=jsonObject.getString("jyggh"); 232 String jyggh=jsonObject.getString("jyggh");
232 String bz=jsonObject.getString("bz"); 233 String bz=jsonObject.getString("bz");
@@ -238,19 +239,25 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw @@ -238,19 +239,25 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
238 y.setStationid(stationid); 239 y.setStationid(stationid);
239 y.setJyggh(jyggh); 240 y.setJyggh(jyggh);
240 y.setBz(bz); 241 y.setBz(bz);
241 - y.setCreatetime(date); 242 + y.setCreatetime(new Date());
  243 + y.setYyrq(date);
242 ylxxbRepository.save(y); 244 ylxxbRepository.save(y);
243 }else{ 245 }else{
244 - y=new Ylxxb();  
245 - y.setGsdm(gsbm);  
246 - y.setJsy(jsy);  
247 - y.setJzl(jzl);  
248 - y.setStationid(stationid);  
249 - y.setJyggh(jyggh);  
250 - y.setBz(bz);  
251 - y.setCreatetime(date);  
252 - y.setJylx(1);  
253 - ylxxbRepository.save(y); 246 + if(jsy!="" && jzl>0){
  247 + y=new Ylxxb();
  248 + y.setGsdm(gsbm);
  249 + y.setJsy(jsy);
  250 + y.setNbbm(nbbm);
  251 + y.setJzl(jzl);
  252 + y.setStationid(stationid);
  253 + y.setJyggh(jyggh);
  254 + y.setBz(bz);
  255 + y.setCreatetime(new Date());
  256 + y.setYyrq(date);
  257 + y.setJylx(1);
  258 + y.setNylx(0);
  259 + ylxxbRepository.save(y);
  260 + }
254 } 261 }
255 } 262 }
256 map.put("status", ResponseCode.SUCCESS); 263 map.put("status", ResponseCode.SUCCESS);
@@ -297,7 +304,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw @@ -297,7 +304,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
297 t.setNylx(rs.getInt("nylx")); 304 t.setNylx(rs.getInt("nylx"));
298 t.setYj(rs.getDouble("yj")); 305 t.setYj(rs.getDouble("yj"));
299 t.setBz(rs.getString("bz")); 306 t.setBz(rs.getString("bz"));
300 - t.setJsy(rs.getString("ldgh")); 307 + t.setLdgh(rs.getString("ldgh"));
301 return t; 308 return t;
302 } 309 }
303 }); 310 });
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
  View file @a1aa9da
@@ -14,6 +14,7 @@ import java.util.Map; @@ -14,6 +14,7 @@ import java.util.Map;
14 14
15 import javax.transaction.Transactional; 15 import javax.transaction.Transactional;
16 16
  17 +import org.apache.commons.lang3.StringEscapeUtils;
17 import org.slf4j.Logger; 18 import org.slf4j.Logger;
18 import org.slf4j.LoggerFactory; 19 import org.slf4j.LoggerFactory;
19 import org.springframework.beans.factory.annotation.Autowired; 20 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,8 @@ import org.springframework.data.domain.Sort.Direction; @@ -22,6 +23,8 @@ import org.springframework.data.domain.Sort.Direction;
22 import org.springframework.jdbc.core.JdbcTemplate; 23 import org.springframework.jdbc.core.JdbcTemplate;
23 import org.springframework.stereotype.Service; 24 import org.springframework.stereotype.Service;
24 25
  26 +import com.alibaba.fastjson.JSONArray;
  27 +import com.alibaba.fastjson.JSONObject;
25 import com.bsth.common.ResponseCode; 28 import com.bsth.common.ResponseCode;
26 import com.bsth.entity.Cars; 29 import com.bsth.entity.Cars;
27 import com.bsth.entity.oil.Cdl; 30 import com.bsth.entity.oil.Cdl;
@@ -41,6 +44,7 @@ import com.bsth.repository.oil.YlxxbRepository; @@ -41,6 +44,7 @@ import com.bsth.repository.oil.YlxxbRepository;
41 import com.bsth.service.impl.BaseServiceImpl; 44 import com.bsth.service.impl.BaseServiceImpl;
42 import com.bsth.service.oil.DlbService; 45 import com.bsth.service.oil.DlbService;
43 import com.bsth.service.realcontrol.ScheduleRealInfoService; 46 import com.bsth.service.realcontrol.ScheduleRealInfoService;
  47 +import com.bsth.util.Arith;
44 48
45 @Service 49 @Service
46 public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{ 50 public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{
@@ -129,6 +133,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -129,6 +133,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
129 } 133 }
130 try { 134 try {
131 //当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量 135 //当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
  136 + Double jzl=0.0;
132 if(map.get("seqNumber").toString().equals("1")){ 137 if(map.get("seqNumber").toString().equals("1")){
133 boolean fage=true; 138 boolean fage=true;
134 for (int i = 0; i < dlListBe.size(); i++) { 139 for (int i = 0; i < dlListBe.size(); i++) {
@@ -143,7 +148,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -143,7 +148,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
143 for (int y = 0; y < cdyList.size(); y++) { 148 for (int y = 0; y < cdyList.size(); y++) {
144 Cdl cdl=cdyList.get(y); 149 Cdl cdl=cdyList.get(y);
145 if(map.get("clZbh").toString().equals(cdl.getNbbm())){ 150 if(map.get("clZbh").toString().equals(cdl.getNbbm())){
146 - t.setCzcd(cdl.getClcd()); 151 + t.setCzcd(cdl.getClcd()==null?0:cdl.getClcd());
147 fage=false; 152 fage=false;
148 break; 153 break;
149 } 154 }
@@ -152,9 +157,17 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -152,9 +157,17 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
152 if(fage){ 157 if(fage){
153 t.setCzcd(0.0); 158 t.setCzcd(0.0);
154 } 159 }
  160 +
  161 + //手动导入没有驾驶员工号
  162 + for (int i = 0; i < jdlList.size(); i++) {
  163 + Jdl jdl=jdlList.get(i);
  164 + if(map.get("clZbh").toString().equals(jdl.getNbbm()) ){
  165 + jzl+=jdl.getJdl();
  166 + }
  167 + }
155 } 168 }
156 169
157 - Double jzl=0.0; 170 +
158 //把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断） 171 //把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
159 for(int j=0;j<ylxxList.size();j++){ 172 for(int j=0;j<ylxxList.size();j++){
160 Ylxxb ylxxb= ylxxList.get(j); 173 Ylxxb ylxxb= ylxxList.get(j);
@@ -163,24 +176,22 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -163,24 +176,22 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
163 } 176 }
164 } 177 }
165 178
166 - //手动导入没有驾驶员工号  
167 - for (int i = 0; i < jdlList.size(); i++) {  
168 - Jdl jdl=jdlList.get(i);  
169 - if(map.get("clZbh").toString().equals(jdl.getNbbm()) ){  
170 - jzl+=jdl.getJdl();  
171 - }  
172 - }  
173 t.setCdl(jzl); 179 t.setCdl(jzl);
174 - t.setJzcd(t.getCzcd()); 180 + if(type.equals("add")){
  181 + t.setHd(jzl);
  182 + t.setJzcd(t.getCzcd());
  183 + }
  184 +
175 t.setNbbm(map.get("clZbh").toString()); 185 t.setNbbm(map.get("clZbh").toString());
176 t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString()); 186 t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
177 t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString())))); 187 t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
178 t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString()); 188 t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
179 - t.setHd(jzl);  
180 t.setJcsx(Integer.parseInt(map.get("seqNumber").toString())); 189 t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
181 t.setSsgsdm(map.get("company")==null?"":map.get("company").toString()); 190 t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
182 t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString()); 191 t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
  192 + t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
183 t.setRq(sdf.parse(rq)); 193 t.setRq(sdf.parse(rq));
  194 + t.setCreatetime(new Date());
184 /*if(type.equals("add")){ 195 /*if(type.equals("add")){
185 addList.add(t); 196 addList.add(t);
186 }else{ 197 }else{
@@ -314,4 +325,224 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -314,4 +325,224 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
314 325
315 return newMap; 326 return newMap;
316 } 327 }
  328 +
  329 + @Override
  330 + public List<Dlb> listDlb(Map<String, Object> map) {
  331 + // TODO Auto-generated method stub
  332 + List<Dlb> listDlb=new ArrayList<Dlb>();
  333 + List<String> stringList=new ArrayList<String>();
  334 + String rq=map.get("rq").toString();
  335 + String gsbm=map.get("ssgsdm_like").toString();
  336 + String fgsbm=map.get("fgsdm_like").toString();
  337 + String xlbm=map.get("xlbm_like").toString().trim();
  338 + String nbbm=map.get("nbbm_eq").toString();
  339 + String sxtj=map.get("sxtj").toString();
  340 +
  341 + if(nbbm.trim()!=""){
  342 + stringList.add(nbbm);
  343 + listDlb=repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
  344 + }else{
  345 + //全部
  346 + if(sxtj.equals("0")){
  347 + List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
  348 + for (int i = 0; i < objectLists.size(); i++) {
  349 + String clbm=objectLists.get(i)[0].toString();
  350 + stringList.add(clbm);
  351 + }
  352 + if(stringList.size()>0){
  353 + listDlb=repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
  354 + }
  355 + }else{
  356 + List<Object[]> objectLists;
  357 + if(sxtj.equals("3")){
  358 + //有加油没里程
  359 + objectLists=repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
  360 + for (int i = 0; i < objectLists.size(); i++) {
  361 + String clbm=objectLists.get(i)[0].toString();
  362 + double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
  363 + double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
  364 + if(jzl>0 && zlc<=0){
  365 + stringList.add(clbm);
  366 + }
  367 +
  368 + }
  369 +
  370 + }else if(sxtj.equals("4")){
  371 + //有里程没加油
  372 + objectLists=repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
  373 + for (int i = 0; i < objectLists.size(); i++) {
  374 + String clbm=objectLists.get(i)[0].toString();
  375 + double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
  376 + double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
  377 + if(zlc>0 && jzl<=0){
  378 + stringList.add(clbm);
  379 + }
  380 +
  381 + }
  382 + }else{
  383 + objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
  384 + for (int i = 0; i < objectLists.size(); i++) {
  385 + String clbm=objectLists.get(i)[0].toString();
  386 + int cs=Integer.parseInt(objectLists.get(i)[1].toString());
  387 + //一车一单
  388 + if(sxtj.equals("1")){
  389 + if(cs==1){
  390 + stringList.add(clbm);
  391 + }
  392 + }
  393 + //一车多单
  394 + if(sxtj.equals("2")){
  395 + if(cs>1){
  396 + stringList.add(clbm);
  397 + }
  398 + }
  399 + }
  400 + }
  401 +
  402 + if(stringList.size()>0){
  403 + listDlb=repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
  404 + }
  405 + }
  406 + }
  407 +
  408 + return listDlb;
  409 + }
  410 +
  411 + @Override
  412 + public Map<String, Object> sumYlb(Map<String, Object> map) {
  413 + // TODO Auto-generated method stub
  414 + List<String> stringList = new ArrayList<String>();
  415 + String rq = map.get("rq").toString();
  416 + String gsbm = map.get("ssgsdm_like").toString();
  417 + String fgsbm = map.get("fgsdm_like").toString();
  418 + String xlbm = map.get("xlbm_like").toString().trim();
  419 + String nbbm = map.get("nbbm_eq").toString();
  420 + String sxtj = map.get("sxtj").toString();
  421 + if (nbbm.trim() != "") {
  422 + stringList.add(nbbm);
  423 + } else {
  424 + if (!sxtj.equals("0")) {
  425 + List<Object[]> objectLists;
  426 + if (sxtj.equals("3")) {
  427 + // 有加油没里程
  428 + objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
  429 + for (int i = 0; i < objectLists.size(); i++) {
  430 + String clbm = objectLists.get(i)[0].toString();
  431 + double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
  432 + double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
  433 + if (jzl > 0 && zlc <= 0) {
  434 + stringList.add(clbm);
  435 + }
  436 +
  437 + }
  438 +
  439 + } else if (sxtj.equals("4")) {
  440 + // 有里程没加油
  441 + objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
  442 + for (int i = 0; i < objectLists.size(); i++) {
  443 + String clbm = objectLists.get(i)[0].toString();
  444 + double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
  445 + double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
  446 + if (zlc > 0 && jzl <= 0) {
  447 + stringList.add(clbm);
  448 + }
  449 +
  450 + }
  451 + } else {
  452 + objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
  453 + for (int i = 0; i < objectLists.size(); i++) {
  454 + String clbm = objectLists.get(i)[0].toString();
  455 + int cs = Integer.parseInt(objectLists.get(i)[1].toString());
  456 + // 一车一单
  457 +
  458 + if (sxtj.equals("1")) {
  459 + if (cs == 1) {
  460 + stringList.add(clbm);
  461 + }
  462 + }
  463 + // 一车多单
  464 + if (sxtj.equals("2")) {
  465 + if (cs > 1) {
  466 + stringList.add(clbm);
  467 + }
  468 + }
  469 + }
  470 + }
  471 + }
  472 + }
  473 + List<Object[]> sumYlbList = new ArrayList<Object[]>();
  474 + if (sxtj.equals("0")) {
  475 + sumYlbList = repository.sumDlb2(rq, gsbm, fgsbm, xlbm, nbbm);
  476 + } else {
  477 + if (stringList.size() > 0) {
  478 +
  479 + // String strings[]=new String[stringList.size()];
  480 + // for(int i=0;i<stringList.size();i++){
  481 + // strings[i]=stringList.get(i);
  482 + // }
  483 + sumYlbList = repository.sumDlb(rq, gsbm, fgsbm, xlbm, stringList);
  484 + }
  485 +// else {
  486 +// sumYlbList = repository.sumDlb2(rq, gsbm, fgsbm, xlbm, nbbm);
  487 +// }
  488 + }
  489 + Double jzl = 0.0, yh = 0.0, sh = 0.0;
  490 + for (int i = 0; i < sumYlbList.size(); i++) {
  491 + jzl = Arith.add(jzl, Double.valueOf(sumYlbList.get(i)[0].toString()));
  492 + yh = Arith.add(yh, Double.valueOf(sumYlbList.get(i)[1].toString()));
  493 + sh = Arith.add(sh, Double.valueOf(sumYlbList.get(i)[2].toString()));
  494 + }
  495 +
  496 + Map<String, Object> sumMap = new HashMap<String, Object>();
  497 + sumMap.put("jzl", jzl);
  498 + sumMap.put("yh", yh);
  499 + sumMap.put("sh", sh);
  500 + return sumMap;
  501 + }
  502 +
  503 +
  504 + @Transactional
  505 + @Override
  506 + public Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception {
  507 + // TODO Auto-generated method stub
  508 + Map<String, Object> newMap=new HashMap<String,Object>();
  509 + try{
  510 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  511 + String json =StringEscapeUtils.unescapeHtml4(map.get("dlbList").toString());
  512 + JSONArray jsonArray=JSONArray.parseArray(json);
  513 + JSONObject jsonObject;
  514 + // 获取车辆存油信息
  515 +// List<Cyl> cylList = cylRepository.obtainCyl("","");
  516 + for (int i = 0; i < jsonArray.size(); i++) {
  517 +// Ylb t=new Ylb();
  518 + jsonObject=jsonArray.getJSONObject(i);
  519 + double czcd = jsonObject.getDoubleValue("czcd");
  520 + double cdl =jsonObject.getDoubleValue("cdl");
  521 + double jzcd =jsonObject.getDoubleValue("jzcd");
  522 + double sh =jsonObject.getDoubleValue("sh");
  523 + String shyy =jsonObject.getString("shyy");
  524 + double hd = jsonObject.getDoubleValue("hd");
  525 + int yhlx =jsonObject.getIntValue("yhlx");
  526 + Integer id =jsonObject.getInteger("id");
  527 +// String nbbm =jsonObject.getString("nbbm");
  528 +// String rq=jsonObject.getString("rq");
  529 + repository.dlbUpdate(id, czcd, jzcd, hd, sh, shyy, yhlx);
  530 + /*for (int z = 0; z < cylList.size(); z++) {
  531 + Cyl cyl = cylList.get(z);
  532 + if (nbbm.equals(cyl.getNbbm())) {
  533 + cyl.setCyl(jzyl);
  534 + cyl.setUpdatetime(sdf.parse(rq));
  535 + break;
  536 + }
  537 + cylRepository.save(cyl);
  538 + }*/
  539 + }
  540 + newMap.put("status", ResponseCode.SUCCESS);
  541 + }catch(Exception e){
  542 + newMap.put("status", ResponseCode.ERROR);
  543 + logger.error("save erro.", e);
  544 + throw e;
  545 + }
  546 + return newMap;
  547 + }
317 } 548 }
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @a1aa9da
@@ -831,22 +831,50 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -831,22 +831,50 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
831 stringList.add(nbbm); 831 stringList.add(nbbm);
832 }else{ 832 }else{
833 if(!sxtj.equals("0")){ 833 if(!sxtj.equals("0")){
834 - List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);  
835 - for (int i = 0; i < objectLists.size(); i++) {  
836 - String clbm=objectLists.get(i)[0].toString();  
837 - int cs=Integer.parseInt(objectLists.get(i)[1].toString());  
838 - //一车一单  
839 -  
840 - if(sxtj.equals("1")){  
841 - if(cs==1){ 834 + List<Object[]> objectLists;
  835 + if(sxtj.equals("3")){
  836 + //有加油没里程
  837 + objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
  838 + for (int i = 0; i < objectLists.size(); i++) {
  839 + String clbm=objectLists.get(i)[0].toString();
  840 + double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
  841 + double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
  842 + if(jzl>0 && zlc<=0){
842 stringList.add(clbm); 843 stringList.add(clbm);
843 } 844 }
  845 +
844 } 846 }
845 - //一车多单  
846 - if(sxtj.equals("2")){  
847 - if(cs>1){ 847 +
  848 + }else if(sxtj.equals("4")){
  849 + //有里程没加油
  850 + objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
  851 + for (int i = 0; i < objectLists.size(); i++) {
  852 + String clbm=objectLists.get(i)[0].toString();
  853 + double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
  854 + double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
  855 + if(zlc>0 && jzl<=0){
848 stringList.add(clbm); 856 stringList.add(clbm);
849 } 857 }
  858 +
  859 + }
  860 + }else{
  861 + objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
  862 + for (int i = 0; i < objectLists.size(); i++) {
  863 + String clbm=objectLists.get(i)[0].toString();
  864 + int cs=Integer.parseInt(objectLists.get(i)[1].toString());
  865 + //一车一单
  866 +
  867 + if(sxtj.equals("1")){
  868 + if(cs==1){
  869 + stringList.add(clbm);
  870 + }
  871 + }
  872 + //一车多单
  873 + if(sxtj.equals("2")){
  874 + if(cs>1){
  875 + stringList.add(clbm);
  876 + }
  877 + }
850 } 878 }
851 } 879 }
852 } 880 }
@@ -862,9 +890,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -862,9 +890,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
862 // strings[i]=stringList.get(i); 890 // strings[i]=stringList.get(i);
863 // } 891 // }
864 sumYlbList=repository.sumYlb(rq, gsbm, fgsbm, xlbm, stringList); 892 sumYlbList=repository.sumYlb(rq, gsbm, fgsbm, xlbm, stringList);
865 - }else{  
866 - sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm, nbbm);  
867 } 893 }
  894 +// else{
  895 +// sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm, nbbm);
  896 +// }
868 897
869 } 898 }
870 899
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @a1aa9da
@@ -3686,15 +3686,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3686,15 +3686,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3686 @Override 3686 @Override
3687 public Map<String, Object> findKMBCQp(String clZbh, String date, String line) { 3687 public Map<String, Object> findKMBCQp(String clZbh, String date, String line) {
3688 // TODO Auto-generated method stub 3688 // TODO Auto-generated method stub
3689 - List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill2(clZbh, date, line); 3689 + List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill2(clZbh, date, line);
3690 DecimalFormat format = new DecimalFormat("0.00"); 3690 DecimalFormat format = new DecimalFormat("0.00");
3691 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName); 3691 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
3692 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName); 3692 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
3693 - int jhbc = 0, cjbc = 0, ljbc = 0;  
3694 - double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0,ljjcclc=0;  
3695 - float addMileage = 0l, remMileage = 0l, addgl = 0, remgl = 0; 3693 + int jhbc = 0, cjbc = 0, ljbc = 0,sjbc=0;
  3694 + double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0,ljjcclc=0,jhjcclc=0;
  3695 + double addMileage = 0, remMileage = 0, addgl = 0, remgl = 0;
3696 Map<String, Object> map = new HashMap<String, Object>(); 3696 Map<String, Object> map = new HashMap<String, Object>();
3697 - for (ScheduleRealInfo scheduleRealInfo : list) { 3697 + /* for (ScheduleRealInfo scheduleRealInfo : list) {
3698 if (scheduleRealInfo != null) { 3698 if (scheduleRealInfo != null) {
3699 //计划里程（主任务过滤掉临加班次）， 3699 //计划里程（主任务过滤掉临加班次），
3700 //烂班里程（主任务烂班）， 3700 //烂班里程（主任务烂班），
@@ -3773,20 +3773,32 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3773,20 +3773,32 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3773 addgl += sj - jh; 3773 addgl += sj - jh;
3774 } 3774 }
3775 } 3775 }
3776 - }  
3777 - map.put("jhlc", format.format(jhlc + jcclc));  
3778 - map.put("yygljh", format.format(jhlc));  
3779 - map.put("ssgl", format.format(remMileage));  
3780 - map.put("ksgl", format.format(ksgl));  
3781 - map.put("yyglsj", format.format(yygl)); 3776 + }*/
  3777 + jhlc=culateMieageService.culateJhgl(lists);
  3778 + jcclc=culateMieageService.culateJccgl(lists);
  3779 + jhjcclc=culateMieageService.culateJhJccgl(lists);
  3780 + remMileage=culateMieageService.culateLbgl(lists);
  3781 + ksgl=culateMieageService.culateKsgl(lists);
  3782 + yygl=culateMieageService.culateSjgl(lists);
  3783 + jhbc=culateMieageService.culateJhbc(lists, "");
  3784 + addMileage=culateMieageService.culateLjgl(lists);
  3785 + cjbc=culateMieageService.culateLbbc(lists);
  3786 + sjbc=culateMieageService.culateSjbc(lists, "");
  3787 + ljbc=culateMieageService.culateLjbc(lists, "");
  3788 + double zyygl=Arith.add(yygl,addMileage);
  3789 + double zksgl=Arith.add(ksgl, jcclc);
  3790 + map.put("jhlc", Arith.add(jhlc , jhjcclc));
  3791 + map.put("yygljh", jhlc);
  3792 + map.put("ssgl", remMileage);
  3793 + map.put("ksgl", ksgl);
  3794 + map.put("yyglsj", Arith.add(yygl,addMileage));
  3795 + map.put("jcclc", jcclc);
3782 map.put("jhbc", jhbc); 3796 map.put("jhbc", jhbc);
3783 - map.put("jcclc", format.format(jcclc+ljjcclc));  
3784 -  
3785 - map.put("ljgl", format.format(addMileage)); 3797 + map.put("ljgl",addMileage);
3786 map.put("ssbc", cjbc); 3798 map.put("ssbc", cjbc);
3787 - map.put("ysgl", format.format(yygl));  
3788 - map.put("sjbc", jhbc - cjbc + ljbc);  
3789 - map.put("zgl", format.format(yygl + ksgl + jcclc+ljjcclc)); 3799 + map.put("ysgl", Arith.add(yygl,addMileage));
  3800 + map.put("sjbc",sjbc);
  3801 + map.put("zgl", Arith.add(zyygl, zksgl));
3790 map.put("ljbc", ljbc); 3802 map.put("ljbc", ljbc);
3791 3803
3792 return map; 3804 return map;
@@ -3881,11 +3893,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3881,11 +3893,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3881 String zdp = "", zwdp = "", wdp = ""; 3893 String zdp = "", zwdp = "", wdp = "";
3882 String zdpT = "", zwdpT = "", wdpT = ""; 3894 String zdpT = "", zwdpT = "", wdpT = "";
3883 3895
3884 - List<DutyEmployee> list = dutyEmployeeService.getDutyEmployee(xlbm, fcrq + "00:00", fcrq + "23:59"); 3896 + List<DutyEmployee> list = dutyEmployeeService.getDutyEmployee(xlbm, fcrq + "00:01", fcrq + "23:59");
3885 try { 3897 try {
3886 - Long fcsj1 = sdf.parse(fcrq + " 03:00").getTime(); 3898 + Long fcsj1 = sdf.parse(fcrq + " 00:01").getTime();
3887 Long fcsj2 = sdf.parse(fcrq + " 11:00").getTime(); 3899 Long fcsj2 = sdf.parse(fcrq + " 11:00").getTime();
3888 - Long fcsj3 = sdf.parse(fcrq + " 22:00").getTime(); 3900 + Long fcsj3 = sdf.parse(fcrq + " 23:59").getTime();
3889 for (int i = 0; i < list.size(); i++) { 3901 for (int i = 0; i < list.size(); i++) {
3890 DutyEmployee t = list.get(i); 3902 DutyEmployee t = list.get(i);
3891 Long ts = t.getTs(); 3903 Long ts = t.getTs();
src/main/java/com/bsth/service/report/CulateMileageService.java
  View file @a1aa9da
@@ -24,6 +24,8 @@ public interface CulateMileageService { @@ -24,6 +24,8 @@ public interface CulateMileageService {
24 double culateKsgl(List<ScheduleRealInfo> lists); 24 double culateKsgl(List<ScheduleRealInfo> lists);
25 double culateJccgl(List<ScheduleRealInfo> lists); 25 double culateJccgl(List<ScheduleRealInfo> lists);
26 26
  27 + double culateJhJccgl(List<ScheduleRealInfo> lists);
  28 +
27 double culateCJLC(List<ScheduleRealInfo> lists,String item); 29 double culateCJLC(List<ScheduleRealInfo> lists,String item);
28 30
29 int culateFzbc(List<ScheduleRealInfo> lists,String item); 31 int culateFzbc(List<ScheduleRealInfo> lists,String item);
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @a1aa9da
@@ -92,7 +92,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -92,7 +92,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
92 if (!isInOut(scheduleRealInfo)) { 92 if (!isInOut(scheduleRealInfo)) {
93 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks(); 93 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
94 if(childTaskPlans.isEmpty()){ 94 if(childTaskPlans.isEmpty()){
95 - if(scheduleRealInfo.getStatus() == -1){ 95 + if(scheduleRealInfo.isDestroy()){
96 zlblc=Arith.add(zlblc,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig()); 96 zlblc=Arith.add(zlblc,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
97 }else{ 97 }else{
98 double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc(); 98 double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
@@ -198,11 +198,14 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -198,11 +198,14 @@ public class CulateMileageServiceImpl implements CulateMileageService{
198 if(scheduleRealInfo.isSflj()){ 198 if(scheduleRealInfo.isSflj()){
199 ljgl=Arith.add(ljgl,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc()); 199 ljgl=Arith.add(ljgl,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
200 }else{ 200 }else{
201 - double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();  
202 - double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();  
203 - double zjlc=Arith.sub(jhlc, jhlcOrig);  
204 - if(zjlc>0){  
205 - ljgl=Arith.add(zjlc, ljgl); 201 + Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
  202 + if(!childTaskPlans.isEmpty()){
  203 + double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
  204 + double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
  205 + double zjlc=Arith.sub(jhlc, jhlcOrig);
  206 + if(zjlc>0){
  207 + ljgl=Arith.add(zjlc, ljgl);
  208 + }
206 } 209 }
207 } 210 }
208 } 211 }
@@ -309,9 +312,15 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -309,9 +312,15 @@ public class CulateMileageServiceImpl implements CulateMileageService{
309 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks(); 312 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
310 if(!scheduleRealInfo.isSflj()){ 313 if(!scheduleRealInfo.isSflj()){
311 if(childTaskPlans.isEmpty()){ 314 if(childTaskPlans.isEmpty()){
312 - if(scheduleRealInfo.getStatus() != -1){  
313 - double jggl=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();  
314 - sjgl=Arith.add(sjgl,jggl); 315 + if(!scheduleRealInfo.isDestroy()){
  316 + double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
  317 + double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
  318 + if(jhlc-jhlcOrig>0){
  319 + sjgl=Arith.add(sjgl,jhlcOrig);
  320 + }else{
  321 + sjgl=Arith.add(sjgl,jhlc);
  322 + }
  323 +
315 } 324 }
316 }else{ 325 }else{
317 Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); 326 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -457,7 +466,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -457,7 +466,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
457 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks(); 466 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
458 if(childTaskPlans.isEmpty()){ 467 if(childTaskPlans.isEmpty()){
459 if(!scheduleRealInfo.isDestroy()) 468 if(!scheduleRealInfo.isDestroy())
460 - jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig()); 469 + jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
461 }else{ 470 }else{
462 Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); 471 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
463 while (it.hasNext()) { 472 while (it.hasNext()) {
@@ -475,6 +484,27 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -475,6 +484,27 @@ public class CulateMileageServiceImpl implements CulateMileageService{
475 return jcclc; 484 return jcclc;
476 } 485 }
477 486
  487 + @Override
  488 + public double culateJhJccgl(List<ScheduleRealInfo> lists) {
  489 + // TODO Auto-generated method stub
  490 + double jcclc =0;
  491 + for (int i = 0; i < lists.size(); i++) {
  492 + ScheduleRealInfo scheduleRealInfo=lists.get(i);
  493 + if(!scheduleRealInfo.isSflj()){
  494 + if (scheduleRealInfo.getBcType().equals("in")
  495 + || scheduleRealInfo.getBcType().equals("out")) {
  496 + double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
  497 + if(jhlcOrig-scheduleRealInfo.getJhlc()>0){
  498 + jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
  499 + }else{
  500 + jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
  501 + }
  502 + }
  503 + }
  504 + }
  505 + return jcclc;
  506 + }
  507 +
478 public static boolean isInOut(ScheduleRealInfo s){ 508 public static boolean isInOut(ScheduleRealInfo s){
479 boolean fage=false; 509 boolean fage=false;
480 if(s.getBcType().equals("in")){ 510 if(s.getBcType().equals("in")){
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @a1aa9da
@@ -1397,30 +1397,28 @@ public class ReportServiceImpl implements ReportService{ @@ -1397,30 +1397,28 @@ public class ReportServiceImpl implements ReportService{
1397 List<Map<String, String>> list = new ArrayList<Map<String, String>>(); 1397 List<Map<String, String>> list = new ArrayList<Map<String, String>>();
1398 Map<String, String> map; 1398 Map<String, String> map;
1399 // Set<String> allSet = BasicData.nbbm2CompanyCodeMap.keySet(); 1399 // Set<String> allSet = BasicData.nbbm2CompanyCodeMap.keySet();
1400 - Set<String> allJsy = BasicData.jsyMap.keySet(); 1400 + Set<String> allJsy = BasicData.perMap.keySet();
1401 1401
1402 Personnel per; 1402 Personnel per;
1403 for (String k : allJsy) { 1403 for (String k : allJsy) {
1404 if (k.indexOf(jsy) != -1) { 1404 if (k.indexOf(jsy) != -1) {
1405 - // 所属线路  
1406 - boolean fage=true;  
1407 map = new HashMap<>(); 1405 map = new HashMap<>();
1408 - per = BasicData.jsyMap.get(k);  
1409 - String rygsdm= per.getCompanyCode();  
1410 -  
1411 - map.put("id", k);  
1412 - map.put("text", k+"/"+per.getPersonnelName());  
1413 -  
1414 - if(!gsbm.equals("")){  
1415 - if(!rygsdm.equals(gsbm)){  
1416 - fage=false;  
1417 - }  
1418 - }  
1419 -  
1420 - if(fage){  
1421 - list.add(map); 1406 + // 通过人员查找公司
  1407 + per = BasicData.perMap.get(k);
  1408 + String rygsdm="";
  1409 + if(null != per){
  1410 + if(per.getCompanyCode()!=null){
  1411 + rygsdm = per.getCompanyCode();
  1412 + }
  1413 + String jboCode=per.getJobCode().substring(per.getJobCode().indexOf("-")+1);
  1414 + map.put("id", jboCode);
  1415 + map.put("text", jboCode+"/"+per.getPersonnelName());
  1416 + if(!gsbm.equals("")){
  1417 + if(rygsdm.equals(gsbm)){
  1418 + list.add(map);
  1419 + }
  1420 + }
1422 } 1421 }
1423 -  
1424 } 1422 }
1425 1423
1426 if (list.size() > 20) 1424 if (list.size() > 20)
src/main/resources/static/pages/electricity/list/list.html
  View file @a1aa9da
@@ -10,30 +10,29 @@ @@ -10,30 +10,29 @@
10 <li><span class="active">进出场存电量</span></li> 10 <li><span class="active">进出场存电量</span></li>
11 </ul> 11 </ul>
12 12
13 -<div class="row" id="ll_dlb_list"> 13 +<div class="row" id="dl_oil_list">
14 <div class="col-md-12"> 14 <div class="col-md-12">
15 <!-- Begin: life time stats --> 15 <!-- Begin: life time stats -->
16 <div class="portlet light portlet-fit portlet-datatable bordered"> 16 <div class="portlet light portlet-fit portlet-datatable bordered">
17 <div class="portlet-title"> 17 <div class="portlet-title">
18 <div class="caption"> 18 <div class="caption">
19 - <i class="fa fa-battery-quarter"></i> <span 19 + <i class="fa fa-fire-extinguisher"></i> <span
20 class="caption-subject font-dark sbold uppercase">进出场存电量表</span> 20 class="caption-subject font-dark sbold uppercase">进出场存电量表</span>
21 </div> 21 </div>
22 <div class="actions"> 22 <div class="actions">
23 - <!-- <button type="button" class="btn btn-circle blue" id="removeButton"><i class="fa fa-trash-o"></i> 删除</button> -->  
24 - <button type="button" class="btn btn-circle blue" id="sortButton"><i class="fa fa-minus-square"></i>  
25 - 保存 23 + <button type="button" class="btn btn-circle blue" id="saveButton"><i class="fa fa-minus-square"></i>
  24 + 保存
26 </button> 25 </button>
27 <button type="button" class="btn btn-circle blue" id="obtain"><i class="fa fa-hourglass-half"></i> 26 <button type="button" class="btn btn-circle blue" id="obtain"><i class="fa fa-hourglass-half"></i>
28 - 获取加/存电信息 27 + 获取加/存电信息
29 </button> 28 </button>
30 <button type="button" class="btn btn-circle blue" id="checkDl"><i class="fa fa-gg-circle"></i> 29 <button type="button" class="btn btn-circle blue" id="checkDl"><i class="fa fa-gg-circle"></i>
31 - 核对加注量（有加电无里程） 30 + 核对加注量（有加电无里程）
32 </button> 31 </button>
33 - <!-- <button type="button" class="btn btn-circle blue" id="export"><i class="fa fa-file-excel-o"></i>  
34 - 导出Excel  
35 - </button> -->  
36 - <!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> --> 32 + <button class="btn btn-circle blue"
  33 + id="export"> <i class="fa fa-file-excel-o"></i>
  34 + 导出Excel
  35 + </button>
37 </div> 36 </div>
38 </div> 37 </div>
39 <div class="portlet-body"> 38 <div class="portlet-body">
@@ -41,72 +40,120 @@ @@ -41,72 +40,120 @@
41 <table 40 <table
42 class="table table-striped table-bordered table-hover table-checkable" 41 class="table table-striped table-bordered table-hover table-checkable"
43 id="datatable_dlb"> 42 id="datatable_dlb">
44 - <thead> 43 + <thead >
45 <tr role="row" class="filter"> 44 <tr role="row" class="filter">
46 - <td> 公司:</td>  
47 - <td colspan="2">  
48 -  
49 - <select class="form-control" name="ssgsdm_like" id="ylbListGsdmId" ></select>  
50 -  
51 - </td>  
52 - <td>  
53 - 分公司:  
54 - </td>  
55 - <td colspan="2">  
56 -  
57 - <select class="form-control" name="fgsdm_like" id="ylbListFgsdmId" ></select>  
58 - </td>  
59 -  
60 - <td>  
61 - 日期:  
62 - </td>  
63 - <td>  
64 - <input type="text" style="width: 80px" name="rq" id="rq"/>  
65 - </td>  
66 - <td >  
67 - 线路:  
68 - </td>  
69 - <td colspan="2">  
70 - <select class="form-control" name="xlbm_eq" id="xlbm" style="width: 120px;"></select>  
71 - &nbsp;  
72 - </td>  
73 - <td >  
74 - 内部编码:  
75 - </td>  
76 - <td colspan="2">  
77 - <select class="form-control" name="nbbm_eq" id="nbbm" style="width: 120px;"></select>  
78 - </td>  
79 - <td colspan="4">  
80 - <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">  
81 - <i class="fa fa-search"></i> 搜索  
82 - </button> 45 + <td colspan="2">
  46 + <div style="float: right; " >&nbsp;公司</div>
  47 + </td>
  48 + <td colspan="3">
  49 + <div style="float: left;width: 150px">
  50 + <select class="form-control" name="ssgsdm_like"
  51 + id="ylbListGsdmId"></select>
  52 + </div>
  53 + </td>
  54 + <td colspan="2">
  55 + <div style="float: right; " >&nbsp;分公司</div>
  56 + </td>
  57 + <td colspan="3">
  58 + <div style="float: left;">
  59 + <select class="form-control" name="fgsdm_like"
  60 + id="ylbListFgsdmId" style="width: 150px"></select>
  61 + </div>
  62 + </td>
  63 + <td >
  64 + <div style="float: right; ">日期</div>
  65 + </td>
  66 + <td colspan="2">
  67 + <div style="float: left;">
  68 + <input type="text" style="width: 120px" name="rq" id="rq" />
  69 + </div>
  70 + </td>
  71 + <td rowspan="2" colspan="2">
  72 + <div style="float: left;">
  73 + &nbsp;<button
  74 + class="btn btn-sm green btn-outline filter-submit margin-bottom"
  75 + style="margin-right: 0px">
  76 + <i class="fa fa-search"></i> 搜索
  77 + </button> <!-- <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px"> -->
  78 + <!-- <i class="fa fa-times"></i> 重置 -->
  79 + <!-- </button> -->
83 80
84 - <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px">  
85 - <i class="fa fa-times"></i> 重置  
86 - </button>  
87 -  
88 - </td> 81 + </div>
  82 + </td>
89 </tr> 83 </tr>
  84 + <tr class="filter2">
  85 + <td colspan="2">
  86 + <div style="float: right; ">&nbsp;线路</div>
  87 + </td>
  88 + <td colspan="3">
  89 + <div style="float: left;">
  90 + <select class="form-control" name="xlbm_like" id="xlbm"
  91 + style="width: 150px;"></select>
  92 + </div>
  93 + </td>
  94 + <td colspan="2">
  95 + <div style="float: right;">&nbsp;内部编码</div>
  96 + </td>
  97 + <td colspan="3">
  98 + <div style="float: left;">
  99 + <select class="form-control" name="nbbm_eq" id="nbbm"
  100 + style="width: 120px;"></select>
  101 + </div>
  102 + <div style="float: left;">
  103 + <button class="btn btn-sm #000 btn-outline filter-cancel"
  104 + style="margin-right: 0px">
  105 + <i class="fa fa-times"></i>
  106 + </button>
  107 + </div>
  108 + </td>
  109 + <td >
  110 + <div style="float: right;">
  111 + 类型
  112 + </div>
  113 + </td>
  114 + <td colspan="2">
  115 + <div style="float: left;">
  116 + <select class="form-control" name="sxtj">
  117 + <option value="0">全部</option>
  118 + <option value="1">一车一单</option>
  119 + <option value="2">一车多单</option>
  120 + <option value="3">有充电没里程</option>
  121 + <option value="4">有里程没充电</option>
  122 + </select>
  123 + </div>
  124 +
  125 + </td>
  126 + </tr>
  127 + <tr>
  128 + <td colspan="17">
  129 + <div style="float: left;">
  130 + 总计
  131 + &nbsp;&nbsp;
  132 + 充电量:&nbsp;<label id="sumJzl"></label>
  133 + &nbsp;&nbsp;
  134 + 耗电量:&nbsp;<label id="sumYh"></label>
  135 + &nbsp;&nbsp;
  136 + 损耗电量:&nbsp;<label id="sumSh"></label>
  137 + </div>
  138 + </td>
  139 + </tr>
90 <tr role="row" class="heading"> 140 <tr role="row" class="heading">
91 <th width="2%">#</th> 141 <th width="2%">#</th>
92 - <th width="9%">日期</th>  
93 - <th width="6%">公司</th>  
94 - <th width="9%">线路</th>  
95 - <th width="6%">自编号</th>  
96 - <th width="7%">驾驶员</th> 142 + <th width="8%">日期</th>
  143 + <th width="5%">公司</th>
  144 + <th width="8%">线路</th>
  145 + <th width="5%">自编号</th>
  146 + <th width="6%">驾驶员</th>
97 <th width="4%">充电量</th> 147 <th width="4%">充电量</th>
98 - <th width="5%">出场公里</th>  
99 - <th width="4%">进场公里</th>  
100 - <th width="4%">出场存电</th>  
101 - <th width="4%">进场存电</th> 148 + <th width="6%">出场存电</th>
  149 + <th width="6%">进场存电</th>
102 <th width="5%">耗电</th> 150 <th width="5%">耗电</th>
103 - <th width="4%">尿素</th>  
104 <th width="5%">耗损原因</th> 151 <th width="5%">耗损原因</th>
105 - <th width="5%">耗损电量</th>  
106 - <th width="5%">当日总里程</th>  
107 - <th width="5%">数据类型</th>  
108 - <th width="5%">百公里电耗</th>  
109 - <!-- <th width="5%">操作</th> --> 152 + <th width="4%">耗损电量</th>
  153 + <th width="4%">当日总里程</th>
  154 + <th width="4%">数据类型</th>
  155 + <th width="4%">百公里电耗</th>
  156 +<!-- <th width="5%">操作</th> -->
110 </tr> 157 </tr>
111 </thead> 158 </thead>
112 <tbody></tbody> 159 <tbody></tbody>
@@ -124,9 +171,8 @@ @@ -124,9 +171,8 @@
124 {{each list as obj i}} 171 {{each list as obj i}}
125 <tr> 172 <tr>
126 <td style="vertical-align: middle;"> 173 <td style="vertical-align: middle;">
127 - <input type="radio" name="id" class="group-checkable icheck" data-id="{{obj.id}}"> 174 + <input type="checkbox" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
128 </td> 175 </td>
129 -  
130 <td> 176 <td>
131 {{obj.rq}} 177 {{obj.rq}}
132 </td> 178 </td>
@@ -137,160 +183,248 @@ @@ -137,160 +183,248 @@
137 {{obj.xlname}} 183 {{obj.xlname}}
138 </td> 184 </td>
139 <td> 185 <td>
140 - {{obj.nbbm}} 186 + <lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>
  187 +
141 </td> 188 </td>
142 <td> 189 <td>
143 {{obj.jsy}} 190 {{obj.jsy}}
144 </td> 191 </td>
145 <td> 192 <td>
146 - {{obj.cdl}}  
147 - </td>  
148 - <td>  
149 - {{obj.czlc}}  
150 - </td>  
151 - <td>  
152 - {{obj.jzlc}}  
153 - </td>  
154 - <td>  
155 - {{obj.czcd}} 193 +
  194 + <lable data-id="{{obj.id}}" class="in_carpark_cdl"> {{obj.cdl}}</lable>
156 </td> 195 </td>
157 <td> 196 <td>
158 - <a data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzdl">  
159 - {{obj.jzcd}}  
160 - </a>  
161 - % 197 +
  198 + <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_czcd"
  199 + type="text" value=" {{obj.czcd}}" style=" width:40px;float:left"
  200 +onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  201 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
  202 + <lable style="float:left">%<lable>
162 </td> 203 </td>
163 <td> 204 <td>
164 -  
165 - <a data-id="{{obj.id}}" href="javascript:;" class="in_carpark_hdl">  
166 - {{obj.hd}}  
167 - </a> 205 + <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzcd"
  206 + type="text" value=" {{obj.jzcd}}" style=" width:40px;float:left"
  207 +onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  208 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
  209 + <lable style="float:left">%<lable>
168 </td> 210 </td>
169 <td> 211 <td>
170 - {{obj.ns}} 212 +<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_hd"
  213 + type="text" value=" {{obj.hd}}" style=" width:45px;float:left"
  214 +onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  215 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
171 </td> 216 </td>
172 <td> 217 <td>
173 - {{obj.shyy}} 218 + <select data-id="{{obj.id}}" class="in_carpark_shyy" style=" width:80px">
  219 + <option value='0' {{if obj.shyy==0}} selected = 'selected' {{/if}}>请选择</option>
  220 + <option value='1' {{if obj.shyy==1}} selected = 'selected' {{/if}}>票务用电</option>
  221 + <option value='2' {{if obj.shyy==2}} selected = 'selected' {{/if}}>保养用电</option>
  222 + <option value='3' {{if obj.shyy==3}} selected = 'selected' {{/if}}>报废车用电</option>
  223 + <option value='4' {{if obj.shyy==4}} selected = 'selected' {{/if}}>其它用电</option>
  224 + <option value='5' {{if obj.shyy==5}} selected = 'selected' {{/if}}>人保部</option>
  225 + <option value='6' {{if obj.shyy==6}} selected = 'selected' {{/if}}>车队</option>
  226 + <option value='7' {{if obj.shyy==7}} selected = 'selected' {{/if}}>车间(高保)</option>
  227 + <option value='8' {{if obj.shyy==8}} selected = 'selected' {{/if}}>车间(小修)</option>
  228 + </select>
174 </td> 229 </td>
175 <td> 230 <td>
176 - {{obj.sh}}  
177 - </td> 231 + <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl"
  232 + value={{obj.sh}} style=" width:40px" type="text"
  233 +onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  234 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
  235 +
  236 +</td>
178 <td> 237 <td>
179 {{obj.zlc}} 238 {{obj.zlc}}
180 </td> 239 </td>
181 <td> 240 <td>
182 - {{obj.yhlx}} 241 + <select data-id="{{obj.id}}" class="in_carpark_yhlx">
  242 + <option value='0' {{if obj.yhlx==0}} selected = 'selected' {{/if}}>手录</option>
  243 + <option value='1' {{if obj.yhlx==1}} selected = 'selected' {{/if}}>拆分</option>
  244 + </select>
183 </td> 245 </td>
184 <td> 246 <td>
185 {{obj.bglyh}} 247 {{obj.bglyh}}
186 </td> 248 </td>
187 -  
188 </tr> 249 </tr>
189 {{/each}} 250 {{/each}}
190 {{if list.length == 0}} 251 {{if list.length == 0}}
191 <tr> 252 <tr>
192 - <td colspan=19><h6 class="muted">没有找到相关数据</h6></td> 253 + <td colspan=15><h6 class="muted">没有找到相关数据</h6></td>
193 </tr> 254 </tr>
194 {{/if}} 255 {{/if}}
195 </script> 256 </script>
196 257
197 <script> 258 <script>
198 $(function () { 259 $(function () {
  260 + var fage=false;
199 //var id = 15; 261 //var id = 15;
200 - //$('.in_carpark_jzdl[data-id='+id+']', '#ll_dlb_list') 262 + //$('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list')
201 263
202 - $("#checkDl").on('click', function () { 264 + $("#checkYl").on('click', function () {
203 if ($("#rq").val() != "") { 265 if ($("#rq").val() != "") {
204 - var cells = $('tr.filter')[0].cells  
205 - , params = {}  
206 - , name;  
207 - $.each(cells, function (i, cell) {  
208 - var items = $('input,select', cell);  
209 - for (var j = 0, item; item = items[j++];) {  
210 - name = $(item).attr('name');  
211 - if (name) {  
212 - params[name] = $(item).val();  
213 - }  
214 - }  
215 - }); 266 + var params=getParamsList();
216 var i = layer.load(2); 267 var i = layer.load(2);
217 - $get('/dlb/checkDl', params, function () { 268 + $get('/ylb/checkYl', params, function () {
218 layer.close(i); 269 layer.close(i);
219 - var cells = $('tr.filter')[0].cells  
220 - , params1 = {}  
221 - , name;  
222 - $.each(cells, function (i, cell) {  
223 - var items = $('input,select', cell);  
224 - for (var j = 0, item; item = items[j++];) {  
225 - name = $(item).attr('name');  
226 - if (name) {  
227 - params1[name] = $(item).val();  
228 - }  
229 - }  
230 - });  
231 - jsDoQuery(params1, true); 270 + jsDoQuery(params, true);
232 }); 271 });
233 } else { 272 } else {
234 layer.msg('请选择日期.'); 273 layer.msg('请选择日期.');
235 } 274 }
236 }) 275 })
237 276
238 - //拆分 277 + //进场等于出场
  278 + $("#outAndIn").on('click', function () {
  279 + console.log("进场油量等于出场油量");
  280 + if ($("#rq").val() != "") {
  281 + var params=getParamsList();
  282 + var i = layer.load(2);
  283 + $get('/ylb/outAndIn', params, function () {
  284 + layer.close(i);
  285 + jsDoQuery(params, true);
  286 + });
  287 + } else {
  288 + layer.msg('请选择日期.');
  289 + }
  290 + });
  291 +
  292 +
  293 + //保存
  294 + $("#saveButton").on('click',function(){
  295 + var ylArray = [];
  296 + $('input.icheck').each(function(){
  297 + var map = {};
  298 + var id=$(this).data('id');
  299 + var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#dl_oil_list').html();
  300 + var cdl =$('.in_carpark_cdl[data-id='+id+']', '#dl_oil_list').html();
  301 + if(cdl=="" || cdl ==null){
  302 + cdl=0;
  303 + }
  304 + var czcd=$('.in_carpark_czcd[data-id='+id+']', '#dl_oil_list').val();
  305 + if(czcd=="" || czcd==null){
  306 + czcd=0;
  307 + }
  308 + var jzcd=$('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list').val();
  309 + if(jzcd=="" || jzcd==null){
  310 + jzcd=0;
  311 + }
  312 +
  313 + var sh = $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').val();
  314 + if(sh=="" || sh==null){
  315 + sh=0;
  316 + }
  317 +
  318 + var shyy = $('.in_carpark_shyy[data-id='+id+']', '#dl_oil_list').val();
  319 + var hd = $('.in_carpark_hd[data-id='+id+']', '#dl_oil_list').val();
  320 + if(hd=="" || hd==null){
  321 + hd=0;
  322 + }
  323 + var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#dl_oil_list').val();
  324 +
  325 + map['id']=id;
  326 + map['cdl']=cdl;
  327 + map['czcd']=czcd;
  328 + map['jzcd']=jzcd;
  329 + map['sh']=sh;
  330 + map['shyy']=shyy;
  331 + map['yhlx']=yhlx;
  332 + map['nbbm']=nbbm;
  333 + map['hd']=hd;
  334 + map['rq']=$("#rq").val();
  335 + ylArray.push(map);
  336 + })
  337 + var params = {};
  338 + params['dlbList']=JSON.stringify(ylArray);
  339 + var i = layer.load(2);
  340 + $post('/dlb/saveDlbList', params, function () {
  341 + layer.close(i);
  342 + var params1 =getParamsList();
  343 + jsDoQuery(params1, true);
  344 + });
  345 + })
  346 + //拆分
239 $("#sortButton").on('click', function () { 347 $("#sortButton").on('click', function () {
240 if ($("#rq").val() != "") { 348 if ($("#rq").val() != "") {
241 - var id = $('input.icheck:checked').data('id'); 349 + var ylArray = [];
  350 + var nbbm="";
  351 + var msg="";
  352 + $('input.icheck:checked').each(function(){
  353 + var map = {};
  354 + var id=$(this).data('id');
  355 + var clzbh =$('.in_carpark_nbbm[data-id='+id+']', '#dl_oil_list').html();
  356 + if(nbbm.indexOf(clzbh)>-1){
  357 + if(msg==""){
  358 + msg += clzbh;
  359 + }else{
  360 + msg += ","+clzbh;
  361 + }
  362 + }else{
  363 + nbbm +=clzbh;
  364 + var jzyl=$('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list').val();
  365 + var sh = $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').val();
  366 + var shyy = $('.in_carpark_shyy[data-id='+id+']', '#dl_oil_list').val();
  367 + var ns = $('.in_carpark_ns[data-id='+id+']', '#dl_oil_list').val();
  368 + var rylx= $('.in_carpark_rylx[data-id='+id+']', '#dl_oil_list').val();
  369 + map['id']=id;
  370 + map['jzyl']=jzyl;
  371 + map['sh']=sh;
  372 + map['shyy']=shyy;
  373 + map['ns']=ns;
  374 + map['rylx']=rylx;
  375 + ylArray.push(map);
  376 + }
  377 +
  378 + }) ;
  379 + if(msg!=""){
  380 + layer.msg('内部编码为:【'+msg +'】的车辆请选择一条数据进行拆分.');
  381 + }else{
  382 + var params = {};
  383 + params['ylbList']=JSON.stringify(ylArray);
  384 + var i = layer.load(2);
  385 + $post('/ylb/sort', params, function () {
  386 + layer.close(i);
  387 + var params1 =getParamsList();
  388 + jsDoQuery(params1, true);
  389 + });
  390 +
  391 + }
  392 +
  393 + /* var id = $('input.icheck:checked').data('id');
242 394
243 if (typeof(id) == 'undefined') { 395 if (typeof(id) == 'undefined') {
244 layer.msg("请选择一行进行拆分"); 396 layer.msg("请选择一行进行拆分");
245 } else { 397 } else {
246 //获取输入的进场存油 398 //获取输入的进场存油
247 - var jzdl = $('.in_carpark_jzdl[data-id='+id+']', '#ll_dlb_list').html();  
248 - var hdl= $('.in_carpark_hdl[data-id='+id+']', '#ll_dlb_list').html(); 399 + var jzyl = $('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list').html();
  400 + var sh = $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').html();
  401 + var shyy = $('.in_carpark_shyy[data-id='+id+']', '#dl_oil_list').val();
249 // $("#jzyl" + id).html(); 402 // $("#jzyl" + id).html();
250 var params = {}; 403 var params = {};
251 - params['jzdl'] = jzdl; 404 + params['jzyl'] = jzyl;
  405 + params['sh'] =sh;
  406 + params['shyy']=shyy;
252 params['id'] = id; 407 params['id'] = id;
253 - params['hdl']=hdl;  
254 var i = layer.load(2); 408 var i = layer.load(2);
255 - $get('/dlb/sort', params, function () { 409 + $get('/ylb/sort', params, function () {
256 layer.close(i); 410 layer.close(i);
257 - var cells = $('tr.filter')[0].cells  
258 - , params1 = {}  
259 - , name;  
260 - $.each(cells, function (i, cell) {  
261 - var items = $('input,select', cell);  
262 - for (var j = 0, item; item = items[j++];) {  
263 - name = $(item).attr('name');  
264 - if (name) {  
265 - params1[name] = $(item).val();  
266 - }  
267 - }  
268 - }); 411 + var params1 =getParamsList();
269 jsDoQuery(params1, true); 412 jsDoQuery(params1, true);
270 }); 413 });
271 414
272 - } 415 + } */
273 } else { 416 } else {
274 layer.msg('请选择日期.'); 417 layer.msg('请选择日期.');
275 } 418 }
276 }) 419 })
277 //获取加存信息 420 //获取加存信息
278 $("#obtain").on('click', function () { 421 $("#obtain").on('click', function () {
  422 + console.log("获取加存");
279 if ($("#rq").val() != "") { 423 if ($("#rq").val() != "") {
280 - var cells = $('tr.filter')[0].cells  
281 - , params = {}  
282 - , name;  
283 - $.each(cells, function (i, cell) {  
284 - var items = $('input,select', cell);  
285 - for (var j = 0, item; item = items[j++];) {  
286 - name = $(item).attr('name');  
287 - if (name) {  
288 - params[name] = $(item).val();  
289 - }  
290 - }  
291 - }); 424 + var params =getParamsList();
  425 +
292 var i = layer.load(2); 426 var i = layer.load(2);
293 - $get('/dlb/obtain', params, function (s) { 427 + $get('/dlb/obtain', params, function () {
294 layer.close(i); 428 layer.close(i);
295 jsDoQuery(params, true); 429 jsDoQuery(params, true);
296 }); 430 });
@@ -306,13 +440,13 @@ @@ -306,13 +440,13 @@
306 440
307 var page = 0, initPagination; 441 var page = 0, initPagination;
308 var icheckOptions = { 442 var icheckOptions = {
309 - radioClass: 'iradio_square-blue icheck', 443 + radioClass: 'icheckbox_flat-blue',
310 increaseArea: '20%' 444 increaseArea: '20%'
311 } 445 }
312 446
313 //重置 447 //重置
314 - $('tr.filter .filter-cancel').on('click', function () {  
315 - $('tr.filter input, select').val('').change(); 448 + $('tr.filter2 .filter-cancel').on('click', function () {
  449 + $('tr.filter2 , #nbbm').val('').change();
316 }); 450 });
317 451
318 //提交 452 //提交
@@ -324,38 +458,58 @@ @@ -324,38 +458,58 @@
324 }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){ 458 }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
325 layer.msg('请选择公司和分公司.'); 459 layer.msg('请选择公司和分公司.');
326 }else { 460 }else {
327 - var cells = $('tr.filter')[0].cells  
328 - , params = {}  
329 - , name;  
330 - $.each(cells, function (i, cell) {  
331 - var items = $('input,select', cell);  
332 - for (var j = 0, item; item = items[j++];) {  
333 - name = $(item).attr('name');  
334 - if (name) {  
335 - params[name] = $(item).val();  
336 - }  
337 - }  
338 - }); 461 + var params = getParamsList();
  462 +
  463 +
339 page = 0; 464 page = 0;
340 jsDoQuery(params, true); 465 jsDoQuery(params, true);
341 } 466 }
342 }); 467 });
343 468
  469 + function getParamsList(){
  470 + var cells = $('tr.filter')[0].cells
  471 + , cells1 = $('tr.filter2')[0].cells,params = {}
  472 + , name;
  473 + $.each(cells, function (i, cell) {
  474 + var items = $('input,select', cell);
  475 + for (var j = 0, item; item = items[j++];) {
  476 + name = $(item).attr('name');
  477 + if (name) {
  478 + params[name] = $(item).val();
  479 + }
  480 + }
  481 + });
  482 + $.each(cells1, function (i, cell) {
  483 + var items = $('input,select', cell);
  484 + for (var j = 0, item; item = items[j++];) {
  485 + name = $(item).attr('name');
  486 + if (name) {
  487 + params[name] = $(item).val();
  488 + }
  489 + }
  490 + });
  491 +
  492 + return params;
  493 + }
344 494
345 // var gsqxdm=""; 495 // var gsqxdm="";
346 496
347 -  
348 - $.get('/user/companyData', function(result){  
349 - obj = result;  
350 - var options="";  
351 -// = '<option value="">请选择</option>';  
352 - for(var i = 0; i < obj.length; i++){  
353 - options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';  
354 -// setFgsqx(obj[i].companyCode);  
355 - }  
356 - $('#ylbListGsdmId').html(options);  
357 - updateCompany();  
358 - }); 497 + var xlList;
  498 + var obj=[];
  499 + $.get('/report/lineList',function(result){
  500 + xlList=result;
  501 + $.get('/user/companyData', function(result){
  502 + obj = result;
  503 + var options="";
  504 + // = '<option value="">请选择</option>';
  505 + for(var i = 0; i < obj.length; i++){
  506 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  507 + // setFgsqx(obj[i].companyCode);
  508 + }
  509 + $('#ylbListGsdmId').html(options);
  510 + updateCompany();
  511 + });
  512 + })
359 /* function setFgsqx(gs){ 513 /* function setFgsqx(gs){
360 var company =gs 514 var company =gs
361 var options = ''; 515 var options = '';
@@ -382,6 +536,7 @@ @@ -382,6 +536,7 @@
382 } 536 }
383 } 537 }
384 $('#ylbListFgsdmId').html(options); 538 $('#ylbListFgsdmId').html(options);
  539 + initXl();
385 } 540 }
386 /* 541 /*
387 * 获取数据 p: 要提交的参数， pagination: 是否重新分页 542 * 获取数据 p: 要提交的参数， pagination: 是否重新分页
@@ -413,26 +568,31 @@ @@ -413,26 +568,31 @@
413 params['fgsdm_in']=fgsqx1; 568 params['fgsdm_in']=fgsqx1;
414 } 569 }
415 } */ 570 } */
416 - var i = layer.load(2);  
417 - $get('/dlb', params, function (data) {  
418 - $.each(data.content, function (i, obj) { 571 +
  572 + var l = layer.load(2);
  573 + $get('/dlb/dlbList', params, function (data) {
  574 +
  575 + $.each(data, function (i, obj) {
419 obj.rq = moment(obj.rq).format("YYYY-MM-DD"); 576 obj.rq = moment(obj.rq).format("YYYY-MM-DD");
420 }); 577 });
421 - var bodyHtm = template('dlb_list_temp', {list: data.content});  
422 -  
423 - $('#datatable_dlb tbody').html(bodyHtm) 578 + var bodyHtm = template('dlb_list_temp', {list:data});
  579 + $('#datatable_dlb tbody').html(bodyHtm);
  580 + /* $('#datatable_dlb tbody').html(bodyHtm)
424 .find('.icheck').iCheck(icheckOptions) 581 .find('.icheck').iCheck(icheckOptions)
425 .on('ifChanged', iCheckChange); 582 .on('ifChanged', iCheckChange);
426 if (pagination && data.content.length > 0) { 583 if (pagination && data.content.length > 0) {
427 //重新分页 584 //重新分页
428 initPagination = true; 585 initPagination = true;
429 showPagination(data); 586 showPagination(data);
430 - }  
431 - layer.close(i);  
432 -  
433 - startOptHdlLink($('#ll_dlb_list .in_carpark_hdl'));  
434 - startOptJzylLink($('#ll_dlb_list .in_carpark_jzdl'));  
435 - 587 + } */
  588 + layer.close(l);
  589 + $get('/dlb/sumYlb',params,function(returns){
  590 + $("#sumJzl").html(returns.jzl);
  591 + $("#sumYh").html(returns.yh);
  592 + $("#sumSh").html(returns.sh);
  593 + });
  594 +// startOptJzylLink($('#dl_oil_list .in_carpark_jzcd'));
  595 +// startOptShylLink($('#dl_oil_list .in_carpark_shyl'));
436 }); 596 });
437 } 597 }
438 598
@@ -450,8 +610,6 @@ @@ -450,8 +610,6 @@
450 return '只能为数字！'; 610 return '只能为数字！';
451 if (value < 0) 611 if (value < 0)
452 return '值不能小于0！'; 612 return '值不能小于0！';
453 - if (value > 100)  
454 - return '值不能大于100！';  
455 }, 613 },
456 inputclass: 'form-control input-medium input-edtable-sm' 614 inputclass: 'form-control input-medium input-edtable-sm'
457 }) 615 })
@@ -459,9 +617,10 @@ @@ -459,9 +617,10 @@
459 $(this).text(params.newValue); 617 $(this).text(params.newValue);
460 }); 618 });
461 } 619 }
462 -  
463 - function startOptHdlLink(es2) {  
464 - es2.editable({ 620 +
  621 + //改变状态
  622 + function startOptShylLink(es) {
  623 + es.editable({
465 type: 'text', 624 type: 'text',
466 placement: 'right', 625 placement: 'right',
467 width: 100, 626 width: 100,
@@ -480,7 +639,6 @@ @@ -480,7 +639,6 @@
480 $(this).text(params.newValue); 639 $(this).text(params.newValue);
481 }); 640 });
482 } 641 }
483 -  
484 function iCheckChange() { 642 function iCheckChange() {
485 var tr = $(this).parents('tr'); 643 var tr = $(this).parents('tr');
486 if (this.checked) 644 if (this.checked)
@@ -511,18 +669,7 @@ @@ -511,18 +669,7 @@
511 return; 669 return;
512 } 670 }
513 671
514 - var cells = $('tr.filter')[0].cells  
515 - , params = {}  
516 - , name;  
517 - $.each(cells, function (i, cell) {  
518 - var items = $('input,select', cell);  
519 - for (var j = 0, item; item = items[j++];) {  
520 - name = $(item).attr('name');  
521 - if (name) {  
522 - params[name] = $(item).val();  
523 - }  
524 - }  
525 - }); 672 + var params=getParamsList();
526 page = num - 1; 673 page = num - 1;
527 jsDoQuery(params, true); 674 jsDoQuery(params, true);
528 } 675 }
@@ -532,87 +679,132 @@ @@ -532,87 +679,132 @@
532 679
533 //删除 680 //删除
534 $('#removeButton').on('click', function () { 681 $('#removeButton').on('click', function () {
535 - if ($(this).attr('disabled'))  
536 - return;  
537 -  
538 - var id = $('input.icheck:checked').data('id');  
539 - removeConfirm('确定要删除选中的数据？', '/resource/' + id, function () {  
540 - $('tr.filter .filter-submit').click();  
541 - }); 682 + var idArray = [];
  683 + var x=0;
  684 + $('input.icheck:checked').each(function(){
  685 + x++;
  686 + var map ={};
  687 + var id=$(this).data('id');
  688 + map['id']=id;
  689 + idArray.push(map);
  690 +
  691 + })
  692 + var params = {};
  693 + params['ids']=JSON.stringify(idArray);
  694 + if (x==0) {
  695 + layer.msg("请选择要删除的数据");
  696 + }else{
  697 + if(confirm('确定要删除选中的数据？'))
  698 + {
  699 + var i = layer.load(2);
  700 + $post('/ylb/deleteIds', params, function (result) {
  701 + layer.close(i);
  702 + var params=getParamsList();
  703 + jsDoQuery(params, true);
  704 + });
  705 + }
  706 + }
542 }); 707 });
543 708
544 //搜索线路 709 //搜索线路
545 - $.get('/basic/lineCode2Name',function(result){ 710 + /* $.get('/basic/lineCode2Name',function(result){
546 var data=[]; 711 var data=[];
547 - 712 + data.push({id: " ", text: "全部线路"});
548 for(var code in result){ 713 for(var code in result){
549 data.push({id: code, text: result[code]}); 714 data.push({id: code, text: result[code]});
550 } 715 }
551 initPinYinSelect2('#xlbm',data,''); 716 initPinYinSelect2('#xlbm',data,'');
552 717
553 - })  
554 -  
555 - $('#nbbm').select2({  
556 - placeholder: '搜索车辆...',  
557 - ajax: {  
558 - url: '/realSchedule/sreachVehic',  
559 - dataType: 'json',  
560 - delay: 150,  
561 - data: function (params) {  
562 - return {nbbm: params.term}; 718 + }) */
  719 +
  720 +
  721 + $("#ylbListFgsdmId").on("change",initXl);
  722 + function initXl(){
  723 + var data=[];
  724 + data.push({id: " ", text: "全部线路"});
  725 + if(fage){
  726 + $("#xlbm").select2("destroy").html('');
  727 + }
  728 + var fgs=$('#ylbListFgsdmId').val();
  729 + var gs=$('#ylbListGsdmId').val();
  730 + for(var i=0;i<xlList.length;i++){
  731 + if(gs!=""){
  732 + if(fgs!=""){
  733 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  734 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  735 + }
  736 + }else{
  737 + if(xlList[i]["gsbm"]==gs){
  738 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  739 + }
  740 + }
  741 + }
  742 + }
  743 + initPinYinSelect2('#xlbm',data,'');
  744 + fage=true;
  745 + }
  746 +// $("#ylbListGsdmId").on("change",initNbbm);
  747 +// $("#ylbListFgsdmId").on("change",initNbbm);
  748 +// $("#xlbm").on("change",initNbbm);
  749 +// function initNbbm(){
  750 +// var gsbm=$('#ylbListGsdmId').val(),
  751 +// var fgsbm=$('#ylbListFgsdmId').val(),
  752 +// var xlbm=$('#xlbm').val();
  753 +
  754 + $('#nbbm').select2({
  755 + placeholder: '搜索车辆...',
  756 + ajax: {
  757 + url: '/report/carList',
  758 + dataType: 'json',
  759 + delay: 150,
  760 + data: function (params) {
  761 + return {nbbm: params.term,
  762 + gsbm:$('#ylbListGsdmId').val(),
  763 + fgsbm:$('#ylbListFgsdmId').val(),
  764 + xlbm:$('#xlbm').val()};
  765 + },
  766 + processResults: function (data) {
  767 + return {
  768 + results: data
  769 + };
  770 + },
  771 + cache: true
563 }, 772 },
564 - processResults: function (data) {  
565 - return {  
566 - results: data  
567 - }; 773 + templateResult: function (repo) {
  774 + if (repo.loading) return repo.text;
  775 + var h = '<span>' + repo.text + '</span>';
  776 + h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
  777 + return h;
568 }, 778 },
569 - cache: true  
570 - },  
571 - templateResult: function (repo) {  
572 - if (repo.loading) return repo.text;  
573 - var h = '<span>' + repo.text + '</span>';  
574 - h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');  
575 - return h;  
576 - },  
577 - escapeMarkup: function (markup) {  
578 - return markup;  
579 - },  
580 - minimumInputLength: 1,  
581 - templateSelection: function (repo) {  
582 - return repo.text;  
583 - },  
584 - language: {  
585 - noResults: function () {  
586 - return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>'; 779 + escapeMarkup: function (markup) {
  780 + return markup;
587 }, 781 },
588 - inputTooShort: function (e) {  
589 - return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>'; 782 + minimumInputLength: 1,
  783 + templateSelection: function (repo) {
  784 + return repo.text;
590 }, 785 },
591 - searching: function () {  
592 - return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>'; 786 + language: {
  787 + noResults: function () {
  788 + return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
  789 + },
  790 + inputTooShort: function (e) {
  791 + return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
  792 + },
  793 + searching: function () {
  794 + return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
  795 + }
593 } 796 }
594 - }  
595 - })  
596 - 797 + });
  798 +// }
  799 +
597 800
598 //导出 801 //导出
599 802
600 $("#export").on("click", function () { 803 $("#export").on("click", function () {
601 if ($("#rq").val() != "") { 804 if ($("#rq").val() != "") {
602 - var cells = $('tr.filter')[0].cells  
603 - , params = {}  
604 - , name;  
605 - $.each(cells, function (i, cell) {  
606 - var items = $('input,select', cell);  
607 - for (var j = 0, item; item = items[j++];) {  
608 - name = $(item).attr('name');  
609 - if (name) {  
610 - params[name] = $(item).val();  
611 - }  
612 - }  
613 - }); 805 + var params=getParamsList();
614 $post('/ylb/listExport', params, function (result) { 806 $post('/ylb/listExport', params, function (result) {
615 - window.open("/downloadFile/download?fileName=进出场存电量" + moment($("#rq").val()).format("YYYYMMDD")); 807 + window.open("/downloadFile/download?fileName="+$("#rq").val()+"进出场存油量" );
616 }); 808 });
617 } else { 809 } else {
618 layer.msg('请选择日期.'); 810 layer.msg('请选择日期.');
src/main/resources/static/pages/forms/statement/waybillQp.html
  View file @a1aa9da
@@ -324,7 +324,7 @@ @@ -324,7 +324,7 @@
324 <td>{{obj.zdsjActual}}</td> 324 <td>{{obj.zdsjActual}}</td>
325 <td>{{obj.fast}}</td> 325 <td>{{obj.fast}}</td>
326 <td>{{obj.slow}}</td> 326 <td>{{obj.slow}}</td>
327 - <td>{{obj.jhlc}}</td> 327 + <td>{{obj.jhlcOrig}}</td>
328 <td>{{obj.sjlc}}</td> 328 <td>{{obj.sjlc}}</td>
329 <td title="{{obj.remarks}}"> 329 <td title="{{obj.remarks}}">
330 {{if obj.remarks !=""}} 330 {{if obj.remarks !=""}}
src/main/resources/static/pages/oil/jyglList.html
  View file @a1aa9da
@@ -128,35 +128,35 @@ @@ -128,35 +128,35 @@
128 {{obj.nbbm}} 128 {{obj.nbbm}}
129 </td> 129 </td>
130 <td> 130 <td>
131 - <select class="form-control in_carpark_jsy" name="jsy" id="jsy{{obj.id}}" data-id="{{obj.id}}"> 131 + <select class="form-control in_carpark_jsy" style=" width:100px" name="jsy" id="{{obj.nbbm}}" data-id="{{obj.nbbm}}">
132 <option selected="selected" value="{{obj.jsy}}">{{obj.jsy}}<option> 132 <option selected="selected" value="{{obj.jsy}}">{{obj.jsy}}<option>
133 </select> 133 </select>
134 </td> 134 </td>
135 <td> 135 <td>
136 136
137 - <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzl" 137 + <input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_jzl"
138 type="text" value="{{obj.jzl}}" style=" width:45px" 138 type="text" value="{{obj.jzl}}" style=" width:45px"
139 onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" 139 onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
140 onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"> 140 onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
141 </td> 141 </td>
142 <td> 142 <td>
143 - <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_stationid" 143 + <input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_stationid"
144 type="text" value="{{obj.stationid}}" style=" width:45px" /> 144 type="text" value="{{obj.stationid}}" style=" width:45px" />
145 </td> 145 </td>
146 <td> 146 <td>
147 - <select data-id="{{obj.id}}" class="in_carpark_nylx" style=" width:80px" > 147 + <select data-id="{{obj.nbbm}}" class="in_carpark_nylx" style=" width:80px" >
148 <option value='0' {{if obj.nylx==0}} selected = 'selected' {{/if}}>0号柴油</option> 148 <option value='0' {{if obj.nylx==0}} selected = 'selected' {{/if}}>0号柴油</option>
149 <option value='1' {{if obj.nylx==1}} selected = 'selected' {{/if}}>负10号柴油</option> 149 <option value='1' {{if obj.nylx==1}} selected = 'selected' {{/if}}>负10号柴油</option>
150 </select> 150 </select>
151 </td> 151 </td>
152 <td> 152 <td>
153 - <input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jyggh" 153 + <input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_jyggh"
154 type="text" value="{{obj.jyggh}}" style=" width:45px" /> 154 type="text" value="{{obj.jyggh}}" style=" width:45px" />
155 </td> 155 </td>
156 <td></td> 156 <td></td>
157 <td>{{obj.ldgh}}</td> 157 <td>{{obj.ldgh}}</td>
158 <td> 158 <td>
159 -<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_bz" 159 +<input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_bz"
160 type="text" value="{{obj.bz}}" style=" width:45px" /> 160 type="text" value="{{obj.bz}}" style=" width:45px" />
161 </td> 161 </td>
162 <td> 162 <td>
@@ -199,8 +199,8 @@ $(function(){ @@ -199,8 +199,8 @@ $(function(){
199 params['gsbm']=$("#jyglListGsdmId").val(); 199 params['gsbm']=$("#jyglListGsdmId").val();
200 params['fgsbm']=$("#jyglListFgsdmId").val(); 200 params['fgsbm']=$("#jyglListFgsdmId").val();
201 params['rq']=$("#rq").val(); 201 params['rq']=$("#rq").val();
202 - console.log(params);  
203 var i = layer.load(2); 202 var i = layer.load(2);
  203 + console.log(params);
204 $post('/cwjy/savejzl', params, function(){ 204 $post('/cwjy/savejzl', params, function(){
205 layer.close(i); 205 layer.close(i);
206 var cells = $('tr.filter')[0].cells 206 var cells = $('tr.filter')[0].cells
@@ -343,6 +343,7 @@ $(function(){ @@ -343,6 +343,7 @@ $(function(){
343 console.log(data) 343 console.log(data)
344 var bodyHtm = template('jygl_list_temp', {list: data}); 344 var bodyHtm = template('jygl_list_temp', {list: data});
345 $('#datatable_cwjy tbody').html(bodyHtm); 345 $('#datatable_cwjy tbody').html(bodyHtm);
  346 + iCheckChange();
346 // .find('.icheck').iCheck(icheckOptions) 347 // .find('.icheck').iCheck(icheckOptions)
347 // .on('ifChanged', iCheckChange); 348 // .on('ifChanged', iCheckChange);
348 // if(pagination && data.dataList.length > 0){ 349 // if(pagination && data.dataList.length > 0){
@@ -362,6 +363,11 @@ $(function(){ @@ -362,6 +363,11 @@ $(function(){
362 else 363 else
363 tr.removeClass('row-active'); 364 tr.removeClass('row-active');
364 365
  366 +
  367 + $('input.icheck').each(function(){
  368 + var nbbm=$(this).data('id');
  369 + startOptJsy(nbbm);
  370 + })
365 // var id = $('input.icheck:checked').data('id'); 371 // var id = $('input.icheck:checked').data('id');
366 // $("#jsy"+id).attr("disabled", false); 372 // $("#jsy"+id).attr("disabled", false);
367 // startOptJsy(id); 373 // startOptJsy(id);
@@ -372,6 +378,48 @@ $(function(){ @@ -372,6 +378,48 @@ $(function(){
372 $('#removeButton').attr('disabled', 'disabled'); */ 378 $('#removeButton').attr('disabled', 'disabled'); */
373 } 379 }
374 380
  381 + //改变状态
  382 + function startOptJsy(id){
  383 + $('#'+id).select2({
  384 + placeholder: '搜索驾驶员...',
  385 + ajax: {
  386 + url: '/report/userList',
  387 + dataType: 'json',
  388 + delay: 150,
  389 + data: function(params){
  390 + return{jsy: params.term,gsbm:$('#jyglListGsdmId').val()};
  391 + },
  392 + processResults: function (data) {
  393 + return {
  394 + results: data
  395 + };
  396 + },
  397 + cache: true
  398 + },
  399 + templateResult: function(repo){
  400 + if (repo.loading) return repo.text;
  401 + var h = '<span>'+repo.text+'</span>';
  402 + return h;
  403 + },
  404 + escapeMarkup: function (markup) { return markup; },
  405 + minimumInputLength: 1,
  406 + templateSelection: function(repo){
  407 + return repo.text;
  408 + },
  409 + language: {
  410 + noResults: function(){
  411 + return '<span style="color:red;font-size: 12px;">没有搜索到驾驶员！</span>';
  412 + },
  413 + inputTooShort : function(e) {
  414 + return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入工号搜索驾驶员</span>';
  415 + },
  416 + searching : function() {
  417 + return '<span style="color:gray;font-size: 12px;"> 正在搜索驾驶员...</span>';
  418 + }
  419 + }
  420 + })
  421 + }
  422 +
375 function showPagination(data){ 423 function showPagination(data){
376 //分页 424 //分页
377 $('#pagination').jqPaginator({ 425 $('#pagination').jqPaginator({
@@ -429,45 +477,5 @@ function changeEnabled(id,enabled){ @@ -429,45 +477,5 @@ function changeEnabled(id,enabled){
429 }) 477 })
430 } 478 }
431 479
432 -//改变状态  
433 -function startOptJsy(id){  
434 - $('#jsy'+id).select2({  
435 - placeholder: '搜索驾驶员...',  
436 - ajax: {  
437 - url: '/personnel/sreachPersonnel',  
438 - dataType: 'json',  
439 - delay: 150,  
440 - data: function(params){  
441 - return{jobCode: params.term};  
442 - },  
443 - processResults: function (data) {  
444 - return {  
445 - results: data  
446 - };  
447 - },  
448 - cache: true  
449 - },  
450 - templateResult: function(repo){  
451 - if (repo.loading) return repo.text;  
452 - var h = '<span>'+repo.text+'</span>';  
453 - return h;  
454 - },  
455 - escapeMarkup: function (markup) { return markup; },  
456 - minimumInputLength: 1,  
457 - templateSelection: function(repo){  
458 - return repo.text;  
459 - },  
460 - language: {  
461 - noResults: function(){  
462 - return '<span style="color:red;font-size: 12px;">没有搜索到驾驶员！</span>';  
463 - },  
464 - inputTooShort : function(e) {  
465 - return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入工号搜索驾驶员</span>';  
466 - },  
467 - searching : function() {  
468 - return '<span style="color:gray;font-size: 12px;"> 正在搜索驾驶员...</span>';  
469 - }  
470 - }  
471 - })  
472 -} 480 +
473 </script> 481 </script>
474 \ No newline at end of file 482 \ No newline at end of file
src/main/resources/static/pages/oil/list_ph.html
  View file @a1aa9da
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 <table 59 <table
60 class="table table-striped table-bordered table-hover table-checkable" 60 class="table table-striped table-bordered table-hover table-checkable"
61 id="datatable_ylb"> 61 id="datatable_ylb">
62 - <thead> 62 + <thead >
63 <tr role="row" class="filter"> 63 <tr role="row" class="filter">
64 <td colspan="2"> 64 <td colspan="2">
65 <div style="float: right; " >&nbsp;公司&nbsp;</div> 65 <div style="float: right; " >&nbsp;公司&nbsp;</div>