潘钊 / bsth_control · Commits

Commit b44ec03c39e2aceec372650e8f2d1c5d04188e5b

Authored by 娄高锋
2 parents 334ff0b6 023f795a

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into 

minhang
Inline Side-by-side
Showing 8 changed files with 178 additions and 28 deletions
src/main/java/com/bsth/entity/Line.java
  View file @b44ec03
@@ -94,6 +94,9 @@ public class Line implements Serializable { @@ -94,6 +94,9 @@ public class Line implements Serializable {
94 94
95 /** 是否夜宵线 <1:是;0:否> bit length(50)*/ 95 /** 是否夜宵线 <1:是;0:否> bit length(50)*/
96 private Integer supperLine; 96 private Integer supperLine;
  97 +
  98 + /** 是否营运 <1:是;0:否> bit length(50)*/
  99 + private Integer sfyy;
97 100
98 /** 起始调度电话 varchar length(50) */ 101 /** 起始调度电话 varchar length(50) */
99 private String startPhone; 102 private String startPhone;
@@ -481,4 +484,14 @@ public class Line implements Serializable { @@ -481,4 +484,14 @@ public class Line implements Serializable {
481 public void setCgsbm(String cgsbm) { 484 public void setCgsbm(String cgsbm) {
482 this.cgsbm = cgsbm; 485 this.cgsbm = cgsbm;
483 } 486 }
  487 +
  488 + public Integer getSfyy() {
  489 + return sfyy;
  490 + }
  491 +
  492 + public void setSfyy(Integer sfyy) {
  493 + this.sfyy = sfyy;
  494 + }
  495 +
  496 +
484 } 497 }
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @b44ec03
@@ -316,6 +316,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -316,6 +316,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
316 // 取昨天 的日期 316 // 取昨天 的日期
317 String date = sdfnyr.format(DateUtils.addDays(new Date(), -1)); 317 String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
318 StringBuffer sf = new StringBuffer(); 318 StringBuffer sf = new StringBuffer();
  319 + String str;
319 try { 320 try {
320 int counter = 0; // 计数器 321 int counter = 0; // 计数器
321 int per = 10; // 每几条线路上传一次路单 322 int per = 10; // 每几条线路上传一次路单
@@ -400,26 +401,28 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -400,26 +401,28 @@ public class TrafficManageServiceImpl implements TrafficManageService{
400 if(counter % per == per - 1){ 401 if(counter % per == per - 1){
401 counter = 0; 402 counter = 0;
402 sf.append("</DLDS>"); 403 sf.append("</DLDS>");
403 - Results results = ssop.setLD(userNameOther, passwordOther, sf.toString()); 404 + str = sf.toString().replace("'","");// 去掉'号
  405 + Results results = ssop.setLD(userNameOther, passwordOther, str);
404 if(results.isSuccess()){ 406 if(results.isSuccess()){
405 result = "success"; 407 result = "success";
406 }else{ 408 }else{
407 result = "failure"; 409 result = "failure";
408 } 410 }
409 - logger.info("setLD:"+sf.toString()); 411 + logger.info("setLD:"+str);
410 logger.info("setLD:"+result); 412 logger.info("setLD:"+result);
411 } 413 }
412 } 414 }
413 // 每per条线路上传后剩下的数据再上传 415 // 每per条线路上传后剩下的数据再上传
414 if(counter > 0){ 416 if(counter > 0){
415 sf.append("</DLDS>"); 417 sf.append("</DLDS>");
416 - Results results = ssop.setLD(userNameOther, passwordOther, sf.toString()); 418 + str = sf.toString().replace("'","");// 去掉'号
  419 + Results results = ssop.setLD(userNameOther, passwordOther, str);
417 if(results.isSuccess()){ 420 if(results.isSuccess()){
418 result = "success"; 421 result = "success";
419 }else{ 422 }else{
420 result = "failure"; 423 result = "failure";
421 } 424 }
422 - logger.info("setLD:"+sf.toString()); 425 + logger.info("setLD:"+str);
423 logger.info("setLD:"+result); 426 logger.info("setLD:"+result);
424 } 427 }
425 } catch (Exception e) { 428 } catch (Exception e) {
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @b44ec03
@@ -157,7 +157,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -157,7 +157,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{
157 if(scheduleRealInfo.getStatus() == -1){ 157 if(scheduleRealInfo.getStatus() == -1){
158 lbbc++; 158 lbbc++;
159 } 159 }
160 - }else{ 160 + }
  161 + /*else{
161 if(scheduleRealInfo.getStatus() == -1){ 162 if(scheduleRealInfo.getStatus() == -1){
162 boolean fage=true; 163 boolean fage=true;
163 Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); 164 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -174,7 +175,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -174,7 +175,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
174 lbbc++; 175 lbbc++;
175 } 176 }
176 } 177 }
177 - } 178 + }*/
178 } 179 }
179 } 180 }
180 return lbbc; 181 return lbbc;
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @b44ec03
@@ -1213,7 +1213,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1213,7 +1213,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1213 + " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'"; 1213 + " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
1214 if(line.trim().length() != 0) 1214 if(line.trim().length() != 0)
1215 sql += " and xl_bm = '"+line+"'"; 1215 sql += " and xl_bm = '"+line+"'";
1216 - if(company.length() != 0) 1216 + else if(company.length() != 0)
1217 sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'"; 1217 sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
1218 1218
1219 list = jdbcTemplate.query(sql, 1219 list = jdbcTemplate.query(sql,
src/main/resources/static/pages/base/line/add.html
  View file @b44ec03
@@ -199,6 +199,40 @@ @@ -199,6 +199,40 @@
199 </div> 199 </div>
200 <!-- 表单分组组件 form-group END --> 200 <!-- 表单分组组件 form-group END -->
201 201
  202 + <!-- 表单分组组件 form-group START -->
  203 + <div class="form-group">
  204 + <!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
  205 + <div class="col-md-6">
  206 + <label class="control-label col-md-5">
  207 + <span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
  208 + </label>
  209 + <div class="col-md-4">
  210 + <div class="md-radio-inline">
  211 + <div class="md-radio">
  212 + <input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1" data-title="是" checked="checked" >
  213 + <label for="radio18">
  214 + <span></span>
  215 + <span class="check"></span>
  216 + <span class="box"></span> 是
  217 + </label>
  218 + </div>
  219 + <div class="md-radio has-error">
  220 + <input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0" data-title="否" >
  221 + <label for="radio19" style="color:#FFC0CB">
  222 + <span></span>
  223 + <span class="check"></span>
  224 + <span class="box"></span> 否
  225 + </label>
  226 + </div>
  227 + </div>
  228 + </div>
  229 + </div>
  230 + <!-- 是否营运 END -->
  231 +
  232 +
  233 + </div>
  234 + <!-- 表单分组组件 form-group END -->
  235 +
202 <!-- 表单分组组件 form-group START --> 236 <!-- 表单分组组件 form-group START -->
203 <div class="form-group"> 237 <div class="form-group">
204 <!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) --> 238 <!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
src/main/resources/static/pages/base/line/details.html
  View file @b44ec03
@@ -191,7 +191,39 @@ @@ -191,7 +191,39 @@
191 <!-- 是否撤销 START --> 191 <!-- 是否撤销 START -->
192 </div> 192 </div>
193 <!-- 表单分组组件 form-group END --> 193 <!-- 表单分组组件 form-group END -->
194 - 194 + <!-- 表单分组组件 form-group START -->
  195 + <div class="form-group">
  196 + <!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
  197 + <div class="col-md-6">
  198 + <label class="control-label col-md-5">
  199 + <span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
  200 + </label>
  201 + <div class="col-md-4">
  202 + <div class="md-radio-inline">
  203 + <div class="md-radio">
  204 + <input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1" data-title="是" checked="checked" >
  205 + <label for="radio18">
  206 + <span></span>
  207 + <span class="check"></span>
  208 + <span class="box"></span> 是
  209 + </label>
  210 + </div>
  211 + <div class="md-radio has-error">
  212 + <input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0" data-title="否" >
  213 + <label for="radio19" style="color:#FFC0CB">
  214 + <span></span>
  215 + <span class="check"></span>
  216 + <span class="box"></span> 否
  217 + </label>
  218 + </div>
  219 + </div>
  220 + </div>
  221 + </div>
  222 + <!-- 是否营运 END -->
  223 +
  224 +
  225 + </div>
  226 + <!-- 表单分组组件 form-group END -->
195 <!-- 表单分组组件 form-group START --> 227 <!-- 表单分组组件 form-group START -->
196 <div class="form-group"> 228 <div class="form-group">
197 <!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) --> 229 <!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
src/main/resources/static/pages/base/line/edit.html
  View file @b44ec03
