潘钊 / bsth_control · Commits

Commit 8a1d0ab41bb9e379ac9eedad6e12983dd92549c9

Authored by 廖磊
1 parent fc20d76f

电量平衡表添加新增删除 

月存油报表添加分公司
Inline Side-by-side
Showing 11 changed files with 658 additions and 45 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
  View file @8a1d0ab
... ... @@ -2,6 +2,7 @@ package com.bsth.controller.oil;
2 2  
3 3 import java.text.SimpleDateFormat;
4 4 import java.util.ArrayList;
  5 +import java.util.Date;
5 6 import java.util.HashMap;
6 7 import java.util.Iterator;
7 8 import java.util.List;
... ... @@ -194,4 +195,30 @@ public class DlbController extends BaseController<Dlb, Integer>{
194 195  
195 196 }
196 197  
  198 +
  199 + @RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
  200 + public String checkJsy(@RequestParam Map<String, Object> map){
  201 + String list=service.checkJsy(map);
  202 + return list;
  203 + }
  204 +
  205 + @RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
  206 + public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
  207 + Map<String, Object> maps=new HashMap<String, Object>();
  208 + try {
  209 + maps= service.deleteIds(map);
  210 + } catch (Exception e) {
  211 + // TODO Auto-generated catch block
  212 + e.printStackTrace();
  213 + }
  214 + return maps;
  215 + }
  216 +
  217 + @RequestMapping(value = "/saveDlb",method = RequestMethod.POST)
  218 + public Map<String, Object> saveDlb(Dlb t){
  219 +// SysUser user = SecurityUtils.getCurrentUser();
  220 + t.setCreatetime(new Date());
  221 +// Ylb t=new Ylb();
  222 + return service.saveDlb(t);
  223 + }
197 224 }
... ...
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @8a1d0ab
... ... @@ -209,8 +209,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
209 209 return maps;
210 210 }
211 211 @RequestMapping(value="/oilListMonth")
212   - public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date,@RequestParam String type){
213   - return yblService.oilListMonth(line, date, type);
  212 + public List<Ylb> oilListMonth(@RequestParam Map<String, Object> map){
  213 + return yblService.oilListMonth(map);
214 214 }
215 215  
216 216 @RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
... ...
src/main/java/com/bsth/service/oil/DlbService.java
  View file @8a1d0ab
... ... @@ -20,4 +20,12 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
20 20 Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception;
21 21  
22 22 String obtainDsq() throws Exception;
  23 +
  24 + String checkJsy(Map<String, Object> map);
  25 +
  26 + Map<String, Object> saveDlb(Dlb t);
  27 +
  28 + Map<String, Object> deleteIds(Map<String, Object> map) throws Exception;
  29 +
  30 +
23 31 }
... ...
src/main/java/com/bsth/service/oil/YlbService.java
  View file @8a1d0ab
... ... @@ -19,7 +19,7 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
19 19  
20 20 Map<String, Object> sumYlb(Map<String, Object> map);
21 21 String checkJsy(Map<String, Object> map);
22   - List<Ylb> oilListMonth(String line,String date,String type);
  22 + List<Ylb> oilListMonth(Map<String, Object> map);
23 23 List<Ylb> listYlb(Map<String, Object> map);
24 24 StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
25 25  
... ...
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
  View file @8a1d0ab
