潘钊 / bsth_control · Commits

Commit 377da8d967a463daa618bf810dca938b11e1b842

Authored by 王通
2 parents 43f5ff7a ad966189
build: skipped

Merge branch 'pudong' into jiading

Inline Side-by-side
Showing 19 changed files with 852 additions and 61 deletions
src/main/java/com/bsth/controller/jdtest/JdTestController.java 0 → 100644
  View file @377da8d
  1 +package com.bsth.controller.jdtest;
  2 +
  3 +import java.text.SimpleDateFormat;
  4 +import java.util.ArrayList;
  5 +import java.util.HashMap;
  6 +import java.util.Iterator;
  7 +import java.util.List;
  8 +import java.util.Map;
  9 +import org.springframework.beans.factory.annotation.Autowired;
  10 +import org.springframework.web.bind.annotation.RequestMapping;
  11 +import org.springframework.web.bind.annotation.RequestMethod;
  12 +import org.springframework.web.bind.annotation.RequestParam;
  13 +import org.springframework.web.bind.annotation.RestController;
  14 +import com.bsth.controller.BaseController;
  15 +import com.bsth.data.BasicData;
  16 +import com.bsth.entity.oil.Ylb;
  17 +import com.bsth.entity.oil.Ylxxb;
  18 +import com.bsth.entity.sys.Dictionary;
  19 +import com.bsth.service.jdtest.JdtestService;
  20 +import com.bsth.service.oil.YlbService;
  21 +import com.bsth.service.sys.DictionaryService;
  22 +import com.bsth.util.Arith;
  23 +import com.bsth.util.ReportUtils;
  24 +
  25 +@RestController
  26 +@RequestMapping("jdtest")
  27 +public class JdTestController extends BaseController<Ylb, Integer>{
  28 + @Autowired
  29 + YlbService ylbService;
  30 + @Autowired
  31 + DictionaryService dictionaryService;
  32 + @Autowired
  33 + JdtestService jdtestService;
  34 +
  35 + /*
  36 + * 油量平衡表导出
  37 + */
  38 + @RequestMapping(value = "/listExport",method = RequestMethod.POST)
  39 + public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
  40 + SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
  41 + sdfSimple = new SimpleDateFormat("yyyyMMdd");
  42 + Map<String, Object> dMap=new HashMap<>();
  43 + dMap.put("dGroup", "oilType");
  44 + Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
  45 + while (it.hasNext()) {
  46 + Dictionary d=it.next();
  47 + dMap.put(d.getdCode(), d.getdName());
  48 + }
  49 +
  50 + List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
  51 + ReportUtils ee = new ReportUtils();
  52 + List<Ylb> ylb= ylbService.listYlb(map);
  53 +// (new CustomerSpecs<Ylb>(map)).iterator();
  54 + List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
  55 + for (Ylb y : ylb) {
  56 + Map<String, Object> m = new HashMap<String, Object>();
  57 + m.put("rq", sdfMonth.format(y.getRq()));
  58 + m.put("gsname",y.getGsname() );
  59 + m.put("fgsname", y.getFgsname());
  60 + m.put("xlname", y.getXlname()==null?"":y.getXlname());
  61 + m.put("nbbm", y.getNbbm());
  62 + m.put("jsy", y.getJsy());
  63 + m.put("name", y.getName());
  64 + m.put("jzl", y.getJzl()<=0?"0":y.getJzl());
  65 + m.put("czlc", "0");
  66 + m.put("jzlc", "0");
  67 + m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl());
  68 + m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl());
  69 + m.put("yh", y.getYh()<=0?"0":y.getYh());
  70 + String rylx="";
  71 + if(y.getRylx()!=null){
  72 + if(dMap.get(y.getRylx())==null){
  73 + rylx="";
  74 + }else{
  75 + rylx=dMap.get(y.getRylx()).toString();
  76 + }
  77 + }
  78 + m.put("rylx", rylx);
  79 + m.put("ns", y.getNs()==null?"0":y.getNs());
  80 + String shyy ="无";
  81 + if(y.getShyy()!=null){
  82 + shyy=y.getShyy();
  83 + if(shyy.equals("1")){shyy="票务用油";}
  84 + else if(shyy.equals("2")){shyy="保养用油";}
  85 + else if(shyy.equals("3")){shyy="报废车用油";}
  86 + else if(shyy.equals("4")){shyy="其它用油";}
  87 + else if(shyy.equals("5")){shyy="人保部";}
  88 + else if(shyy.equals("6")){shyy="车队";}
  89 + else if(shyy.equals("7")){shyy="车间(高保)";}
  90 + else if(shyy.equals("8")){shyy="车间(小修)";}
  91 + else{shyy ="无";}
  92 + }
  93 + m.put("shyy", shyy);
  94 + m.put("sh", y.getSh()<=0?"0":y.getSh());
  95 + m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
  96 + m.put("bglyh", y.getBglyh());
  97 + m.put("zyh", Arith.add(y.getSh(), y.getYh()));
  98 + resList.add(m);
  99 + }
  100 + try {
  101 + map.put("sheetName", map.get("rq"));
  102 + listI.add(resList.iterator());
  103 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  104 + ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
  105 + path+"export/"+map.get("rq").toString()+ "进出场存油量.xls");
  106 + } catch (Exception e) {
  107 + e.printStackTrace();
  108 + }
  109 +
  110 + return resList;
  111 +
  112 + }
  113 +
  114 + /*
  115 + * 场外加油匹配当天线路数据
  116 + */
  117 + @RequestMapping(value = "/cwjyList",method = RequestMethod.GET)
  118 + public List<Ylxxb> cwjyList(@RequestParam Map<String, Object> map){
  119 + List<Ylxxb> cwjyList=jdtestService.cwjyList(map);
  120 + return cwjyList;
  121 + }
  122 +
  123 + /*
  124 + * 油量路单报表
  125 + */
  126 + @RequestMapping(value="/daily",method = RequestMethod.GET)
  127 + public List<Map<String, Object>> daily(@RequestParam Map<String, Object> map){
  128 + List<Map<String, Object>> list=jdtestService.daily(map);
  129 +
  130 + if(map.get("type").toString().equals("export")){
  131 + List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
  132 + ReportUtils ee = new ReportUtils();
  133 + Map<String, Object> m=new HashMap<>();
  134 +
  135 + try {
  136 + String lineName = map.get("lineName").toString();
  137 + String date = map.get("date").toString();
  138 + m.put("line", lineName);
  139 + m.put("date", date);
  140 + listI.add(list.iterator());
  141 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  142 + ee.excelReplace(listI, new Object[] { m }, path + "mould/jd_daily.xls",
  143 + path + "export/" + date
  144 + + "-" + lineName + "-班次日报表.xls");
  145 + } catch (Exception e) {
  146 + e.printStackTrace();
  147 + }
  148 + }
  149 + return list;
  150 + }
  151 +
  152 +}
... ...
src/main/java/com/bsth/controller/oil/CwjyController.java
  View file @377da8d
... ... @@ -62,6 +62,12 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
62 62 return pagequery;
63 63 }
64 64  
  65 + @RequestMapping(value = "/cwjyList",method = RequestMethod.GET)
  66 + public List<Ylxxb> cwjyList(@RequestParam Map<String, Object> map){
  67 + List<Ylxxb> cwjyList=service.cwjyList(map);
  68 + return cwjyList;
  69 + }
  70 +