@@ -199,7 +199,39 @@ @@ -199,7 +199,39 @@
199 <!-- 是否撤销 START --> 199 <!-- 是否撤销 START -->
200 </div> 200 </div>
201 <!-- 表单分组组件 form-group END --> 201 <!-- 表单分组组件 form-group END -->
202 - 202 + <!-- 表单分组组件 form-group START -->
  203 + <div class="form-group">
  204 + <!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
  205 + <div class="col-md-6">
  206 + <label class="control-label col-md-5">
  207 + <span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
  208 + </label>
  209 + <div class="col-md-4">
  210 + <div class="md-radio-inline">
  211 + <div class="md-radio">
  212 + <input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1" data-title="是" checked="checked" >
  213 + <label for="radio18">
  214 + <span></span>
  215 + <span class="check"></span>
  216 + <span class="box"></span> 是
  217 + </label>
  218 + </div>
  219 + <div class="md-radio has-error">
  220 + <input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0" data-title="否" >
  221 + <label for="radio19" style="color:#FFC0CB">
  222 + <span></span>
  223 + <span class="check"></span>
  224 + <span class="box"></span> 否
  225 + </label>
  226 + </div>
  227 + </div>
  228 + </div>
  229 + </div>
  230 + <!-- 是否营运 END -->
  231 +
  232 +
  233 + </div>
  234 + <!-- 表单分组组件 form-group END -->