... ... @@ -1032,6 +1032,87 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
1032 1032  
1033 1033 return lists;
1034 1034 }
  1035 +
  1036 +
  1037 + @Override
  1038 + public String checkJsy(Map<String, Object> map) {
  1039 + // TODO Auto-generated method stub
  1040 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  1041 + String rq=map.get("date").toString();
  1042 + String nbbm=map.get("nbbm").toString();
  1043 + String jsy =map.get("jsy").toString();
  1044 + String xlbm=map.get("xlbm").toString();
  1045 + List<Dlb> list= repository.queryListDlb(rq, nbbm, jsy, xlbm);
  1046 + String type="1";
  1047 + if(list.size()>0){
  1048 + type="0";
  1049 + }
  1050 + return type;
  1051 + }
  1052 +
  1053 + @Override
  1054 + public Map<String, Object> saveDlb(Dlb t) {
  1055 + // TODO Auto-generated method stub
  1056 + Map<String, Object> map = new HashMap<>();
  1057 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  1058 + String rq=sdf.format(t.getRq());
  1059 + String gsdm=t.getSsgsdm();
  1060 + String fgsdm=t.getFgsdm();
  1061 + String xlbm=t.getXlbm();
  1062 + String jhsj=t.getJhsj();
  1063 + String jsy=t.getJsy();
  1064 + String nbbm=t.getNbbm();
  1065 + int sfkt=t.getSfkt();
  1066 + t.setCreatetime(new Date());
  1067 + String[] jhsjStr = jhsj.split(":");
  1068 + long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
  1069 + List<Dlb> list=this.listOrderBy(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
  1070 +// repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
  1071 + int jcsx=1;
  1072 + if(list.size()>0){
  1073 + for (int i = 0; i < list.size(); i++) {
  1074 + Dlb y=list.get(i);
  1075 + String[] fcsjStr = y.getJhsj().split(":");
  1076 + long fcsj=Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
  1077 + if(fcsjL>fcsj){
  1078 + jcsx=jcsx+y.getJcsx();
  1079 + }else{
  1080 + y.setJcsx(y.getJcsx()+1);
  1081 + repository.save(y);
  1082 + }
  1083 + }
  1084 +
  1085 + }
  1086 + t.setJcsx(jcsx);
  1087 + repository.save(t);
  1088 + map.put("status", ResponseCode.SUCCESS);
  1089 + map.put("t", t);
  1090 + return map;
  1091 + }
  1092 +
  1093 + @Transactional
  1094 + @Override
  1095 + public Map<String, Object> deleteIds(Map<String, Object> map) throws Exception{
  1096 + // TODO Auto-generated method stub
  1097 + Map<String, Object> maps = new HashMap<>();
  1098 + try{
  1099 + String json =StringEscapeUtils.unescapeHtml4(map.get("ids").toString());
  1100 + JSONArray jsonArray=JSONArray.parseArray(json);
  1101 + JSONObject jsonObject;
  1102 + for (int x = 0; x < jsonArray.size(); x++) {
  1103 + jsonObject=jsonArray.getJSONObject(x);
  1104 + Integer id =jsonObject.getInteger("id");
  1105 + repository.delete(id);
  1106 + }
  1107 + maps.put("status", ResponseCode.SUCCESS);
  1108 + } catch (Exception e) {
  1109 + maps.put("status", ResponseCode.ERROR);
  1110 + logger.error("save erro.", e);
  1111 + throw e;
  1112 + }
  1113 + return maps;
  1114 + }
  1115 +
1035 1116 }
1036 1117  
1037 1118 class NbbmJcsxMap implements Comparator<Map<String, Object>>{
... ...
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @8a1d0ab
... ... @@ -977,17 +977,24 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
977 977  
978 978  
979 979 @Override
980   - public List<Ylb> oilListMonth(String line, String date, String type) {
  980 + public List<Ylb> oilListMonth(Map<String, Object> map) {
  981 + String type=map.get("type").toString();
  982 + String date=map.get("date").toString().trim();
  983 + String gsdm=map.get("gsdm").toString();
  984 + String fgsdm=map.get("fgsdm").toString();
981 985 String date2=date.substring(0, 8)+"01";
982 986 String lineStr="";
  987 + String line =map.get("line").toString().trim();
983 988 if(line !=null && !line.equals("")){
984 989 lineStr =" and xlbm= '"+ line +"'";
  990 + }else{
  991 + lineStr =" and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"' ";
985 992 }
986 993 String sql="select a.nbbm,a.rq,a.jzyl from (" +
987 994 " select x.nbbm,max(x.rq) as rq,max(x.jcsx) as jcsx from "
988 995 + "(select nbbm,rq,max(jcsx) as jcsx from bsth_c_ylb where rq between '"
989 996 + date2 +"' and '" + date+"' "+lineStr
990   - + "group by nbbm,rq) x group by x.nbbm ) b"
  997 + + " group by nbbm,rq) x group by x.nbbm ) b"
991 998 + " left join (select nbbm,rq,jzyl,jcsx FROM bsth_c_ylb "
992 999 + " where rq between '"
993 1000 + date2 +"' and '" + date+"' "+lineStr
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @8a1d0ab
... ... @@ -2775,25 +2775,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2775 2775 }
2776 2776 for (int i = 0; i < newList.size(); i++) {
2777 2777 ScheduleRealInfo t1 = newList.get(i);
2778   - String reamrks1=t1.getRemarks()==null?"":t1.getRemarks();
2779   - if(reamrks1.length()>5){
2780   - t1.setRemarks(reamrks1.substring(0, 5));
2781   - t1.setRemark(reamrks1);
2782   - }
2783 2778 for (int j = 0; j < list.size(); j++) {
2784 2779 ScheduleRealInfo t2 = list.get(j);
2785   - String reamrks2=t2.getRemarks()==null?"":t2.getRemarks();
2786   - if(reamrks2.length()>5){
2787   - t2.setRemarks(reamrks2.substring(0, 5));
2788   - t2.setRemark(reamrks2);
2789   - }else{
2790   - t2.setRemark(reamrks2);
2791   - }
2792 2780 if (t1.getId() == t2.getId()) {
2793 2781 t1 = t2;
2794 2782 }
2795 2783 }
2796 2784 }
  2785 +
  2786 + for (int i = 0; i < newList.size(); i++) {
  2787 + ScheduleRealInfo t1=newList.get(i);
  2788 + String reamrks1=t1.getRemarks()==null?"":t1.getRemarks();
  2789 + if(reamrks1.length()>4){
  2790 + t1.setRemarks(reamrks1.substring(0,4));
  2791 + t1.setRemark(reamrks1);
  2792 + }else{
  2793 + t1.setRemark(reamrks1);
  2794 + }
  2795 + }
2797 2796 return newList;
2798 2797 }
2799 2798  
... ... @@ -2973,28 +2972,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2973 2972 yesterdayDataList.get(x).put("totalKilometers", zlc);
2974 2973  
2975 2974 }
2976   - List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
  2975 + /* List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
2977 2976  
2978 2977 for (int i = 0; i < yesterdayDataList.size(); i++) {
2979 2978 Map<String, Object> map=yesterdayDataList.get(i);
2980 2979 Double zlc=map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString());
2981   - if(zlc>0){
  2980 +// if(zlc>0){
2982 2981 yesterdayDataLists.add(map);
2983   - }
2984   - }
  2982 +// }
  2983 + }*/
