Commit deab979867453b7295adf4459845a451bec0be28
1 parent
a0ec3eb5
统计日报 子任务烂班不算烂班
Showing
3 changed files
with
7 additions
and
6 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
| @@ -244,8 +244,8 @@ public class YlbController extends BaseController<Ylb, Integer>{ | @@ -244,8 +244,8 @@ public class YlbController extends BaseController<Ylb, Integer>{ | ||
| 244 | m.put("jsy", y.getJsy()); | 244 | m.put("jsy", y.getJsy()); |
| 245 | m.put("name", y.getName()); | 245 | m.put("name", y.getName()); |
| 246 | m.put("jzl", y.getJzl()<=0?"0":y.getJzl()); | 246 | m.put("jzl", y.getJzl()<=0?"0":y.getJzl()); |
| 247 | - m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc()); | ||
| 248 | - m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc()); | 247 | + m.put("czlc", "0"); |
| 248 | + m.put("jzlc", "0"); | ||
| 249 | m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl()); | 249 | m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl()); |
| 250 | m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl()); | 250 | m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl()); |
| 251 | m.put("yh", y.getYh()<=0?"0":y.getYh()); | 251 | m.put("yh", y.getYh()<=0?"0":y.getYh()); |
| @@ -255,7 +255,7 @@ public class YlbController extends BaseController<Ylb, Integer>{ | @@ -255,7 +255,7 @@ public class YlbController extends BaseController<Ylb, Integer>{ | ||
| 255 | if(y.getRylx().equals("1")){rylx="负10号柴油";} | 255 | if(y.getRylx().equals("1")){rylx="负10号柴油";} |
| 256 | } | 256 | } |
| 257 | m.put("rylx", rylx); | 257 | m.put("rylx", rylx); |
| 258 | - m.put("ns", y.getNs()); | 258 | + m.put("ns", y.getNs()==null?"0":y.getNs()); |
| 259 | String shyy ="无"; | 259 | String shyy ="无"; |
| 260 | if(y.getShyy()!=null){ | 260 | if(y.getShyy()!=null){ |
| 261 | shyy=y.getShyy(); | 261 | shyy=y.getShyy(); |
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
| @@ -920,7 +920,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -920,7 +920,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 920 | 920 | ||
| 921 | } else { | 921 | } else { |
| 922 | Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); | 922 | Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); |
| 923 | - if (scheduleRealInfo.getStatus() == -1) { | 923 | + /*if (scheduleRealInfo.getStatus() == -1) { |
| 924 | while (it.hasNext()) { | 924 | while (it.hasNext()) { |
| 925 | ChildTaskPlan childTaskPlan = it.next(); | 925 | ChildTaskPlan childTaskPlan = it.next(); |
| 926 | if (childTaskPlan.isDestroy()) { | 926 | if (childTaskPlan.isDestroy()) { |
| @@ -947,7 +947,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -947,7 +947,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 947 | 947 | ||
| 948 | } | 948 | } |
| 949 | } | 949 | } |
| 950 | - }else{ | 950 | + }else{*/ |
| 951 | while (it.hasNext()) { | 951 | while (it.hasNext()) { |
| 952 | ChildTaskPlan childTaskPlan = it.next(); | 952 | ChildTaskPlan childTaskPlan = it.next(); |
| 953 | if (childTaskPlan.isDestroy()) { | 953 | if (childTaskPlan.isDestroy()) { |
| @@ -974,7 +974,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -974,7 +974,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 974 | 974 | ||
| 975 | } | 975 | } |
| 976 | } | 976 | } |
| 977 | - } | 977 | +// } |
| 978 | 978 | ||
| 979 | } | 979 | } |
| 980 | } | 980 | } |
src/main/resources/static/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html
| @@ -108,6 +108,7 @@ | @@ -108,6 +108,7 @@ | ||
| 108 | $.get('/report/lineList',function(result){ | 108 | $.get('/report/lineList',function(result){ |
| 109 | xlList=result; | 109 | xlList=result; |
| 110 | $.get('/user/companyData', function(result){ | 110 | $.get('/user/companyData', function(result){ |
| 111 | + | ||
| 111 | obj = result; | 112 | obj = result; |
| 112 | var options = ''; | 113 | var options = ''; |
| 113 | for(var i = 0; i < obj.length; i++){ | 114 | for(var i = 0; i < obj.length; i++){ |