203 <!-- 表单分组组件 form-group START --> 235 <!-- 表单分组组件 form-group START -->
204 <div class="form-group"> 236 <div class="form-group">
205 <!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) --> 237 <!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
src/main/resources/static/pages/forms/statement/firstAndLastBus.html
  View file @b44ec03
@@ -160,32 +160,67 @@ @@ -160,32 +160,67 @@
160 initXl(); 160 initXl();
161 } 161 }
162 162
163 - $("#subCompany").on("change",initXl); 163 +// $("#subCompany").on("change",initXl);
  164 +
  165 +// function initXl(){
  166 +// var data=[];
  167 +// data.push({id: " ", text: "全部线路"});
  168 +// if(fage){
  169 +// $("#line").select2("destroy").html('');
  170 +// }
  171 +// var fgs=$('#subCompany').val();
  172 +// var gs=$('#company').val();
  173 +// for(var i=0;i<xlList.length;i++){
  174 +// if(gs!=""){
  175 +// if(fgs!=""){
  176 +// if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  177 +// data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  178 +// }
  179 +// }else{
  180 +// if(xlList[i]["gsbm"]==gs){
  181 +// data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  182 +// }
  183 +// }
  184 +// }
  185 +// }
  186 +// initPinYinSelect2('#line',data,'');
  187 +// fage=true;
  188 +// }
  189 +
164 function initXl(){ 190 function initXl(){
165 - var data=[];  
166 - if(fage){  
167 - $("#line").select2("destroy").html('');  
168 - }  
169 - var fgs=$('#subCompany').val();  
170 - var gs=$('#company').val(); 191 + $.get('/report/lineList',function(xlList){
  192 + var data = [];
171 data.push({id: " ", text: "全部线路"}); 193 data.push({id: " ", text: "全部线路"});
172 - for(var i=0;i<xlList.length;i++){  
173 - if(gs!=""){  
174 - if(fgs!=""){  
175 - if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){  
176 - data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});  
177 - }  
178 - }else{  
179 - if(xlList[i]["gsbm"]==gs){  
180 - data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]}); 194 + $.get('/user/companyData', function(result){
  195 + for(var i = 0; i < result.length; i++){
  196 + var companyCode = result[i].companyCode;
  197 + var children = result[i].children;
  198 + for(var j = 0; j < children.length; j++){
  199 + var code = children[j].code;
  200 + for(var k=0;k < xlList.length;k++ ){
  201 + if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
  202 + data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
  203 + }
181 } 204 }
182 } 205 }
183 } 206 }
184 - }  
185 - initPinYinSelect2('#line',data,'');  
186 - fage=true; 207 + initPinYinSelect2('#line',data,'');
  208 +
  209 + $("#company").attr("disabled", false);
  210 + $("#subCompany").attr("disabled", false);
  211 + });
  212 + });
187 } 213 }
188 214
  215 + $("#line").on("change", function(){
  216 + if($("#line").val() == " "){
  217 + $("#company").attr("disabled", false);
  218 + $("#subCompany").attr("disabled", false);
  219 + } else {
  220 + $("#company").attr("disabled", true);
  221 + $("#subCompany").attr("disabled", true);
  222 + }
  223 + });
189 224
190 $("#query").on("click",jsDoQuery); 225 $("#query").on("click",jsDoQuery);
191 226