潘钊 / bsth_control · Commits

Commit 1545a2553b080364493dbed131e3c3dd53c519e6

Authored by 潘钊
2 parents 5b9bc617 cfedcce3
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

Inline Side-by-side
Showing 11 changed files with 187 additions and 31 deletions
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
  View file @1545a25
... ... @@ -30,6 +30,15 @@ public class TrafficManageController {
30 30 }
31 31 }
32 32  
  33 + @RequestMapping(value = "/setXLByInUse", method = RequestMethod.GET)
  34 + public String setXLByInUse(@RequestParam("inUse") String inUse) throws Exception {
  35 + try {
  36 + return trManageService.setXLByInUse(inUse);
  37 + } catch (Exception exp) {
  38 + throw new Exception(exp.getCause());
  39 + }
  40 + }
  41 +
33 42 @RequestMapping(value = "/setCL", method = RequestMethod.GET)
34 43 public String setCL() throws Exception {
35 44 try {
... ...
src/main/java/com/bsth/service/TrafficManageService.java
  View file @1545a25
1 1 package com.bsth.service;
2 2  
3   -import java.util.Map;
4   -
5 3 /**
6 4 *
7 5 * @Interface: LineService(线路service业务层实现接口)
... ... @@ -27,6 +25,13 @@ public interface TrafficManageService {
27 25 String setXL(String ids);
28 26  
29 27 /**
  28 + * 上传线路信息
  29 + *
  30 + * @return 调用接口返回信息
  31 + */
  32 + String setXLByInUse(String ids);
  33 +
  34 + /**
30 35 * 上传车辆信息
31 36 *
32 37 * @return 调用接口返回信息
... ...
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @1545a25
... ... @@ -424,6 +424,18 @@ public class FormsServiceImpl implements FormsService {
424 424 if(map.get("fgsdmShif")!=null&&!map.get("fgsdmShif").equals("")){
425 425 fgsdmShif =map.get("fgsdmShif").toString();
426 426 }
  427 + String statue="";
  428 + if(map.get("state") !=null){
  429 + statue =map.get("state").toString();
  430 + }
  431 + String type="";
  432 + if(map.get("type") !=null){
  433 + type =map.get("type").toString();
  434 + }
  435 + String sql_ ="";
  436 + if(!type.equals("") && !statue.equals("")){
  437 + sql_ +=" order by "+statue+" "+type;
  438 + }
427 439 String sql ="select t.* from (select r.schedule_date,r.j_name,"
428 440 + "IFNULL(r.s_name,'')as s_name,"
429 441 + " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name "
... ... @@ -433,7 +445,8 @@ public class FormsServiceImpl implements FormsService {
433 445 + " and r.gs_bm like '%"+gsdmShif+"%' "
434 446 + " and r.fgs_bm like '%"+fgsdmShif+"%' ) t"
435 447 + " GROUP BY t.schedule_date,t.j_name,t.s_name, "
436   - + "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name ";
  448 + + "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name "
  449 + + sql_;
437 450  
438 451  
439 452 List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
... ...
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @1545a25
... ... @@ -160,6 +160,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{
160 160 String[] idArray = ids.split(",");
161 161 try {
162 162 for (String id : idArray) {
  163 + if(id == null || id.trim().equals("")){
  164 + continue;
  165 + }
163 166 Map<String,Object> map = new HashMap<>();
164 167 map.put("lineCode_eq", id);
165 168 Line line ;
... ... @@ -237,6 +240,36 @@ public class TrafficManageServiceImpl implements TrafficManageService{
237 240 }
238 241  
239 242 /**
  243 + * 上传线路信息(按in_use上传)
  244 + */
  245 + @Override
  246 + public String setXLByInUse(String inUse) {
  247 + StringBuffer result = new StringBuffer();
  248 + try {
  249 + Map<String,Object> map = new HashMap<>();
  250 + if(inUse != null && inUse.equals("1")){
  251 + map.put("inUse_eq", inUse);
  252 + }
  253 + List<Line> lines ;
  254 + Line line;
  255 + lines = lineRepository.findAll(new CustomerSpecs<Line>(map));
  256 + if(lines != null && lines.size() > 0){
  257 + for(int i = 0 ; i < lines.size() ; i ++){
  258 + line = lines.get(i);
  259 + if(line != null && line.getId() != null){
  260 + result.append(line.getLineCode()).append(":").append(setXL(line.getLineCode())).append(";");
  261 + }
  262 + }
  263 + }
  264 + } catch (Exception e) {
  265 + result.append("failure");
  266 + logger.error("setXLByInUse:",e);
  267 + e.printStackTrace();
  268 + }
  269 + return result.toString();
  270 + }
  271 +
  272 + /**
240 273 * 上传车辆信息
241 274 */
242 275 @Override
... ... @@ -762,7 +795,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
762 795 // 判断XML是否以</BCList>结尾，如果不是，则加上
763 796 String regex = "^*</JHBC>$";
764 797 Pattern p = Pattern.compile(regex);
765   - java.util.regex.Matcher m = p.matcher(sBuffer);
  798 + Matcher m = p.matcher(sBuffer);
766 799 boolean isEndWithTrueFlag = false;
767 800 while (m.find()) {
768 801 isEndWithTrueFlag = true;
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @1545a25
... ... @@ -2668,6 +2668,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2668 2668 sdfSimple = new SimpleDateFormat("yyyyMMdd");
2669 2669 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
2670 2670 Map<String, Object> m = new HashMap<String, Object>();
  2671 + m.put("date", date+"至"+date2);
2671 2672 ReportUtils ee = new ReportUtils();
2672 2673 try {
2673 2674 listI.add(lMap.iterator());
... ...
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @1545a25
... ... @@ -1193,13 +1193,13 @@ public class CulateMileageServiceImpl implements CulateMileageService{
1193 1193 while (it.hasNext()) {
1194 1194 ChildTaskPlan childTaskPlan = it.next();
1195 1195 if(item.equals("空放")){
1196   - if(childTaskPlan.getType2().equals("1")){
  1196 + /*if(childTaskPlan.getType2().equals("1")){
1197 1197 if (!childTaskPlan.isDestroy()) {
1198 1198 if(childTaskPlan.getReason().equals(item)){
1199 1199 zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
1200 1200 }
1201 1201 }
1202   - }
  1202 + }*/
1203 1203 }else{
1204 1204 if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
1205 1205 if (!childTaskPlan.isDestroy()) {
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @1545a25
... ... @@ -2615,7 +2615,7 @@ public class ReportServiceImpl implements ReportService{
2615 2615 map.put("zrwjcclc2", zrwjcclc2);
2616 2616 map.put("zrwjcclcqt", zrwjcclcqt);
2617 2617 double zrwjcc=Arith.add(Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2),zrwjcclcqt);
2618   - double kfks=Arith.add(culateService.culateKfksLc(lists),culateService.culateZrwJccLc(list, "空放"));
  2618 + double kfks=culateService.culateKfksLc(lists);
2619 2619 map.put("kfks", kfks);
2620 2620 double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc),
2621 2621 Arith.add(zjcclc, zyylc)),kfks);
... ... @@ -2687,29 +2687,57 @@ public class ReportServiceImpl implements ReportService{
2687 2687 dlbSql += " and xlbm = '"+line+"'";
2688 2688 }
2689 2689 List<Dlb> dlbList=dlbList(dlbSql);
2690   - String sql="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
2691   - + " from bsth_c_s_sp_info_real r where"
2692   - + " r.schedule_date_str BETWEEN '"+date+"' and '"+date2+"'";
2693   - if(line.equals("")){
2694   - sql +="and r.gs_bm='"+gsdm+"' "
2695   - + " and r.fgs_bm='"+fgsdm+"'";
  2690 + List<Map<String, Object>> listGroupBy =null;
  2691 + String sql="";
  2692 + if(zt.equals("zbh")){
  2693 + sql+="select r.xl_bm,r.schedule_date_str,r.cl_zbh"
  2694 + + " from bsth_c_s_sp_info_real r where"
  2695 + + " r.schedule_date_str BETWEEN '"+date+"' and '"+date2+"'";
  2696 + if(line.equals("")){
  2697 + sql +="and r.gs_bm='"+gsdm+"' "
  2698 + + " and r.fgs_bm='"+fgsdm+"'";
  2699 + }else{
  2700 + sql += " and r.xl_bm = '"+line+"'";
  2701 + }
  2702 + sql += " group by r.xl_bm,r.cl_zbh,r.schedule_date_str";
  2703 + listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
  2704 + @Override
  2705 + public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
  2706 + Map<String, Object> map=new HashMap<String,Object>();
  2707 + map.put("line",arg0.getString("xl_bm"));
  2708 + map.put("date", arg0.getString("schedule_date_str"));
  2709 + map.put("nbbm", arg0.getString("cl_zbh"));
  2710 + return map;
  2711 + }
  2712 + });
2696 2713 }else{
2697   - sql += " and r.xl_bm = '"+line+"'";
  2714 + sql+="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
  2715 + + " from bsth_c_s_sp_info_real r where"
  2716 + + " r.schedule_date_str BETWEEN '"+date+"' and '"+date2+"'";
  2717 + if(line.equals("")){
  2718 + sql +="and r.gs_bm='"+gsdm+"' "
  2719 + + " and r.fgs_bm='"+fgsdm+"'";
  2720 + }else{
  2721 + sql += " and r.xl_bm = '"+line+"'";
  2722 + }
  2723 + sql += " group by r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";
  2724 + listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
  2725 + @Override
  2726 + public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
  2727 + Map<String, Object> map=new HashMap<String,Object>();
  2728 + map.put("line",arg0.getString("xl_bm"));
  2729 + map.put("date", arg0.getString("schedule_date_str"));
  2730 + map.put("nbbm", arg0.getString("cl_zbh"));
  2731 + map.put("jGh", arg0.getString("j_gh"));
  2732 + map.put("sGh", arg0.getString("s_gh"));
  2733 + return map;
  2734 + }
  2735 + });
2698 2736 }
2699   - sql += " group by r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";
  2737 +
2700 2738  
2701   - List<Map<String, Object>> listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
2702   - @Override
2703   - public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
2704   - Map<String, Object> map=new HashMap<String,Object>();
2705   - map.put("line",arg0.getString("xl_bm"));
2706   - map.put("date", arg0.getString("schedule_date_str"));
2707   - map.put("nbbm", arg0.getString("cl_zbh"));
2708   - map.put("jGh", arg0.getString("j_gh"));
2709   - map.put("sGh", arg0.getString("s_gh"));
2710   - return map;
2711   - }
2712   - });
  2739 +
  2740 +