2985 2984 //增加顺序号
2986   - for (int i = 0; i < yesterdayDataLists.size(); i++) {
  2985 + for (int i = 0; i < yesterdayDataList.size(); i++) {
2987 2986 if (i == 0) {
2988   - yesterdayDataLists.get(i).put("seqNumber", 1);
  2987 + yesterdayDataList.get(i).put("seqNumber", 1);
2989 2988 } else {
2990   - if (yesterdayDataLists.get(i - 1).get("clZbh").equals(yesterdayDataLists.get(i).get("clZbh"))) {
2991   - yesterdayDataLists.get(i).put("seqNumber", 1 + (int) yesterdayDataLists.get(i - 1).get("seqNumber"));
  2989 + if (yesterdayDataList.get(i - 1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))) {
  2990 + yesterdayDataList.get(i).put("seqNumber", 1 + (int) yesterdayDataList.get(i - 1).get("seqNumber"));
2992 2991 } else {
2993   - yesterdayDataLists.get(i).put("seqNumber", 1);
  2992 + yesterdayDataList.get(i).put("seqNumber", 1);
2994 2993 }
2995 2994 }
2996 2995 }
2997   - return yesterdayDataLists;
  2996 + return yesterdayDataList;
2998 2997 }
2999 2998  
3000 2999 /**
... ...
src/main/resources/static/pages/electricity/list/add.html 0 → 100644
  View file @8a1d0ab
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>进出站电量量信息编辑</h1>
  4 + </div>
  5 +</div>
  6 +
  7 +<ul class="page-breadcrumb breadcrumb">
  8 + <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
  9 + <li><span class="active">用电管理</span> <i class="fa fa-circle"></i></li>
  10 + <li><a href="list.html" data-pjax>进出场电量</a> <i class="fa fa-circle"></i></li>
  11 + <li><span class="active">进出站电量信息编辑</span></li>
  12 +</ul>
  13 +
  14 +<div class="portlet light bordered">
  15 + <div class="portlet-title">
  16 + <div class="caption">
  17 + <i class="icon-equalizer font-red-sunglo"></i> <span
  18 + class="caption-subject font-red-sunglo bold uppercase">表单</span>
  19 + </div>
  20 + </div>
  21 + <div class="portlet-body form">
  22 + <form action="/addYlb" class="form-horizontal" id="ylb_add_form" >
  23 +
  24 + <div class="alert alert-danger display-hide">
  25 + <button class="close" data-close="alert"></button>
  26 + 您的输入有误，请检查下面的输入项
  27 + </div>
  28 + <input type="hidden" value="0" name="yhlx" />
  29 + <div class="form-body">
  30 + <div class="form-group">
  31 + <label class="col-md-3 control-label">公司</label>
  32 + <div class="col-md-4">
  33 + <select class="form-control" name="ssgsdm" id="ssgsdm" ></select>
  34 + </div>
  35 + </div>
  36 + <div class="form-group">
  37 + <label class="col-md-3 control-label">分公司</label>
  38 + <div class="col-md-4">
  39 + <select class="form-control" name="fgsdm" id="fgsdm" ></select>
  40 + </div>
  41 + </div>
  42 + <div class="form-group">
  43 + <label class="col-md-3 control-label">线路</label>
  44 + <div class="col-md-4">
  45 + <select class="form-control" name="xlbm" id="xlbm" ></select>
  46 + </div>
  47 + </div>
  48 + <div class="form-group">
  49 + <label class="col-md-3 control-label">内部编码</label>
  50 + <div class="col-md-4">
  51 + <select class="form-control" name="nbbm" id="nbbm" ></select>
  52 + </div>
  53 + </div>
  54 + <div class="form-group">
  55 + <label class="col-md-3 control-label">日期</label>
  56 + <div class="col-md-4">
  57 + <input type="text" class="form-control" name="rq" id="date">
  58 + <label>跨天营运</label>
  59 + <select id="sfkt" name="sfkt">
  60 + <option value="0">否</option>
  61 + <option value="1">是</option>
  62 + </select>
  63 + </div>
  64 + </div>
  65 + <div class="form-group">
  66 + <label class="col-md-3 control-label">开始营运时间</label>
  67 + <div class="col-md-4">
  68 + <input type="time" class="form-control" name="jhsj" >
  69 + <span class="help-block"> 如：12:12</span>
  70 + </div>
  71 + </div>
  72 + <div class="form-group">
  73 + <label class="col-md-3 control-label">驾驶员</label>
  74 + <div class="col-md-4">
  75 + <select class="form-control" name="jsy" id="jsy"> </select>
  76 + </div>
  77 + </div>
  78 +
  79 + <div class="form-group">
  80 + <label class="col-md-3 control-label">出场里程</label>
  81 + <div class="col-md-4">
  82 + <input type="text" value="0" class="form-control" name="czlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  83 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
  84 + </div>
  85 + </div>
  86 +
  87 + <div class="form-group">
  88 + <label class="col-md-3 control-label">出场电量%</label>
  89 + <div class="col-md-4">
  90 + <input type="text" value="100" class="form-control" name="czcd" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  91 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
  92 + </div>
  93 + </div>
  94 +
  95 + <div class="form-group">
  96 + <label class="col-md-3 control-label">充电量</label>
  97 + <div class="col-md-4">
  98 + <input type="text" value="0" class="form-control" name="cdl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  99 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
  100 + </div>
  101 + </div>
  102 +
  103 + <div class="form-group">
  104 + <label class="col-md-3 control-label">进场电量%</label>
  105 + <div class="col-md-4">
  106 + <input type="text" value="100" class="form-control" name="jzcd" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  107 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
  108 + </div>
  109 + </div>
  110 +
  111 + <div class="form-group">
  112 + <label class="col-md-3 control-label">耗电量</label>
  113 + <div class="col-md-4">
  114 + <input type="text" value="0" class="form-control" name="hd" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  115 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
  116 + </div>
  117 + </div>
  118 +
  119 + <div class="form-group">
  120 + <label class="col-md-3 control-label">尿素</label>
  121 + <div class="col-md-4">
  122 + <input type="text" value="0" class="form-control" name="ns" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  123 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
  124 + </div>
  125 + </div>
  126 +
  127 + <div class="form-group">
  128 + <label class="col-md-3 control-label">进场里程</label>
  129 + <div class="col-md-4">
  130 + <input type="text" value="0" class="form-control" name="jzlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  131 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
  132 + </div>
  133 + </div>
  134 + <div class="form-group">
  135 + <label class="col-md-3 control-label">损耗原因</label>
  136 + <div class="col-md-4">
  137 + <select class="form-control" name="shyy">
  138 + <option value='0'>请选择</option>
  139 + <option value='1'>票务用油</option>
  140 + <option value='2'>保养用油</option>
  141 + <option value='3'>报废车用油</option>
  142 + <option value='4'>其它用油</option>
  143 + <option value='5'>人保部</option>
  144 + <option value='6'>车队</option>
  145 + <option value='7'>车间(高保)</option>
  146 + <option value='8'>车间(小修)</option>
  147 + </select>
  148 + </div>
  149 + </div>
  150 + <div class="form-group">
  151 + <label class="col-md-3 control-label">损耗电量</label>
  152 + <div class="col-md-4">
  153 + <input type="text" value="0" class="form-control" name="sh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  154 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
  155 + </div>
  156 + </div>
  157 + <div class="form-group">
  158 + <label class="col-md-3 control-label">行驶总里程</label>
  159 + <div class="col-md-4">
  160 + <input type="text" value="0" class="form-control" name="zlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
  161 + onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
  162 + </div>
  163 + </div>
  164 +
  165 +
  166 + </div>
  167 + <div class="form-actions">
  168 + <div class="row">
  169 + <div class="col-md-offset-3 col-md-4">
  170 + <button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
  171 + <a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
  172 + </div>
  173 + </div>
  174 + </div>
  175 + </form>
  176 + <!-- END FORM-->
  177 + </div>
  178 +</div>
  179 +<script>
  180 +(function(){
  181 + var fage=false;
  182 + var obj = [];
  183 + var xlList;
  184 + $.get('/report/lineList',function(result){
  185 + xlList=result;
  186 + $.get('/user/companyData', function(result){
  187 + obj = result;
  188 + var options = '';
  189 + for(var i = 0; i < obj.length; i++){
  190 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  191 + }
  192 + $('#ssgsdm').html(options);
  193 +
  194 + updateCompany();
  195 + });
  196 + });
  197 +
  198 + $("#ssgsdm").on("change",updateCompany);
  199 + function updateCompany(){
  200 + var company = $('#ssgsdm').val();
  201 + var options = '';
  202 + for(var i = 0; i < obj.length; i++){
  203 + if(obj[i].companyCode == company){
  204 + var children = obj[i].children;
  205 + for(var j = 0; j < children.length; j++){
  206 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  207 + }
  208 + }
  209 + }
  210 + $('#fgsdm').html(options);
  211 + initXl();
  212 + selectNbbm();
  213 + selectJsy();
  214 + }
  215 + $("#fgsdm").on("change",initXl);
  216 + function initXl(){
  217 + var data=[];
  218 + if(fage){
  219 + $("#xlbm").select2("destroy").html('');
  220 + }
  221 + var fgs=$('#fgsdm').val();
  222 + var gs=$('#ssgsdm').val();
  223 + for(var i=0;i<xlList.length;i++){
  224 + if(gs!=""){
  225 + if(fgs!=""){
  226 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  227 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  228 + }
  229 + }else{
  230 + if(xlList[i]["gsbm"]==gs){
  231 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  232 + }
  233 + }
  234 + }
  235 + }
  236 + initPinYinSelect2('#xlbm',data,'');
  237 + fage=true;
  238 + selectNbbm();
  239 + selectJsy();
  240 + }
  241 + $("#date").datetimepicker({
  242 + format : 'YYYY-MM-DD',
  243 + locale : 'zh-cn'
  244 + });
  245 +
  246 + function selectNbbm(){
  247 + $('#nbbm').select2({
  248 + placeholder: '搜索车辆...',
  249 + ajax: {
  250 + url: '/report/carList',
  251 + dataType: 'json',
  252 + delay: 150,
  253 + data: function(params){
  254 + return{nbbm: params.term,
  255 + gsbm:$('#ssgsdm').val(),
  256 + fgsbm:$('#fgsdm').val(),
  257 + xlbm:""
  258 + };
  259 + },
  260 + processResults: function (data) {
  261 + return {
  262 + results: data
  263 + };
  264 + },
  265 + cache: true
  266 + },
  267 + templateResult: function(repo){
  268 + if (repo.loading) return repo.text;
  269 + var h = '<span>'+repo.text+'</span>';
  270 + h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</span>':'');
  271 + return h;
  272 + },
  273 + escapeMarkup: function (markup) { return markup; },
  274 + minimumInputLength: 1,
  275 + templateSelection: function(repo){
  276 + return repo.text;
  277 + },
  278 + language: {
  279 + noResults: function(){
  280 + return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
  281 + },
  282 + inputTooShort : function(e) {
  283 + return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
  284 + },
  285 + searching : function() {
  286 + return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
  287 + }
  288 + }
  289 + })
  290 + }
  291 +
  292 +
  293 + function selectJsy(){
  294 + $('#jsy').select2({
  295 + placeholder: '搜索驾驶员...',
  296 + ajax: {
  297 + url: '/report/userList',
  298 + dataType: 'json',
  299 + delay: 150,
  300 + data: function(params){
  301 + return{jsy: params.term,gsbm:$('#ssgsdm').val()};
  302 + },
  303 + processResults: function (data) {
  304 + return {
  305 + results: data
  306 + };
  307 + },
  308 + cache: true
  309 + },
  310 + templateResult: function(repo){
  311 + if (repo.loading) return repo.text;
  312 + var h = '<span>'+repo.text+'</span>';
  313 + return h;
  314 + },
  315 + escapeMarkup: function (markup) { return markup; },
  316 + minimumInputLength: 1,
  317 + templateSelection: function(repo){
  318 + return repo.text;
  319 + },
  320 + language: {
  321 + noResults: function(){
  322 + return '<span style="color:red;font-size: 12px;">没有搜索到驾驶员！</span>';
  323 + },
  324 + inputTooShort : function(e) {
  325 + return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入工号搜索驾驶员</span>';
  326 + },
  327 + searching : function() {
  328 + return '<span style="color:gray;font-size: 12px;"> 正在搜索驾驶员...</span>';
  329 + }
  330 + }
  331 + });
  332 + }
  333 + $(function(){
  334 + /* $get('/role/all',null,function(result){
  335 + $.each(result,function(i,obj){
  336 + $("#role").append("<option value='"+obj.id+"'>"+obj.roleName+"</option>");
  337 + });
  338 + }); */
  339 +
  340 + var form = $('#ylb_add_form');
  341 + var error = $('.alert-danger', form);
  342 +
  343 + //表单 validate
  344 + form.validate({
  345 + errorElement : 'span',
  346 + errorClass : 'help-block help-block-error',
  347 + focusInvalid : false,
  348 + rules : {
  349 + 'xlbm' : {
  350 + required : true,
  351 + maxlength: 25
  352 + },
  353 + 'nbbm' : {
  354 + required : true,
  355 + maxlength: 25
  356 + },
  357 + 'rq' : {
  358 + required : true,
  359 + maxlength: 25
  360 + },
  361 + 'jsy' : {
  362 + required : true,
  363 + maxlength: 20
  364 + }
  365 + },
  366 + invalidHandler : function(event, validator) {
  367 + error.show();
  368 + App.scrollTo(error, -200);
  369 + },
  370 +
  371 + highlight : function(element) {
  372 + $(element).closest('.form-group').addClass('has-error');
  373 + },
  374 +
  375 + unhighlight : function(element) {
  376 + $(element).closest('.form-group').removeClass('has-error');
  377 + },
  378 +
  379 + success : function(label) {
  380 + label.closest('.form-group').removeClass('has-error');
  381 + },
  382 +
  383 + submitHandler : function(f) {
  384 + var params = form.serializeJSON();
  385 + error.hide();
  386 + var nbbm=$("#nbbm").val();
  387 + var date=$("#date").val();
  388 + var jsy=$("#jsy").val();
  389 + var xlbm=$("#xlbm").val();
  390 + var map={};
  391 + map["nbbm"]=nbbm;
  392 + map["date"]=date;
  393 + map["jsy"]=jsy;
  394 + map["xlbm"]=xlbm;
  395 + //检查一下用户是否存在
  396 + $get('/dlb/checkJsy', map, function(fage){
  397 + if(fage=="0"){
  398 + layer.msg('该驾驶员当天已存在.');
  399 + }else{
  400 + $post('/dlb/saveDlb', params, function(){
  401 + layer.msg('添加信息成功.');
  402 + loadPage('list.html');
  403 + });
  404 + }
  405 + });
  406 + }
  407 + });
  408 + });
  409 +})();
  410 +</script>