65 71 @RequestMapping(value="/bynbbm",method = RequestMethod.GET)
66 72 public Ylxxb bynbbm(@RequestParam Map<String, Object> map){
67 73  
... ...
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @377da8d
... ... @@ -26,9 +26,11 @@ import org.springframework.web.bind.annotation.RestController;
26 26  
27 27 import com.bsth.controller.BaseController;
28 28 import com.bsth.entity.oil.Ylb;
  29 +import com.bsth.entity.sys.Dictionary;
29 30 import com.bsth.entity.sys.SysUser;
30 31 import com.bsth.security.util.SecurityUtils;
31 32 import com.bsth.service.oil.YlbService;
  33 +import com.bsth.service.sys.DictionaryService;
32 34 import com.bsth.util.Arith;
33 35 import com.bsth.util.ReportUtils;
34 36 import com.google.common.base.Splitter;
... ... @@ -38,7 +40,8 @@ import com.google.common.base.Splitter;
38 40 public class YlbController extends BaseController<Ylb, Integer>{
39 41 @Autowired
40 42 YlbService ylbService;
41   -
  43 + @Autowired
  44 + DictionaryService dictionaryService;
42 45 @RequestMapping(value = "/saveYlb",method = RequestMethod.POST)
43 46 public Map<String, Object> saveYlb(Ylb t){
44 47 // SysUser user = SecurityUtils.getCurrentUser();
... ... @@ -258,9 +261,18 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
258 261 public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
259 262 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
260 263 sdfSimple = new SimpleDateFormat("yyyyMMdd");
  264 + Map<String, Object> dMap=new HashMap<>();
  265 + dMap.put("dGroup", "oilType");
  266 + Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
  267 + while (it.hasNext()) {
  268 + Dictionary d=it.next();
  269 + dMap.put(d.getdCode(), d.getdName());
  270 + }
  271 +
261 272 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
262 273 ReportUtils ee = new ReportUtils();
263 274 List<Ylb> ylb= ylbService.listYlb(map);
  275 +
264 276 // (new CustomerSpecs<Ylb>(map)).iterator();
265 277 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
266 278 for (Ylb y : ylb) {
... ... @@ -284,8 +296,13 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
284 296 m.put("yh", y.getYh()<=0?"0":y.getYh());
285 297 String rylx="";
286 298 if(y.getRylx()!=null){
287   - if(y.getRylx().equals("0")){rylx="0号柴油";}
288   - if(y.getRylx().equals("1")){rylx="负10号柴油";}
  299 + /*if(y.getRylx().equals("0")){rylx="0号柴油";}
  300 + if(y.getRylx().equals("1")){rylx="负10号柴油";}*/
  301 + if(dMap.get(y.getRylx())==null){
  302 + rylx="";
  303 + }else{
  304 + rylx=dMap.get(y.getRylx()).toString();
  305 + }
289 306 }
290 307 m.put("rylx", rylx);
291 308 m.put("ns", y.getNs()==null?"0":y.getNs());
... ...
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @377da8d
... ... @@ -282,9 +282,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
282 282 }
283 283  
284 284 @RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
285   - public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
  285 + public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName,@RequestParam String jGh, @RequestParam String clZbh,
286 286 @RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
287   - return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
  287 + return scheduleRealInfoService.exportWaybill(jName,jGh, clZbh, lpName,date,line);
288 288 }
289 289  
290 290 @RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
... ... @@ -370,9 +370,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
370 370 * @return
371 371 */
372 372 @RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
373   - public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
  373 + public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
374 374 ,@RequestParam String date,@RequestParam String line){
375   - return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
  375 + return scheduleRealInfoService.queryListWaybill(jGh, clZbh,lpName,date,line);
376 376 }
377 377  
378 378 /**
... ...
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @377da8d
... ... @@ -31,7 +31,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
31 31 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
32 32 List<ScheduleRealInfo> queryUserInfo(String line,String date);
33 33  
34   - @Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
  34 + @Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,min(s.jName) from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.jGh,s.clZbh,s.lpName order by (lpName+1)")
35 35 List<ScheduleRealInfo> queryUserInfo2(String line,String date);
36 36  
37 37 @Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.clZbh ")
... ... @@ -193,10 +193,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
193 193 List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
194 194  
195 195  
196   - @Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate,s.jName as jName ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName,jName ORDER BY clZbh,realExecDate,fcsj")
  196 + @Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
197 197 List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
198 198  
199   - @Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate,s.jName as jName ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName,jName ORDER BY clZbh,realExecDate,fcsj")
  199 + @Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
200 200 List<Map<String,Object>> yesterdayDataList_eq(String line,String date,String gsbm,String fgsbm,String nbbm);
201 201  
202 202 @Query(value="select s from ScheduleRealInfo s where s.scheduleDateStr = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
... ...
src/main/java/com/bsth/service/jdtest/JdtestService.java 0 → 100644
  View file @377da8d
  1 +package com.bsth.service.jdtest;
  2 +
  3 +import java.util.List;
  4 +import java.util.Map;
  5 +
  6 +import com.bsth.entity.oil.Ylxxb;
  7 +
  8 +public interface JdtestService {
  9 + public List<Ylxxb> cwjyList(Map<String, Object> map);
  10 +
  11 + public List<Map<String, Object>> daily(Map<String, Object> map);
  12 +}
... ...
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java 0 → 100644
  View file @377da8d
  1 +package com.bsth.service.jdtest.impl;
  2 +
  3 +import java.sql.ResultSet;
  4 +import java.sql.SQLException;
  5 +import java.util.ArrayList;
  6 +import java.util.HashMap;
  7 +import java.util.Iterator;
  8 +import java.util.List;
  9 +import java.util.Map;
  10 +import java.util.Set;
  11 +
  12 +import org.springframework.beans.factory.annotation.Autowired;
  13 +import org.springframework.jdbc.core.JdbcTemplate;
  14 +import org.springframework.jdbc.core.RowMapper;
  15 +import org.springframework.stereotype.Service;
  16 +
  17 +import com.bsth.entity.mcy_forms.Daily;
  18 +import com.bsth.entity.oil.Dlb;
  19 +import com.bsth.entity.oil.Ylb;
  20 +import com.bsth.entity.oil.Ylxxb;
  21 +import com.bsth.entity.realcontrol.ChildTaskPlan;
  22 +import com.bsth.entity.realcontrol.ScheduleRealInfo;
  23 +import com.bsth.entity.sys.Dictionary;
  24 +import com.bsth.repository.oil.YlbRepository;
  25 +import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
  26 +import com.bsth.service.jdtest.JdtestService;
  27 +import com.bsth.service.report.CulateMileageService;
  28 +import com.bsth.service.sys.DictionaryService;
  29 +import com.bsth.util.Arith;
  30 +
  31 +@Service
  32 +public class JdtestServiceImpl implements JdtestService {
  33 +
  34 + @Autowired
  35 + JdbcTemplate jdbcTemplate;
  36 + @Autowired
  37 + CulateMileageService culateMileageService;
  38 + @Autowired
  39 + ScheduleRealInfoRepository scheduleRealInfoRepository;
  40 + @Autowired
  41 + YlbRepository ylbRepository;
  42 + @Autowired
  43 + DictionaryService dictionaryService;
  44 + @Override
  45 + public List<Ylxxb> cwjyList(Map<String, Object> map) {
  46 + String rq=map.get("rq").toString();
  47 + String nbbm=map.get("nbbh").toString();
  48 + String gsdm=map.get("gsdm_like").toString();
  49 +
  50 + String fgsdm=map.get("fgsdm_like").toString();
  51 + String line =map.get("line_like").toString().trim();
  52 + boolean type=false;
  53 + if(map.get("type")!=null){
  54 + type=true;
  55 + }
  56 + String sql="select a.nbbm,a.gsdm,a.fgsdm,IFNULL(b.id,0) as id,IFNULL(b.jzl,0) as jzl,"
  57 + + " IFNULL(b.jyggh,0) as jyggh,IFNULL(b.jsy,0) as jsy,IFNULL(b.stationid,0) as stationid ,"
  58 + + " IFNULL(b.yj,0) as yj,IFNULL(b.nylx,0) as nylx,IFNULL(b.bz,'') as bz,IFNULL(c.jsy,'') as ldgh ,"
  59 + + " IFNULL(c.xlname,c.linename) as xlname from "
  60 + + " (select * from bsth_c_cwjy where gsdm='"+gsdm+"' and fgsdm='"+fgsdm+"') a "
  61 + + " left join (select * from bsth_c_ylxxb where yyrq='"+rq+"' and gsdm='"+gsdm+"' and jylx=1) b"
  62 + + " on a.nbbm=b.nbbm LEFT JOIN (select u.nbbm,u.jsy,v.linename,v.xlname,v.xlbm from(select a.nbbm,GROUP_CONCAT(a.jsy) as jsy "
  63 + + " from (select nbbm,jsy from bsth_c_ylb x where x.rq='"+rq+"' "
  64 + + " and x.ssgsdm='"+gsdm+"' and x.fgsdm='"+fgsdm+"' group by nbbm,jsy ) a group by a.nbbm) u"
  65 + + " LEFT JOIN(select o.nbbm,GROUP_CONCAT(o.xlbm) xlbm ,GROUP_CONCAT(o.linename) as xlname,"
  66 + + " GROUP_CONCAT(p.`name`) as linename from (select nbbm,xlbm,linename from bsth_c_ylb "
  67 + + " where rq='"+rq+"' and ssgsdm='"+gsdm+"' and fgsdm='"+fgsdm+"' group by nbbm,xlbm,linename) o "
  68 + + " LEFT JOIN bsth_c_line p on o.xlbm=p.line_code group by o.nbbm ) v on u.nbbm=v.nbbm) c "
  69 + + " on a.nbbm=c.nbbm where 1=1 ";
  70 + if(!nbbm.equals("")){
  71 + sql +=" and a.nbbm like '%"+nbbm+"%'";
  72 + }
  73 + if(!line.equals("")){
  74 + sql += " and c.xlbm ='"+line+"'";
  75 + }
  76 + if(type){
  77 + sql +=" and c.xlbm is not null";
  78 + }
  79 + sql +=" order by xlname desc";
  80 +
  81 + List<Ylxxb> yList= jdbcTemplate.query(sql,
  82 + new RowMapper<Ylxxb>(){
  83 + @Override
  84 + public Ylxxb mapRow(ResultSet rs, int rowNum) throws SQLException {
  85 + Ylxxb t=new Ylxxb();
  86 + t.setId(rs.getInt("id"));
  87 + t.setGsdm(rs.getString("gsdm"));
  88 + t.setFgsdm(rs.getString("fgsdm"));
  89 + t.setNbbm(rs.getString("nbbm"));
  90 + t.setJyggh(rs.getString("jyggh"));
  91 + t.setJsy(rs.getString("jsy"));
  92 + t.setJzl(rs.getDouble("jzl"));
  93 + t.setStationid(rs.getString("stationid"));
  94 + t.setNylx(rs.getInt("nylx"));
  95 + t.setYj(rs.getDouble("yj"));
  96 + t.setBz(rs.getString("bz"));
  97 + t.setLdgh(rs.getString("ldgh"));
  98 + t.setLinename(rs.getString("xlname"));
  99 + return t;
  100 + }
  101 + });
  102 + return yList;
  103 + }
  104 +
  105 +
  106 + @Override
  107 + public List<Map<String, Object>> daily(Map<String, Object> map) {
  108 + String xlbm="";;
  109 + if(map.get("line")!=null){
  110 + xlbm=map.get("line").toString().trim();
  111 + }
  112 +
  113 + String sql="select r.cl_zbh,r.j_gh,r.lp_name "
  114 + + " from bsth_c_s_sp_info_real r where "
  115 + + "r.schedule_date_str = '"+map.get("date").toString()+"' "
  116 + + " and r.xl_bm = '"+xlbm+"' group by r.cl_zbh,r.j_gh,r.lp_name order by r.cl_zbh";
  117 +
  118 + List<Map<String, Object>> list = jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
  119 + @Override
  120 + public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
  121 + Map<String, Object> m=new HashMap<>();
  122 + m.put("lp", arg0.getString("lp_name"));
  123 + m.put("jGh", arg0.getString("j_gh"));
  124 + m.put("clZbh", arg0.getString("cl_zbh"));
  125 + return m;
  126 + }
  127 + });
  128 + Map<String, Object> dMap=new HashMap<>();
  129 + dMap.put("dGroup", "oilType");
  130 + Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
  131 + while (it.hasNext()) {
  132 + Dictionary d=it.next();
  133 + dMap.put(d.getdCode(), d.getdName());
  134 + }
  135 +
  136 + List<Ylb> listYlb= ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
  137 + Map<String, Ylb> mapYlb=new HashMap<>();
  138 + for (int j = 0; j < listYlb.size(); j++) {
  139 + Ylb y=listYlb.get(j);
  140 + if(mapYlb.get(y.getJsy()+y.getNbbm()+y.getLp())==null){
  141 + mapYlb.put(y.getJsy()+y.getNbbm()+y.getLp(), y);
  142 + }
  143 + }
  144 +
  145 + List<ScheduleRealInfo> sList;
  146 + List<ScheduleRealInfo> jList;
  147 + List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
  148 + double jzyl_z=0.0;
  149 + double czyl_z=0.0;
  150 + double jzl_z=0.0;
  151 + double yh_z=0.0;
  152 + int jhbc_z=0;
  153 + double jhlc_z=0.0;
  154 + int sjbc_z=0;
  155 + double sjzlc_z=0.0;
  156 + double kszlc_z=0.0;
  157 + double zlc_z=0.0;
  158 + for(int i=0;i<list.size();i++){
  159 + sList =new ArrayList<ScheduleRealInfo>();
  160 + jList =new ArrayList<ScheduleRealInfo>();
  161 + Map<String, Object> m=list.get(i);
  162 + double jzyl=0.0;
  163 + double czyl=0.0;
  164 + double jzl=0.0;
  165 + double yh=0.0;
  166 + String rylx="";
  167 +
  168 + if(mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
  169 + Ylb t=mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
  170 + jzyl=t.getJzyl();
  171 + czyl=t.getCzyl();
  172 + jzl=t.getJzl();
  173 + yh=t.getYh();
  174 + if(t.getRylx()!=null){
  175 + if(dMap.get(t.getRylx())==null){
  176 + rylx="";
  177 + }else{
  178 + rylx=dMap.get(t.getRylx()).toString();
  179 + }
  180 + }
  181 + }
  182 + m.put("jzyl",jzyl);
  183 + jzyl_z=Arith.add(jzyl, jzyl_z);
  184 + m.put("czyl", czyl);
  185 + czyl_z=Arith.add(czyl, czyl_z);
  186 + m.put("jzl", jzl);
  187 + jzl_z=Arith.add(jzl, jzl_z);
  188 + m.put("yh", yh);
  189 + yh_z=Arith.add(yh, yh_z);
  190 + m.put("rylx", rylx);
  191 + m.put("dh", "");
  192 + for (int j = 0; j < lists.size(); j++) {
  193 + ScheduleRealInfo s=lists.get(j);
  194 + if(m.get("clZbh").toString().equals(s.getClZbh()) &&
  195 + m.get("jGh").toString().equals(s.getjGh()) &&
  196 + m.get("lp").toString().equals(s.getLpName()) ){
  197 + jList.add(s);
  198 + Set<ChildTaskPlan> cts = s.getcTasks();
  199 + if(cts != null && cts.size() > 0){
  200 + sList.add(s);
  201 + }else{
  202 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
  203 + sList.add(s);
  204 + }
  205 + }
  206 +
  207 + }
  208 + }
  209 +
  210 + m.put("jName", jList.get(0).getjName());
  211 +
  212 + int jhbc=culateMileageService.culateJhbc(jList, "");
  213 + jhbc_z=jhbc+jhbc_z;
  214 + double jhlc=culateMileageService.culateJhgl(jList);
  215 + jhlc_z=Arith.add(jhlc, jhlc_z);
  216 + int sjbc=culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "");
  217 + double ljgl=culateMileageService.culateLjgl(sList);
  218 + double sjgl=culateMileageService.culateSjgl(sList);
  219 + double sjzlc=Arith.add(ljgl, sjgl);
  220 + sjzlc_z=Arith.add(sjzlc, sjzlc_z);
  221 + double ksgl=culateMileageService.culateKsgl(sList);
  222 + double jccgl=culateMileageService.culateJccgl(sList);
  223 + double kszlc=Arith.add(ksgl, jccgl);
  224 + kszlc_z=Arith.add(kszlc, kszlc_z);
  225 + double zlc=Arith.add(sjzlc, kszlc);
  226 + zlc_z=Arith.add(zlc, zlc_z);
  227 + m.put("jhbc", jhbc);
  228 + m.put("jhlc", jhlc);
  229 + m.put("sjbc", sjbc);
  230 + m.put("sjzlc",sjzlc);
  231 + m.put("kszlc", kszlc);
  232 + m.put("zlc", zlc);
  233 +
  234 + }
  235 + Map<String, Object> mmp=new HashMap<>();
  236 + mmp.put("lp", "合计");
  237 + mmp.put("jGh", "");
  238 + mmp.put("clZbh", "");
  239 + mmp.put("jName", "");
  240 + mmp.put("jhbc", jhbc_z);
  241 + mmp.put("jhlc", jhlc_z);
  242 + mmp.put("sjbc", sjbc_z);
  243 + mmp.put("sjzlc", sjzlc_z);
  244 + mmp.put("kszlc",kszlc_z);
  245 + mmp.put("zlc", zlc_z);
  246 + mmp.put("jzyl",jzyl_z);
  247 + mmp.put("czyl",czyl_z);
  248 + mmp.put("jzl", jzl_z);
  249 + mmp.put("yh", yh_z);
  250 + mmp.put("rylx", "");
  251 + mmp.put("dh","");
  252 + list.add(mmp);
  253 + return list;
  254 + }
  255 +}
... ...
src/main/java/com/bsth/service/oil/CwjyService.java
  View file @377da8d
... ... @@ -11,6 +11,8 @@ import com.bsth.util.PageObject;
11 11  
12 12 public interface CwjyService extends BaseService<Cwjy, Integer>{
13 13 List<Ylxxb> Pagequery(Map<String, Object> map) ;
  14 +
  15 + List<Ylxxb> cwjyList(Map<String, Object> map);
14 16 Ylxxb bynbbm(Map<String, Object> map);
15 17  
16 18 Map<String, Object> savejzl(Map<String, Object> map) throws Exception ;
... ...
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
  View file @377da8d
... ... @@ -274,6 +274,8 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
274 274 return map;
275 275 }
276 276  
  277 +
  278 +
277 279 @Override
278 280 public List<Ylxxb> Pagequery(Map<String, Object> map) {
279 281 // TODO Auto-generated method stub
... ... @@ -393,6 +395,66 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
393 395  
394 396 return cs;
395 397 }
  398 +
  399 + @Override
  400 + public List<Ylxxb> cwjyList(Map<String, Object> map) {
  401 + String rq=map.get("rq").toString();
  402 + String nbbm=map.get("nbbh").toString();
  403 + String gsdm=map.get("gsdm_like").toString();
  404 +
  405 + String fgsdm=map.get("fgsdm_like").toString();
  406 + String line =map.get("line_like").toString().trim();
  407 + boolean type=false;
  408 + if(map.get("type")!=null){
  409 + type=true;
  410 + }
  411 + String sql="select a.nbbm,a.gsdm,a.fgsdm,IFNULL(b.id,0) as id,IFNULL(b.jzl,0) as jzl,"
  412 + + " IFNULL(b.jyggh,0) as jyggh,IFNULL(b.jsy,0) as jsy,IFNULL(b.stationid,0) as stationid ,"
  413 + + " IFNULL(b.yj,0) as yj,IFNULL(b.nylx,0) as nylx,IFNULL(b.bz,'') as bz,IFNULL(c.jsy,'') as ldgh ,"
  414 + + " IFNULL(c.xlname,c.linename) as xlname from "
  415 + + " (select * from bsth_c_cwjy where gsdm='"+gsdm+"' and fgsdm='"+fgsdm+"') a "
  416 + + " left join (select * from bsth_c_ylxxb where yyrq='"+rq+"' and gsdm='"+gsdm+"' and jylx=1) b"
  417 + + " on a.nbbm=b.nbbm LEFT JOIN (select u.nbbm,u.jsy,v.linename,v.xlname,v.xlbm from(select a.nbbm,GROUP_CONCAT(a.jsy) as jsy "
  418 + + " from (select nbbm,jsy from bsth_c_ylb x where x.rq='"+rq+"' "
  419 + + " and x.ssgsdm='"+gsdm+"' and x.fgsdm='"+fgsdm+"' group by nbbm,jsy ) a group by a.nbbm) u"
  420 + + " LEFT JOIN(select o.nbbm,GROUP_CONCAT(o.xlbm) xlbm ,GROUP_CONCAT(o.linename) as xlname,"
  421 + + " GROUP_CONCAT(p.`name`) as linename from (select nbbm,xlbm,linename from bsth_c_ylb "
  422 + + " where rq='"+rq+"' and ssgsdm='"+gsdm+"' and fgsdm='"+fgsdm+"' group by nbbm,xlbm,linename) o "
  423 + + " LEFT JOIN bsth_c_line p on o.xlbm=p.line_code group by o.nbbm ) v on u.nbbm=v.nbbm) c "
  424 + + " on a.nbbm=c.nbbm where 1=1 ";
  425 + if(!nbbm.equals("")){
  426 + sql +=" and a.nbbm like '%"+nbbm+"%'";
  427 + }
  428 + if(!line.equals("")){
  429 + sql += " and c.xlbm ='"+line+"'";
  430 + }
  431 + if(type){
  432 + sql +=" and c.xlbm is not null";
  433 + }
  434 + sql +=" order by xlname desc";
  435 + List<Ylxxb> yList= jdbcTemplate.query(sql,
  436 + new RowMapper<Ylxxb>(){
  437 + @Override
  438 + public Ylxxb mapRow(ResultSet rs, int rowNum) throws SQLException {
  439 + Ylxxb t=new Ylxxb();
  440 + t.setId(rs.getInt("id"));
  441 + t.setGsdm(rs.getString("gsdm"));
  442 + t.setFgsdm(rs.getString("fgsdm"));
  443 + t.setNbbm(rs.getString("nbbm"));
  444 + t.setJyggh(rs.getString("jyggh"));
  445 + t.setJsy(rs.getString("jsy"));
  446 + t.setJzl(rs.getDouble("jzl"));
  447 + t.setStationid(rs.getString("stationid"));
  448 + t.setNylx(rs.getInt("nylx"));
  449 + t.setYj(rs.getDouble("yj"));
  450 + t.setBz(rs.getString("bz"));
  451 + t.setLdgh(rs.getString("ldgh"));
  452 + t.setLinename(rs.getString("xlname"));
  453 + return t;
  454 + }
  455 + });
  456 + return yList;
  457 + }
396 458  
397 459  
398 460  
... ...
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
  View file @377da8d
... ... @@ -67,7 +67,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
67 67  
68 68 List<ScheduleRealInfo> queryUserInfoPx(String line,String date,String state,String type);
69 69  
70   - List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date,String line);
  70 + List<ScheduleRealInfo> exportWaybill(String jName,String jGh,String clZbh,String lpName,String date,String line);
71 71  
72 72 List<ScheduleRealInfo> exportWaybillQp(String clZbh,String date,String line);
73 73  
... ... @@ -109,7 +109,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
109 109  
110 110 List<SchEditInfoDto> correctForm(String line,String date,String endDate,String lpName,String code, String type,String changType);
111 111  
112   - List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
  112 + List<ScheduleRealInfo> queryListWaybill(String jGh,String clZbh,String lpName,String date,String line);
113 113  
114 114 List<ScheduleRealInfo> queryListWaybillQp(String clZbh,String date,String line);
115 115  
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @377da8d
... ... @@ -38,6 +38,7 @@ import com.bsth.entity.schedule.CarConfigInfo;
38 38 import com.bsth.entity.schedule.EmployeeConfigInfo;
39 39 import com.bsth.entity.schedule.GuideboardInfo;
40 40 import com.bsth.entity.schedule.SchedulePlanInfo;
  41 +import com.bsth.entity.sys.Dictionary;
41 42 import com.bsth.entity.sys.DutyEmployee;
42 43 import com.bsth.entity.sys.SysUser;
43 44 import com.bsth.repository.CarDeviceRepository;
... ... @@ -61,6 +62,7 @@ import com.bsth.service.realcontrol.ScheduleRealInfoService;
61 62 import com.bsth.service.report.CulateMileageService;
62 63 import com.bsth.service.report.ReportService;
63 64 import com.bsth.service.schedule.SchedulePlanInfoService;
  65 +import com.bsth.service.sys.DictionaryService;
64 66 import com.bsth.service.sys.DutyEmployeeService;
65 67 import com.bsth.util.*;
66 68 import com.bsth.websocket.handler.SendUtils;
... ... @@ -110,6 +112,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
110 112 @Autowired
111 113 CulateMileageService culateMieageService;
112 114  
  115 + @Autowired
  116 + DictionaryService dictionaryService;
113 117 /*@Autowired
114 118 BorrowCenter borrowCenter;*/
115 119  
... ... @@ -896,16 +900,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
896 900 }
897 901 String sqlPlan = "select * from (select * from ("
898 902 + " select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
899   - + " s.lp_Name as lpName,s.j_Name as jName,max(s.schedule_date_str) as dateStr ,"
  903 + + " s.lp_Name as lpName,min(s.j_Name) as jName,max(s.schedule_date_str) as dateStr ,"