2713 2741 for (int i = 0; i < listGroupBy.size(); i++) {
2714 2742 Map<String, Object> m=listGroupBy.get(i);
2715 2743 String xl_bm=m.get("line")==null?"":m.get("line").toString();
... ...
src/main/resources/static/pages/forms/mould/statisticsDaily_.xls
View file @1545a25
No preview for this file type
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @1545a25
... ... @@ -66,7 +66,7 @@
66 66 <table class="table table-bordered table-hover table-checkable" id="forms">
67 67 <thead>
68 68 <tr>
69   - <th colspan="40"><lable id="xlmc"></lable>线路调度日报</th>
  69 + <th colspan="40"><label id="xlmc"></label>线路调度日报</th>
70 70 </tr>
71 71 <tr>
72 72 <td rowspan="3"><span>路线</span></td>
... ...
src/main/resources/static/pages/forms/statement/statisticsDaily.html
  View file @1545a25
... ... @@ -70,7 +70,7 @@
70 70 <table class="table table-bordered table-hover table-checkable" id="forms">
71 71 <thead>
72 72 <tr>
73   - <th colspan="44">线路调度日报</th>
  73 + <th colspan="44"><label id="tjrq"></label> 线路统计日报</th>
74 74 </tr>
75 75 <tr>
76 76 <td rowspan="3"><span >路线名</span></td>
... ... @@ -275,6 +275,7 @@
275 275 if(date==null || date =="" ||date2==null || date2 ==""){
276 276 layer.msg('请选择时间段.');
277 277 }else{
  278 + $("#tjrq").html(date+"至"+date2);
278 279 var params = {};
279 280 params['gsdm'] = gsdm;
280 281 params['fgsdm'] =fgsdm ;
... ...
src/main/resources/static/pages/mforms/shifdays/shifday.html
  View file @1545a25
... ... @@ -65,10 +65,10 @@
65 65 <table class="table table-bordered table-hover table-checkable" id="forms">
66 66 <thead>
67 67 <tr>
68   - <th>驾驶员</th>
  68 + <th class="jsypx" style="cursor:pointer ">驾驶员</th>
69 69 <th>售票员</th>
70 70 <th>路牌</th>
71   - <th>车辆</th>
  71 + <th class="zbhpx" style="cursor:pointer ">车辆</th>
72 72 <th>计划里程</th>
73 73 <th>实际计划里程</th>
74 74 <th>运营里程</th>
... ... @@ -202,7 +202,70 @@ $(function(){
202 202 }
203 203 });
204 204  
  205 + var type="desc";
  206 + $(".jsypx").on("click",function(){
  207 + var line = $("#line").val();
  208 + var date = $("#date").val();
  209 + var gsdmShif = $("#gsdmShif").val();
  210 + var fgsdmShif = $("#fgsdmShif").val();
  211 + var params = {};
  212 + params.fgsdmShif =fgsdmShif;
  213 + params.date =date;
  214 + params.gsdmShif =gsdmShif;
  215 + params.line =line;
  216 + params.state="j_name";
  217 + params.type=type;
  218 + if(date=="" || date ==null){
  219 + layer.msg('请选择日期.');
  220 + }else{
  221 + $get('/mcy_forms/shifday',params,function(result){
  222 + if(type=="desc"){
  223 + type ="asc";
  224 + }else{
  225 + type ="desc";
  226 + }
  227 + $.each(result, function(i, obj) {
  228 + obj.requestType = reqCodeMap[obj.requestType];
  229 + });
  230 + // 把数据填充到模版中
  231 + var tbodyHtml = template('shifday',{list:result});
  232 + // 把渲染好的模版html文本追加到表格中
  233 + $('#forms tbody').html(tbodyHtml);
  234 + });
  235 + }
  236 + })
205 237  
  238 + $(".zbhpx").on("click",function(){
  239 + var line = $("#line").val();
  240 + var date = $("#date").val();
  241 + var gsdmShif = $("#gsdmShif").val();
  242 + var fgsdmShif = $("#fgsdmShif").val();
  243 + var params = {};
  244 + params.fgsdmShif =fgsdmShif;
  245 + params.date =date;
  246 + params.gsdmShif =gsdmShif;
  247 + params.line =line;
  248 + params.state="cl_zbh";
  249 + params.type=type;
  250 + if(date=="" || date ==null){
  251 + layer.msg('请选择日期.');
  252 + }else{
  253 + $get('/mcy_forms/shifday',params,function(result){
  254 + if(type=="desc"){
  255 + type ="asc";
  256 + }else{
  257 + type ="desc";
  258 + }
  259 + $.each(result, function(i, obj) {
  260 + obj.requestType = reqCodeMap[obj.requestType];
  261 + });
  262 + // 把数据填充到模版中
  263 + var tbodyHtml = template('shifday',{list:result});
  264 + // 把渲染好的模版html文本追加到表格中
  265 + $('#forms tbody').html(tbodyHtml);
  266 + });
  267 + }
  268 + })
206 269  
207 270 $("#query").on("click",function(){
208 271 var line = $("#line").val();
... ... @@ -214,10 +277,13 @@ $(function(){
214 277 params.date =date;
215 278 params.gsdmShif =gsdmShif;
216 279 params.line =line;
  280 + params.state="j_name";
  281 + params.type=type;
217 282 if(date=="" || date ==null){
218 283 layer.msg('请选择日期.');
219 284 }else{
220 285 $get('/mcy_forms/shifday',params,function(result){
  286 + type ='asc';
221 287 $.each(result, function(i, obj) {
222 288 obj.requestType = reqCodeMap[obj.requestType];
223 289 });
... ...