0 411 \ No newline at end of file
... ...
src/main/resources/static/pages/electricity/list/list.html
  View file @8a1d0ab
... ... @@ -23,6 +23,9 @@
23 23 <button type="button" class="btn btn-circle blue" id="saveButton"><i class="fa fa-minus-square"></i>
24 24 保存
25 25 </button>
  26 + <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
  27 + <button type="button" class="btn btn-circle blue" id="removeButton"><i class="fa fa-trash-o"></i> 删除</button>
  28 +
26 29 <button type="button" class="btn btn-circle blue" id="obtain"><i class="fa fa-hourglass-half"></i>
27 30 获取加/存电信息
28 31 </button>
... ... @@ -677,7 +680,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
677 680 }
678 681  
679 682  
680   - //删除
  683 + //删除
681 684 $('#removeButton').on('click', function () {
682 685 var idArray = [];
683 686 var x=0;
... ... @@ -697,7 +700,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
697 700 if(confirm('确定要删除选中的数据？'))
698 701 {
699 702 var i = layer.load(2);
700   - $post('/ylb/deleteIds', params, function (result) {
  703 + $post('/dlb/deleteIds', params, function (result) {
701 704 layer.close(i);
702 705 var params=getParamsList();
703 706 jsDoQuery(params, true);
... ... @@ -705,17 +708,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
705 708 }
706 709 }
707 710 });
708   -
709   - //搜索线路
710   - /* $.get('/basic/lineCode2Name',function(result){
711   - var data=[];
712   - data.push({id: " ", text: "全部线路"});
713   - for(var code in result){
714   - data.push({id: code, text: result[code]});
715   - }
716   - initPinYinSelect2('#xlbm',data,'');
717   -
718   - }) */
719 711  
720 712  
721 713 $("#ylbListFgsdmId").on("change",initXl);
... ...
src/main/resources/static/pages/oil/add.html
  View file @8a1d0ab
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>进场站油量信息编辑</h1>
  3 + <h1>进出站油量信息编辑</h1>
4 4 </div>
5 5 </div>
6 6  
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
9 9 <li><span class="active">用油管理</span> <i class="fa fa-circle"></i></li>
10   - <li><a href="list_ph.html" data-pjax>进场场油量</a> <i class="fa fa-circle"></i></li>
11   - <li><span class="active">进场站油量信息编辑</span></li>
  10 + <li><a href="list_ph.html" data-pjax>进出场油量</a> <i class="fa fa-circle"></i></li>
  11 + <li><span class="active">进出站油量信息编辑</span></li>
12 12 </ul>
13 13  
14 14 <div class="portlet light bordered">
... ...
src/main/resources/static/pages/report/oil/oilListMonth.html
  View file @8a1d0ab
... ... @@ -27,6 +27,14 @@
27 27 <div class="portlet light porttlet-fit bordered">
28 28 <div class="portlet-title">
29 29 <form class="form-inline" action="">
  30 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
  31 + <span class="item-label" style="width: 80px;">公司: </span>
  32 + <select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
  33 + </div>
  34 + <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv">
  35 + <span class="item-label" style="width: 80px;">分公司: </span>
  36 + <select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
  37 + </div>
30 38 <div style="display: inline-block;">
31 39 <span class="item-label" style="width: 80px;">时间: </span>
32 40 <input class="form-control" type="text" id="date" style="width: 180px;"/>
... ... @@ -105,7 +113,7 @@
105 113 $("#date").val(year + "-0" + month + "-" + day);
106 114 }
107 115  
108   - var tempData = {};
  116 + /* var tempData = {};
109 117 $.get('/report/lineList',function(xlList){
110 118 var data = [];
111 119 $.get('/user/companyData', function(result){
... ... @@ -125,7 +133,86 @@
125 133 initPinYinSelect2('#line',data,'');
126 134  
127 135 });
  136 + }); */
  137 + var fage=false;
  138 + var obj = [];
  139 + var xlList;
  140 + $.get('/report/lineList',function(result){
  141 + xlList=result;
  142 +
  143 + $.get('/user/companyData', function(result){
  144 + obj = result;
  145 + console.log(obj);
  146 + var options = '';
  147 + for(var i = 0; i < obj.length; i++){
  148 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  149 + }
  150 +
  151 + if(obj.length ==0){
  152 + $("#gsdmDiv").css('display','none');
  153 + }else if(obj.length ==1){
  154 + $("#gsdmDiv").css('display','none');
  155 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  156 + $('#fgsdmDiv').css('display','none');
  157 + }
  158 + $('#gsdm').html(options);
  159 +
  160 + updateCompany();
  161 + });
128 162 });
  163 +
  164 + $("#gsdm").on("change",updateCompany);
  165 + function updateCompany(){
  166 + var company = $('#gsdm').val();
  167 + var options = '';
  168 + for(var i = 0; i < obj.length; i++){
  169 + if(obj[i].companyCode == company){
  170 + var children = obj[i].children;
  171 + for(var j = 0; j < children.length; j++){
  172 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  173 + }
  174 + }
  175 + }
  176 + $('#fgsdm').html(options);
  177 +
  178 + var tempData = {};
  179 + $.get('/report/lineList',function(xlList){
  180 + var data = [];
  181 + data.push({id: " ", text: "全部线路"});
  182 + $.get('/user/companyData', function(result){
  183 + for(var i = 0; i < result.length; i++){
  184 + var companyCode = result[i].companyCode;
  185 + var children = result[i].children;
  186 + for(var j = 0; j < children.length; j++){
  187 + var code = children[j].code;
  188 + for(var k=0;k < xlList.length;k++ ){
  189 + if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
  190 + data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
  191 + tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
  192 + }
  193 + }
  194 + }
  195 + }
  196 + initPinYinSelect2('#line',data,'');
  197 +
  198 + });
  199 + });
  200 +
  201 + $("#line").on("change", function(){
  202 + if($("#line").val() == " "){
  203 + $("#gsdm").attr("disabled", false);
  204 + $("#fgsdm").attr("disabled", false);
  205 + } else {
  206 + var temp = tempData[$("#line").val()].split(":");
  207 + $("#gsdm").val(temp[0]);
  208 + updateCompany();
  209 + $("#fgsdm").val(temp[1]);
  210 + $("#gsdm").attr("disabled", true);
  211 + $("#fgsdm").attr("disabled", true);
  212 + }
  213 + });
  214 + }
  215 +
129 216  
130 217  
131 218 //查询
... ... @@ -136,7 +223,9 @@
136 223 }
137 224 var line = $("#line").val();
138 225 var date = $("#date").val();
139   - $get('/ylb/oilListMonth',{line:line,date:date,type:'query'},function(result){
  226 + var gsdm = $("#gsdm").val();
  227 + var fgsdm = $("#fgsdm").val();
  228 + $get('/ylb/oilListMonth',{line:line,date:date,gsdm:gsdm,fgsdm,fgsdm,type:'query'},function(result){
140 229 // $.each(result, function(i, obj) {
141 230 // obj.rq = moment(obj.rq).format("DD");
142 231 // });
... ...