900 904 + " min(s.fcsj) as fcsj,1 as px from bsth_c_s_sp_info_real s where "
901 905 + " s.xl_Bm = '" + line + "' and s.schedule_date_str ='" + date + "'"
902   - + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name ) x where x.fcsj >'" + minfcsj + "'"
  906 + + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name) x where x.fcsj >'" + minfcsj + "'"
903 907 + " UNION "
904 908 + " select * from ( select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
905   - + " s.lp_Name as lpName,s.j_Name as jName, max(s.schedule_date_str) as dateStr,"
  909 + + " s.lp_Name as lpName,min(s.j_Name) as jName, max(s.schedule_date_str) as dateStr,"
906 910 + " min(s.fcsj) as fcsj,2 as px from bsth_c_s_sp_info_real s "
907 911 + " where s.xl_Bm = '" + line + "' and s.schedule_date_str ='" + date + "'"
908   - + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name "
  912 + + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name"
909 913 + " ) y where y.fcsj <='" + minfcsj + "') z order by (" + state + "),dateStr,px,fcsj " + type;
910 914 List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
911 915 new RowMapper<ScheduleRealInfo>() {
... ... @@ -967,11 +971,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
967 971 *
968 972 */
969 973 @Override
970   - public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName, String date, String line) {
  974 + public List<ScheduleRealInfo> exportWaybill(String jName,String jGh, String clZbh, String lpName, String date, String line) {
971 975 ReportUtils ee = new ReportUtils();
972 976 ReportRelatedUtils rru = new ReportRelatedUtils();
973 977 List<Iterator<?>> list = new ArrayList<Iterator<?>>();
974   - List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
  978 + List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
975 979 List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
976 980 // List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
977 981 List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
... ... @@ -2304,11 +2308,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2304 2308 }
2305 2309  
2306 2310 @Override
2307   - public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
  2311 + public List<ScheduleRealInfo> queryListWaybill(String jGh, String clZbh,
2308 2312 String lpName, String date, String line) {
2309 2313 List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
2310 2314 List<ScheduleRealInfo> list = null;
2311   - list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
  2315 + list = scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
2312 2316 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
2313 2317 String minfcsj = "02:00";
2314 2318 List<Line> lineList = lineRepository.findLineByCode(line);
... ... @@ -3771,7 +3775,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3771 3775 }
3772 3776 List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date, gsbm, fgsbm);
3773 3777 for (int x = 0; x < yesterdayDataList.size(); x++) {
3774   - String jName = yesterdayDataList.get(x).get("jGh").toString();
  3778 + String jsy = yesterdayDataList.get(x).get("jGh").toString();
3775 3779 String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
3776 3780 String xlbm = yesterdayDataList.get(x).get("xlBm").toString();
3777 3781 String lp = yesterdayDataList.get(x).get("lpName").toString();
... ... @@ -3780,9 +3784,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3780 3784 String company = "";
3781 3785 String bCompany = "";
3782 3786 String lineName="";
  3787 + String jName="";
3783 3788 List<ScheduleRealInfo> listS = new ArrayList<ScheduleRealInfo>();
3784 3789 for (ScheduleRealInfo scheduleRealInfo : lists) {
3785   - if (scheduleRealInfo.getjGh().equals(jName)
  3790 + if (scheduleRealInfo.getjGh().equals(jsy)
3786 3791 && scheduleRealInfo.getClZbh().equals(clZbh)
3787 3792 && scheduleRealInfo.getXlBm().equals(xlbm)
3788 3793 && scheduleRealInfo.getLpName().equals(lp)) {
... ... @@ -3791,6 +3796,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3791 3796 company = scheduleRealInfo.getGsBm();
3792 3797 bCompany = scheduleRealInfo.getFgsBm();
3793 3798 lineName = scheduleRealInfo.getXlName();
  3799 + jName= scheduleRealInfo.getjName();
3794 3800 fage = false;
3795 3801 }
3796 3802 Set<ChildTaskPlan> cts = scheduleRealInfo.getcTasks();
... ... @@ -3806,6 +3812,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3806 3812 yesterdayDataList.get(x).put("company", company);
3807 3813 yesterdayDataList.get(x).put("bCompany", bCompany);
3808 3814 yesterdayDataList.get(x).put("lineName", lineName);
  3815 + yesterdayDataList.get(x).put("jName", jName);
3809 3816 Double ljgl = culateMieageService.culateLjgl(listS);
3810 3817 Double sjgl = culateMieageService.culateSjgl(listS);
3811 3818 Double ksgl = culateMieageService.culateKsgl(listS);
... ... @@ -4568,6 +4575,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4568 4575 @Override
4569 4576 public Map<String, Object> MapById(Long id) {
4570 4577 // TODO Auto-generated method stub
  4578 + Map<String, Object> dMap=new HashMap<>();
  4579 + dMap.put("dGroup", "oilType");
  4580 + Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
  4581 + while (it.hasNext()) {
  4582 + Dictionary d=it.next();
  4583 + dMap.put(d.getdCode(), d.getdName());
  4584 + }
4571 4585 Map<String, Object> map = new HashMap<String, Object>();
4572 4586 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
4573 4587 ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(id);
... ... @@ -4580,6 +4594,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4580 4594 Double yh = 0.0;
4581 4595 Double jzl = 0.0;
4582 4596 Double zlc = 0.0;
  4597 + String rylx="";
4583 4598 List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
4584 4599 if (listCars.size() > 0) {
4585 4600 if (listCars.get(0).getSfdc() != null) {
... ... @@ -4616,6 +4631,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4616 4631 yh = Arith.add(yh, y.getYh());
4617 4632 jzl = Arith.add(jzl, y.getJzl());
4618 4633 zlc = Arith.add(zlc, y.getZlc());
  4634 + if(dMap.get(y.getRylx())!=null)
  4635 + rylx =dMap.get(y.getRylx()).toString();
4619 4636 } else {
4620 4637 if (y.getLp().equals(s.getLpName())) {
4621 4638 ccyl = Arith.add(ccyl, y.getCzyl());
... ... @@ -4623,13 +4640,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4623 4640 yh = Arith.add(yh, y.getYh());
4624 4641 jzl = Arith.add(jzl, y.getJzl());
4625 4642 zlc = Arith.add(zlc, y.getZlc());
  4643 + if(dMap.get(y.getRylx())!=null)
  4644 + rylx =dMap.get(y.getRylx()).toString();
4626 4645 }
4627 4646 }
4628 4647 }
4629 4648 }
4630 4649 }
4631 4650 }
4632   -
  4651 +
  4652 + map.put("rylx", "加注类别:"+rylx);
4633 4653 map.put("jzl", jzl);
4634 4654 map.put("yh", yh);
4635 4655 map.put("ccyl", ccyl);
... ...
src/main/resources/static/pages/electricity/list/list.html
  View file @377da8d
... ... @@ -281,7 +281,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
281 281 if ($("#rq").val() != "") {
282 282 var params=getParamsList();
283 283 $get('/ylb/checkDate',params,function(status){
284   - if(status=='2'){
  284 + if(status=='3'){
285 285 layer.msg('只能操作三天内数据.');
286 286 }else{
287 287 var i = layer.load(2);
... ... @@ -302,7 +302,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
302 302 if ($("#rq").val() != "") {
303 303 var params=getParamsList();
304 304 $get('/ylb/checkDate',params,function(status){
305   - if(status=='2'){
  305 + if(status=='3'){
306 306 layer.msg('只能操作三天内数据.');
307 307 }else{
308 308 var i = layer.load(2);
... ... @@ -322,7 +322,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
322 322 $("#saveButton").on('click',function(){
323 323 var params_=getParamsList();
324 324 $get('/ylb/checkDate',params_,function(status){
325   - if(status=='2'){
  325 + if(status=='3'){
326 326 layer.msg('只能操作三天内数据.');
327 327 }else{
328 328 var ylArray = [];
... ... @@ -434,7 +434,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
434 434 if ($("#rq").val() != "") {
435 435 var params=getParamsList();
436 436 $get('/ylb/checkDate',params,function(status){
437   - if(status=='2'){
  437 + if(status=='3'){
438 438 layer.msg('只能操作三天内数据.');
439 439 }else{
440 440 var i = layer.load(2);
... ... @@ -599,7 +599,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
599 599 var params=getParamsList();
600 600 var id = $(this).data('id');
601 601 $get('/ylb/checkDate',params,function(status){
602   - if(status=='2'){
  602 + if(status=='3'){
603 603 layer.msg('只能操作三天内数据.');
604 604 }else{
605 605 var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
... ... @@ -743,7 +743,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
743 743 $('#removeButton').on('click', function () {
744 744 var params_=getParamsList();
745 745 $get('/ylb/checkDate',params_,function(status){
746   - if(status=='2'){
  746 + if(status=='3'){
747 747 layer.msg('只能操作三天内数据.');
748 748 }else{
749 749 var idArray = [];
... ...
src/main/resources/static/pages/forms/mould/jd_daily.xls 0 → 100644
View file @377da8d
No preview for this file type
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
View file @377da8d
No preview for this file type
src/main/resources/static/pages/forms/statement/jd_daily.html 0 → 100644
  View file @377da8d
  1 +<style type="text/css">
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 + .table-bordered > thead > tr > th,
  5 + .table-bordered > thead > tr > td,
  6 + .table-bordered > tbody > tr > th,
  7 + .table-bordered > tbody > tr > td,
  8 + .table-bordered > tfoot > tr > th,
  9 + .table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 + .table-bordered > thead > tr > th,
  12 + .table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 + .table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +</style>
  18 +
  19 +<div class="page-head">
  20 + <div class="page-title">
  21 + <h1>班次日报表</h1>
  22 + </div>
  23 +</div>
  24 +
  25 +<div class="row">
  26 + <div class="col-md-12">
  27 + <div class="portlet light porttlet-fit bordered">
  28 + <div class="portlet-title">
  29 + <form class="form-inline" action="">
  30 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_daily">
  31 + <span class="item-label" style="width: 80px;">公司: </span>
  32 + <select class="form-control" name="company" id="gsdmDaily" style="width: 180px;"></select>
  33 + </div>
  34 + <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_daily">
  35 + <span class="item-label" style="width: 80px;">分公司: </span>
  36 + <select class="form-control" name="subCompany" id="fgsdmDaily" style="width: 180px;"></select>
  37 + </div>
  38 + <div style="margin-top: 2px"></div>
  39 + <div style="display: inline-block;margin-left: 33px;">
  40 + <span class="item-label" style="width: 80px;">线路: </span>
  41 + <select class="form-control" name="line" id="line" style="width: 180px;"></select>
  42 + </div>
  43 + <div style="display: inline-block;margin-left: 24px;">
  44 + <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
  45 + <input class="form-control" type="text" id="date" style="width: 180px;"/>
  46 + </div>
  47 + <div class="form-group">
  48 + <input class="btn btn-default" type="button" id="query" value="筛选"/>
  49 + <input class="btn btn-default" type="button" id="export" value="导出"/>
  50 + </div>
  51 + </form>
  52 + </div>
  53 + <div class="portlet-body">
  54 + <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
  55 + <table class="table table-bordered table-hover table-checkable" id="forms">
  56 + <thead>
  57 + <tr>
  58 + <th colspan="16">调度班次日报</th>
  59 + </tr>
  60 + <tr>
  61 + <td>线路</td>
  62 + <td colspan="7"><span id="form_line">&nbsp;</span></td>
  63 + <td>时间</td>
  64 + <td colspan="7"><span id="form_date">&nbsp;</span></td>
  65 + </tr>
  66 + <tr>
  67 + <td>路牌</td>
  68 + <td>车辆</td>
  69 + <td>工号</td>
  70 + <td>姓名</td>
  71 + <td>计划班次</td>
  72 + <td>计划营运里程</td>
  73 + <td>实际班次</td>
  74 + <td>实际营运里程</td>
  75 + <td>空驶里程</td>
  76 + <td>总里程</td>
  77 + <td>出场存油</td>
  78 + <td>进场存油</td>
  79 + <td>加注量</td>
  80 + <td>油耗</td>
  81 + <td>加注类别</td>
  82 + <td>电耗</td>
  83 + </tr>
  84 + </thead>
  85 + <tbody id="tbody">
  86 +
  87 + </tbody>
  88 + <!-- <tr>
  89 + <td colspan="3">小计</td>
  90 + <td><span id="total_zgl">&nbsp;</span></td>
  91 + <td><span id="total_ks">&nbsp;</span></td>
  92 + <td><span id="total_yh">&nbsp;</span></td>
  93 + <td><span id="total_bc">&nbsp;</span></td>
  94 + </tr> -->
  95 + </table>
  96 + </div>
  97 + </div>
  98 + </div>
  99 + </div>
  100 +</div>
  101 +
  102 +<script>
  103 + $(function(){
  104 +
  105 + // 关闭左侧栏
  106 + if (!$('body').hasClass('page-sidebar-closed'))
  107 + $('.menu-toggler.sidebar-toggler').click();
  108 +
  109 + $("#date").datetimepicker({
  110 + format : 'YYYY-MM-DD',
  111 + locale : 'zh-cn'
  112 + });
  113 + var fage=false;
  114 + var xlList;
  115 + var obj = [];
  116 +
  117 +
  118 + $.get('/report/lineList',function(result){
  119 + xlList=result;
  120 + $.get('/user/companyData', function(result){
  121 + obj = result;
  122 + var options = '';
  123 + for(var i = 0; i < obj.length; i++){
  124 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  125 + }
  126 +
  127 + if(obj.length ==0){
  128 + $("#gsdmDiv_daily").css('display','none');
  129 + }else if(obj.length ==1){
  130 + $("#gsdmDiv_daily").css('display','none');
  131 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  132 + $('#fgsdmDiv_daily').css('display','none');
  133 + }
  134 + $('#gsdmDaily').html(options);
  135 + updateCompany();
  136 + });
  137 + })
  138 + $("#gsdmDaily").on("change",updateCompany);
  139 + function updateCompany(){
  140 + var company = $('#gsdmDaily').val();
  141 + var options = '';
  142 + for(var i = 0; i < obj.length; i++){
  143 + if(obj[i].companyCode == company){
  144 + var children = obj[i].children;
  145 + for(var j = 0; j < children.length; j++){
  146 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  147 + }
  148 + }
  149 + }
  150 + $('#fgsdmDaily').html(options);
  151 + }
  152 +
  153 + var tempData = {};
  154 + $.get('/report/lineList',function(xlList){
  155 + var data = [];
  156 +// data.push({id: " ", text: "全部线路"});
  157 + $.get('/user/companyData', function(result){
  158 + for(var i = 0; i < result.length; i++){
  159 + var companyCode = result[i].companyCode;
  160 + var children = result[i].children;
  161 + for(var j = 0; j < children.length; j++){
  162 + var code = children[j].code;
  163 + for(var k=0;k < xlList.length;k++ ){
  164 + if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
  165 + data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
  166 + tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
  167 + }
  168 + }
  169 + }
  170 + }
  171 + initPinYinSelect2('#line',data,'');
  172 +
  173 + });
  174 + });
  175 +
  176 + $("#line").on("change", function(){
  177 + if($("#line").val() == " "){
  178 + $("#gsdmDaily").attr("disabled", false);
  179 + $("#fgsdmDaily").attr("disabled", false);
  180 + } else {
  181 + var temp = tempData[$("#line").val()].split(":");
  182 + $("#gsdmDaily").val(temp[0]);
  183 + updateCompany();
  184 + $("#fgsdmDaily").val(temp[1]);
  185 + $("#gsdmDaily").attr("disabled", true);
  186 + $("#fgsdmDaily").attr("disabled", true);
  187 + }
  188 + });
  189 +
  190 +
  191 + var line;
  192 + var date;
  193 + var gsdmDaily;
  194 + var fgsdmDaily;
  195 + var lineName=$("#select2-line-container").html();
  196 + $("#query").on("click",function(){
  197 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  198 + layer.msg("请选择时间");
  199 + return;
  200 + }
  201 + line = $("#line").val();
  202 + date = $("#date").val();
  203 + gsdmDaily=$("#gsdmDaily").val();
  204 + fgsdmDaily = $("#fgsdmDaily").val();
  205 + lineName=$("#select2-line-container").html();
  206 + var i = layer.load(2);
  207 + $get('/jdtest/daily',{ line:line,date:date,type:'query'},function(result){
  208 + $("#form_line").text(lineName);
  209 + $("#form_date").text(date);
  210 + // 把数据填充到模版中
  211 + var tbodyHtml = template('dailyJdtest',{list:result});
  212 + // 把渲染好的模版html文本追加到表格中
  213 + $('#tbody').html(tbodyHtml);
  214 + layer.close(i);
  215 + })
  216 + });
  217 +
  218 + $("#export").on("click",function(){
  219 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  220 + layer.msg("请选择时间");
  221 + return;
  222 + }
  223 + line = $("#line").val();
  224 + date = $("#date").val();
  225 + lineName=$("#select2-line-container").html();
  226 + var i = layer.load(2);
  227 + $get('/jdtest/daily',{line:line,date:date,type:'export',lineName:lineName},function(result){
  228 + window.open("/downloadFile/download?fileName="
  229 + +date+"-"+lineName+"-班次日报表");
  230 + layer.close(i);
  231 + });
  232 + });
  233 +});
  234 +</script>
  235 +<script type="text/html" id="dailyJdtest">
  236 + {{each list as obj i}}
  237 + <tr>
  238 + <td>{{obj.lp}}</td>
  239 + <td>{{obj.clZbh}}</td>
  240 + <td>{{obj.jGh}}</td>
  241 + <td>{{obj.jName}}</td>
  242 + <td>{{obj.jhbc}}</td>
  243 + <td>{{obj.jhlc}}</td>
  244 + <td>{{obj.sjbc}}</td>
  245 + <td>{{obj.sjzlc}}</td>
  246 + <td>{{obj.kszlc}}</td>
  247 + <td>{{obj.zlc}}</td>
  248 + <td>{{obj.czyl}}</td>
  249 + <td>{{obj.jzyl}}</td>
  250 + <td>{{obj.jzl}}</td>
  251 + <td>{{obj.yh}}</td>
  252 + <td>{{obj.rylx}}</td>
  253 + <td>&nbsp;</td>
  254 + </tr>
  255 + {{/each}}
  256 + {{if list.length == 0}}
  257 + <tr>
  258 + <td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
  259 + </tr>
  260 + {{/if}}
  261 +</script>
0 262 \ No newline at end of file
... ...
src/main/resources/static/pages/forms/statement/waybill.html
  View file @377da8d
... ... @@ -314,7 +314,7 @@
314 314 // 把渲染好的模版html文本追加到表格中
315 315 $('#forms .ludan_1').html(ludan_1);
316 316 });
317   - $get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  317 + $get('/realSchedule/queryListWaybill',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
318 318 getTime(result);
319 319 var ludan_2 = template('ludan_2',{list:result});
320 320 // 把渲染好的模版html文本追加到表格中
... ... @@ -335,7 +335,7 @@
335 335 return;
336 336 }
337 337 var i = layer.load(2);
338   - $get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  338 + $get('/realSchedule/exportWaybill',{jName:jName,jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
339 339 var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单";
340 340 window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName));
341 341 layer.close(i);
... ... @@ -438,8 +438,9 @@
438 438 <td colspan="2">出场存油 {{ccyl}}升</td>
439 439 <td colspan="2">加注量 {{jzl}}升</td>
440 440 <td colspan="2">进场存油 {{jcyl}}升</td>
441   - <td colspan="4">加注机油 &nbsp;升</td>
442   - <td colspan="4">本日耗油 {{yh}}升</td>
  441 + <td colspan="2">加注机油 &nbsp;升</td>
  442 + <td colspan="3">{{rylx}}</td>
  443 + <td colspan="3">本日耗油 {{yh}}升</td>
443 444 {{/if}}
444 445 {{if type==1}}
445 446 <td colspan="2">出场存电 {{ccyl}}%</td>
... ...
src/main/resources/static/pages/oil/add.html
  View file @377da8d
... ... @@ -116,7 +116,9 @@
116 116 <div class="col-md-4">
117 117 <select name="rylx" class="form-control">
118 118 <option value='0'>0号柴油</option>
119   - <option value='1'>负10号柴油</option>
  119 + <option value='1'>负10号柴油</option>
  120 + <option value='2'>B5-0号柴油</option>
  121 + <option value='3'>B5-负10号柴油</option>
120 122 </select>
121 123 </div>
122 124 </div>
... ...
src/main/resources/static/pages/oil/jyglList.html
  View file @377da8d
... ... @@ -64,17 +64,17 @@
64 64 <th width="8%">车辆</th>
65 65 <th width="14%">驾驶员</th>
66 66 <th width="5%">加注量</th>
67   - <th width="4%">加油站</th>
68   - <th width="3%">加油类型</th>
69   - <th width="5%">加油工工号</th>
70   - <th width="4%">路单工号</th>
71   - <th width="4%">备注</th>
  67 +<!-- <th width="4%">加油站</th> -->
  68 +<!-- <th width="3%">加油类型</th> -->
  69 +<!-- <th width="5%">加油工工号</th> -->
  70 + <th width="10%">路单工号</th>
  71 + <th width="8%">备注</th>
72 72 <th width="10%">操作</th>
73 73 </tr>
74 74 <tr role="row" class="filter">
75 75 <td></td>
76 76 <td>
77   - <input type="text" id="rq" class="form-control form-filter input-sm" name="rq">
  77 + <input type="text" id="rq" class="form-control" name="rq">
78 78 </td>
79 79 <td>
80 80 <select class="form-control" name="gsdm_like" id="jyglListGsdmId" ></select>
... ... @@ -91,9 +91,9 @@
91 91 <td></td>
92 92 <td></td>
93 93 <td></td>
94   - <td></td>
95   - <td></td>
96   - <td></td>
  94 +<!-- <td></td> -->
  95 +<!-- <td></td> -->
  96 +<!-- <td></td> -->
97 97 <td></td>
98 98 <td>
99 99 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
... ... @@ -142,7 +142,7 @@
142 142 onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
143 143 onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
144 144 </td>
145   - <td>
  145 + <!--<td>
146 146 <input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_stationid"
147 147 type="text" value="{{obj.stationid}}" style=" width:45px" />
148 148 </td>
... ... @@ -155,7 +155,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
155 155 <td>
156 156 <input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_jyggh"
157 157 type="text" value="{{obj.jyggh}}" style=" width:45px" />
158   - </td>
  158 + </td>-->
159 159  
160 160 <td>{{obj.ldgh}}</td>
161 161 <td>
... ... @@ -183,17 +183,17 @@ $(function(){
183 183 var id=$('.in_carpark_id[data-id='+nbbm+']', '#ll_jygl_list').val();
184 184 var jsy=$('.in_carpark_jsy[data-id='+nbbm+']', '#ll_jygl_list').val();
185 185 var jzl=$('.in_carpark_jzl[data-id='+nbbm+']','#ll_jygl_list').val();
186   - var stationid=$('.in_carpark_stationid[data-id='+nbbm+']','#ll_jygl_list').val();
  186 + /* var stationid=$('.in_carpark_stationid[data-id='+nbbm+']','#ll_jygl_list').val();
187 187 var nylx=$('.in_carpark_nylx[data-id='+nbbm+']','#ll_jygl_list').val();
188   - var jyggh=$('.in_carpark_jyggh[data-id='+nbbm+']','#ll_jygl_list').val();
  188 + var jyggh=$('.in_carpark_jyggh[data-id='+nbbm+']','#ll_jygl_list').val(); */
189 189 var bz=$('.in_carpark_bz[data-id='+nbbm+']','#ll_jygl_list').val();
190 190 map['nbbm']=nbbm;
191 191 map['id']=id;
192 192 map['jsy']=jsy;
193 193 map['jzl']=jzl;
194   - map['stationid']=stationid;
195   - map['nylx']=nylx;
196   - map['jyggh']=jyggh;
  194 +// map['stationid']=stationid;
  195 +// map['nylx']=nylx;
  196 +// map['jyggh']=jyggh;
197 197 map['bz']=bz;
198 198 ylArray.push(map);
199 199 })
... ... @@ -338,8 +338,8 @@ $(function(){
338 338 params['order'] = 'nbbm';
339 339 params['page'] = page;
340 340 params['rq']=$("#rq").val();
341   -
342   - var i = layer.load(2);;
  341 +// params['type']='1';
  342 + var i = layer.load(2);
343 343 /* var jyglGsdm=$("#jyglListGsdmId").val();
344 344 var jyglFgsdm=$("#jyglListFgsdmId").val();
345 345 if(jyglGsdm=="" || jyglGsdm==null){
... ... @@ -359,7 +359,7 @@ $(function(){
359 359 params['fgsdm_in']=fgsqx1;
360 360 }
361 361 } */
362   - $get('/cwjy/queryList' ,params, function(data){
  362 + $get('/cwjy/cwjyList' ,params, function(data){
363 363 $.each(data, function(i, obj) {
364 364 obj.yyrq = $("#rq").val();
365 365 });
... ... @@ -493,7 +493,6 @@ function editCyjy(nbbm){
493 493 }
494 494 //改变状态
495 495 function changeEnabled(id,enabled){
496   - debugger
497 496 $get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
498 497 jsDoQuery(null, true);
499 498 })
... ...
src/main/resources/static/pages/oil/list_ph.html
  View file @377da8d
... ... @@ -292,6 +292,8 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
292 292 <select data-id="{{obj.id}}" class="in_carpark_rylx" style=" width:100%" >
293 293 <option value='0' {{if obj.rylx==0}} selected = 'selected' {{/if}}>0号柴油</option>
294 294 <option value='1' {{if obj.rylx==1}} selected = 'selected' {{/if}}>负10号柴油</option>
  295 + <option value='2' {{if obj.rylx==2}} selected = 'selected' {{/if}}>B5-0号柴油</option>
  296 + <option value='3' {{if obj.rylx==3}} selected = 'selected' {{/if}}>B5-负10号柴油</option>
295 297 </select>
296 298 </td>
297 299 <td width="4%">
... ... @@ -353,7 +355,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
353 355 if ($("#rq").val() != "") {
354 356 var params=getParamsList();
355 357 $get('/ylb/checkDate',params,function(status){
356   - if(status=='2'){
  358 + if(status=='3'){
357 359 layer.msg('只能操作三天内数据.');
358 360 }else{
359 361 var i = layer.load(2);
... ... @@ -375,7 +377,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
375 377 if ($("#rq").val() != "") {
376 378 var params=getParamsList();
377 379 $get('/ylb/checkDate',params,function(status){
378   - if(status=='2'){
  380 + if(status=='3'){
379 381 layer.msg('只能操作三天内数据.');
380 382 }else{
381 383 var i = layer.load(2);
... ... @@ -395,7 +397,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
395 397  
396 398 var params_=getParamsList();
397 399 $get('/ylb/checkDate',params_,function(status){
398   - if(status=='2'){
  400 + if(status=='3'){
399 401 layer.msg('只能操作三天内数据.');
400 402 }else{
401 403 var ylArray = [];
... ... @@ -459,7 +461,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
459 461 if ($("#rq").val() != "") {
460 462 var params_=getParamsList();
461 463 $get('/ylb/checkDate',params_,function(status){
462   - if(status=='2'){
  464 + if(status=='3'){
463 465 layer.msg('只能操作三天内数据.');
464 466 }else{
465 467 //拆分前先保存全部
... ... @@ -627,7 +629,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
627 629 if ($("#rq").val() != "") {
628 630 var params=getParamsList();
629 631 $get('/ylb/checkDate',params,function(status){
630   - if(status=='2'){
  632 + if(status=='3'){
631 633 layer.msg('只能操作三天内数据.');
632 634 }else{
633 635 var i = layer.load(2);
... ... @@ -784,7 +786,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
784 786 var params=getParamsList();
785 787 $get('/ylb/checkDate',params,function(status){
786 788 var id = $(this).data('id');
787   - if(status=='2'){
  789 + if(status=='3'){
788 790 layer.msg('只能操作三天内数据.');
789 791 }else{
790 792 var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();
... ... @@ -921,7 +923,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
921 923 $('.removeButton').on('click', function () {
922 924 var params_=getParamsList();
923 925 $get('/ylb/checkDate',params_,function(status){
924   - if(status=='2'){
  926 + if(status=='3'){
925 927 layer.msg('只能操作三天内数据.');
926 928 }else{
927 929 var idArray = [];
... ...