潘钊 / bsth_control · Commits

Commit a34aa5c0be5202c8260af799544e10910a986d8b

Authored by 廖磊
1 parent a257c2cb
build: skipped

添加子任务换车 

计算添加实发添加
Inline Side-by-side
Showing 6 changed files with 108 additions and 165 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @a34aa5c
... ... @@ -744,7 +744,7 @@ public class FormsServiceImpl implements FormsService {
744 744 if(cts != null && cts.size() > 0){
745 745 newList_.add(s);
746 746 }else{
747   - if(s.getZdsjActual()!=null){
  747 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
748 748 newList_.add(s);
749 749 }
750 750 }
... ... @@ -798,7 +798,7 @@ public class FormsServiceImpl implements FormsService {
798 798 if(cts != null && cts.size() > 0){
799 799 newList_.add(s);
800 800 }else{
801   - if(s.getZdsjActual()!=null){
  801 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
802 802 newList_.add(s);
803 803 }
804 804 }
... ... @@ -884,7 +884,7 @@ public class FormsServiceImpl implements FormsService {
884 884 if(cts != null && cts.size() > 0){
885 885 newList_.add(s);
886 886 }else{
887   - if(s.getZdsjActual()!=null){
  887 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
888 888 newList_.add(s);
889 889 }
890 890 }
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @a34aa5c
... ... @@ -873,7 +873,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
873 873 if(cts != null && cts.size() > 0){
874 874 lists.add(s);
875 875 }else{
876   - if(s.getZdsjActual()!=null){
  876 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
877 877 lists.add(s);
878 878 }
879 879 }
... ... @@ -1743,30 +1743,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
1743 1743 if(cts != null && cts.size() > 0){
1744 1744 lists.add(s);
1745 1745 }else{
1746   - if(s.getZdsjActual()!=null){
  1746 + if(s.getFcsjActual() !=null&&s.getZdsjActual()!=null){
1747 1747 lists.add(s);
1748 1748 }
1749 1749 }
1750 1750 }
1751   - double ksgl=culateService.culateKsgl(list);
1752   - double sjgl=culateService.culateSjgl(lists);
1753   - double jccgl=culateService.culateJccgl(lists);
1754   - double ljgl=culateService.culateLjgl(lists);
1755   -
1756   - map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
  1751 + map.put("jhbc", culateService.culateJhbc(list,""));//计划班次
  1752 + map.put("jhlc", Arith.add(culateService.culateJhgl(list),
  1753 + culateService.culateJhJccgl(list))); //计划总里程
  1754 + map.put("cjbc", culateService.culateLbbc(list));//烂班班次
1757 1755 map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
  1756 + map.put("ljbc", culateService.culateLjbc(lists,""));//临加班次
  1757 + double ljgl=culateService.culateLjgl(lists);
1758 1758 map.put("addMileage", ljgl); //临加公里
1759   - map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
1760   - map.put("ksgl", ksgl);//空驶公里
1761   - map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
1762   -// map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
1763   - map.put("jhbc", culateService.culateJhbc(list,""));
1764   - map.put("cjbc", culateService.culateLbbc(list));
1765   - map.put("ljbc", culateService.culateLjbc(lists,""));
1766 1759 map.put("sjbc", culateService.culateSjbc(lists,"") + culateService.culateLjbc(lists,""));
1767   - map.put("jcclc", jccgl);
  1760 + double ksgl=culateService.culateKsgl(list);//子任务空驶公里
  1761 + double jccgl=culateService.culateJccgl(lists);//空驶班次公里
  1762 + map.put("ksgl", ksgl);//空驶公里
  1763 + double sjgl=culateService.culateSjgl(lists);//实际营运公里
  1764 + map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));//总公里
1768 1765 map.put("zkslc", Arith.add(ksgl,jccgl));
1769   -// map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
  1766 + map.put("jcclc", jccgl);
  1767 + map.put("yygl",Arith.add(sjgl,ljgl)); //总营运公里
1770 1768 return map;
1771 1769 }
1772 1770  
... ... @@ -1789,7 +1787,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
1789 1787 if(cts != null && cts.size() > 0){
1790 1788 lists.add(s);
1791 1789 }else{
1792   - if(s.getZdsjActual()!=null){
  1790 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
1793 1791 lists.add(s);
1794 1792 }
1795 1793 }
... ... @@ -2139,20 +2137,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2139 2137 for (int j = 0; j < listit.size(); j++) {
2140 2138 ScheduleRealInfo t = new ScheduleRealInfo();
2141 2139 ChildTaskPlan childTaskPlan = listit.get(j);
2142   - if (childTaskPlan.isDestroy()) {
2143   - t.setFcsjActual("");
2144   - t.setZdsjActual("");
2145   - t.setJhlc(0.0);
2146   - } else {
2147   - t.setFcsjActual(childTaskPlan.getStartDate());
2148   - t.setZdsjActual(childTaskPlan.getEndDate());
2149   - t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
  2140 + if(childTaskPlan.getCcId()==null){
  2141 + if (childTaskPlan.isDestroy()) {
  2142 + t.setFcsjActual("");
  2143 + t.setZdsjActual("");
  2144 + t.setJhlc(0.0);
  2145 + } else {
  2146 + t.setFcsjActual(childTaskPlan.getStartDate());
  2147 + t.setZdsjActual(childTaskPlan.getEndDate());
  2148 + t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
  2149 + }
  2150 + t.setFcsj(childTaskPlan.getStartDate());
  2151 + t.setZdsj(childTaskPlan.getEndDate());
  2152 + t.setQdzName(childTaskPlan.getStartStationName());
  2153 + t.setZdzName(childTaskPlan.getEndStationName());
  2154 + t.setRemarks(childTaskPlan.getRemarks());
  2155 + t.setAdjustExps("子");
  2156 + listSchedule.add(t);
2150 2157 }
2151   - t.setQdzName(childTaskPlan.getStartStationName());
2152   - t.setZdzName(childTaskPlan.getEndStationName());
2153   - t.setRemarks(childTaskPlan.getRemarks());
2154   - t.setAdjustExps("子");
2155   - listSchedule.add(t);
2156 2158 }
2157 2159 }
2158 2160 }
... ... @@ -2295,7 +2297,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2295 2297 if(cts != null && cts.size() > 0){
2296 2298 lists.add(s);
2297 2299 }else{
2298   - if(s.getZdsjActual()!=null){
  2300 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
2299 2301 lists.add(s);
2300 2302 }
2301 2303 }
... ... @@ -2370,7 +2372,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2370 2372 if(cts != null && cts.size() > 0){
2371 2373 lists.add(s);
2372 2374 }else{
2373   - if(s.getZdsjActual()!=null){
  2375 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
2374 2376 lists.add(s);
2375 2377 }
2376 2378 }
... ... @@ -2433,7 +2435,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2433 2435 if(cts != null && cts.size() > 0){
2434 2436 lists.add(s);
2435 2437 }else{
2436   - if(s.getZdsjActual()!=null){
  2438 + if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
2437 2439 lists.add(s);
2438 2440 }
2439 2441 }
... ... @@ -2487,10 +2489,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2487 2489 map.put("dtbc", 0);
2488 2490 map.put("dtbc_m", 0);
2489 2491 map.put("dtbc_a", 0);
2490   - map.put("djg", 0);
2491   - map.put("djg_m", 0);
2492   - map.put("djg_a", 0);
2493   - map.put("djg_time", 0);
  2492 + Map<String, Object> m_=culateService.culateDjg(lists, list.get(0).getXlBm());
  2493 + map.put("djg", m_.get("djgcsq"));
  2494 + map.put("djg_m", m_.get("djgcsz"));
  2495 + map.put("djg_a", m_.get("djgcsw"));
  2496 + map.put("djg_time", m_.get("djgsj"));
2494 2497 }
2495 2498 return map;
2496 2499 }
... ... @@ -2515,7 +2518,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2515 2518 if(cts != null && cts.size() > 0){
2516 2519 list_s.add(s);
2517 2520 }else{
2518   - if(s.getZdsjActual()!=null){
  2521 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
2519 2522 list_s.add(s);
2520 2523 }
2521 2524 }
... ... @@ -2592,10 +2595,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2592 2595 map.put("dtbc", 0);
2593 2596 map.put("dtbc_m", 0);
2594 2597 map.put("dtbc_a", 0);
2595   - map.put("djg", 0);
2596   - map.put("djg_m", 0);
2597   - map.put("djg_a", 0);
2598   - map.put("djg_time", 0);
  2598 + Map<String, Object> m_=culateService.culateDjg(list_s, list.get(0).getXlBm());
  2599 + map.put("djg", m_.get("djgcsq"));
  2600 + map.put("djg_m", m_.get("djgcsz"));
  2601 + map.put("djg_a", m_.get("djgcsw"));
  2602 + map.put("djg_time", m_.get("djgsj"));
2599 2603 lMap.add(map);
2600 2604 if (type != null && type.length() != 0 && type.equals("export")) {
2601 2605 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
... ... @@ -4211,7 +4215,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4211 4215 if(cts != null && cts.size() > 0){
4212 4216 lists.add(s);
4213 4217 }else{
4214   - if(s.getZdsjActual()!=null){
  4218 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
4215 4219 lists.add(s);
4216 4220 }
4217 4221 }
... ...
src/main/java/com/bsth/service/report/CulateMileageService.java
  View file @a34aa5c
... ... @@ -39,6 +39,8 @@ public interface CulateMileageService {
39 39 Map<String, Object> culateWdbcs(List<ScheduleRealInfo> lists);
40 40  
41 41 int culateDtfzbc(List<ScheduleRealInfo> lists,String type,String status,String item);
  42 +
  43 +
42 44 //以下计算方法供新报表使用
43 45 Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists);//计划内营运and计划外营运
44 46  
... ...
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @a34aa5c
... ... @@ -179,10 +179,12 @@ public class CulateMileageServiceImpl implements CulateMileageService{
179 179 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
180 180 while (it.hasNext()) {
181 181 ChildTaskPlan childTaskPlan = it.next();
182   - if(childTaskPlan.getMileageType().equals("service")){
183   - if (childTaskPlan.isDestroy()) {
184   - zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
185   - }
  182 + if(childTaskPlan.getCcId()==null){
  183 + if(childTaskPlan.getMileageType().equals("service")){
  184 + if (childTaskPlan.isDestroy()) {
  185 + zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
  186 + }
  187 + }
186 188 }
187 189 }
188 190 }
... ... @@ -198,30 +200,11 @@ public class CulateMileageServiceImpl implements CulateMileageService{
198 200 for (int i = 0; i < lists.size(); i++) {
199 201 ScheduleRealInfo scheduleRealInfo=lists.get(i);
200 202 if (!isInOut(scheduleRealInfo)) {
201   -// Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
202   -// if(childTaskPlans.isEmpty()){
  203 + if(!scheduleRealInfo.isCcService()){
203 204 if(scheduleRealInfo.getStatus() == -1){
204 205 lbbc++;
205 206 }
206   -// }
207   - /*else{
208   - if(scheduleRealInfo.getStatus() == -1){
209   - boolean fage=true;
210   - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
211   - if(it.hasNext()){
212   - ChildTaskPlan childTaskPlan = it.next();
213   - if(!childTaskPlan.isDestroy()){
214   - if(childTaskPlan.getMileageType().equals("service")){
215   - fage=false;
216   - }
217   - }
218   -
219   - }
220   - if(fage){
221   - lbbc++;
222   - }
223   - }
224   - }*/
  207 + }
225 208 }
226 209 }
227 210 return lbbc;
... ... @@ -399,11 +382,13 @@ public class CulateMileageServiceImpl implements CulateMileageService{
399 382 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
400 383 while (it.hasNext()) {
401 384 ChildTaskPlan childTaskPlan = it.next();
402   - if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
403   - if (!childTaskPlan.isDestroy()) {
404   - Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
405   - ljgl=Arith.add(ljgl,jhgl);
406   - }
  385 + if(childTaskPlan.getCcId()==null){
  386 + if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
  387 + if (!childTaskPlan.isDestroy()) {
  388 + Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  389 + ljgl=Arith.add(ljgl,jhgl);
  390 + }
  391 + }
407 392 }
408 393 }
409 394 }
... ... @@ -463,7 +448,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
463 448 for (int i = 0; i < lists.size(); i++) {
464 449 ScheduleRealInfo scheduleRealInfo=lists.get(i);
465 450 if (!isInOut(scheduleRealInfo)) {
466   - if(!scheduleRealInfo.isSflj()){
  451 + if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
467 452 jhgl=Arith.add(jhgl,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
468 453 }
469 454 }
... ... @@ -504,7 +489,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
504 489 for (int i = 0; i < lists.size(); i++) {
505 490 ScheduleRealInfo scheduleRealInfo=lists.get(i);
506 491 if (!isInOut(scheduleRealInfo)) {
507   - if(!scheduleRealInfo.isSflj()){
  492 + if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
508 493 String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
509 494 long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
510 495 if(item.equals("zgf")){
... ... @@ -535,21 +520,23 @@ public class CulateMileageServiceImpl implements CulateMileageService{
535 520 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
536 521 if(!scheduleRealInfo.isSflj()){
537 522 if(childTaskPlans.isEmpty()){
538   - if(!scheduleRealInfo.isDestroy()){
539   - double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
540   - double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
541   - if(jhlc-jhlcOrig>0){
542   - sjgl=Arith.add(sjgl,jhlcOrig);
543   - }else{
544   - sjgl=Arith.add(sjgl,jhlc);
545   - }
546   -
  523 + if(!scheduleRealInfo.isDestroy()){
  524 + double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
  525 + double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
  526 + if(jhlc-jhlcOrig>0){
  527 + sjgl=Arith.add(sjgl,jhlcOrig);
  528 + }else{
  529 + sjgl=Arith.add(sjgl,jhlc);
547 530 }
  531 +
  532 + }
548 533 }else{
549 534 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
550 535 while (it.hasNext()) {
551 536 ChildTaskPlan childTaskPlan = it.next();
552   - if(childTaskPlan.getMileageType().equals("service")&&"正常".equals(childTaskPlan.getType1())){
  537 + if(childTaskPlan.getMileageType().equals("service")
  538 + &&"正常".equals(childTaskPlan.getType1())
  539 + && childTaskPlan.getCcId()==null){
553 540 if (!childTaskPlan.isDestroy()) {
554 541 Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
555 542 sjgl=Arith.add(sjgl,jhgl);
... ... @@ -649,8 +636,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
649 636 for (int i = 0; i < lists.size(); i++) {
650 637 ScheduleRealInfo scheduleRealInfo=lists.get(i);
651 638 if (!isInOut(scheduleRealInfo)) {
652   - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
653   - if(!scheduleRealInfo.isSflj()){
  639 + if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
654 640 String time="";
655 641 if(item.equals("zgf") || item.equals("wgf")){
656 642 if(scheduleRealInfo.getFcsjActual()!=null){
... ... @@ -681,62 +667,6 @@ public class CulateMileageServiceImpl implements CulateMileageService{
681 667 }
682 668  
683 669 }
684   - /*if(childTaskPlans.isEmpty()){
685   - if(scheduleRealInfo.getStatus()!=-1){
686   - if(item.equals("zgf")){
687   - if(fcsj>=zgf1 && fcsj<=zgf2){
688   - sjbc++;
689   - }
690   - }else if(item.equals("wgf")){
691   - if(fcsj>=wgf1 && fcsj<=wgf2){
692   - sjbc++;
693   - }
694   - }else{
695   - sjbc++;
696   - }
697   -
698   - }
699   - }else{
700   - if(scheduleRealInfo.getStatus() == -1){
701   - boolean fage=false;
702   - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
703   - while(it.hasNext()){
704   - ChildTaskPlan childTaskPlan = it.next();
705   - if(!childTaskPlan.isDestroy()){
706   - if(childTaskPlan.getMileageType().equals("service")){
707   - fage=true;
708   - }
709   - }
710   -
711   - }
712   - if(fage){
713   - if(item.equals("zgf")){
714   - if(fcsj>=zgf1 && fcsj<=zgf2){
715   - sjbc++;
716   - }
717   - }else if(item.equals("wgf")){
718   - if(fcsj>=wgf1 && fcsj<=wgf2){
719   - sjbc++;
720   - }
721   - }else{
722   - sjbc++;
723   - }
724   - }
725   -
726   - }else{
727   - if(item.equals("zgf")){
728   - if(fcsj>=zgf1 && fcsj<=zgf2){
729   - sjbc++;
730   - }
731   - }else if(item.equals("wgf")){
732   - if(fcsj>=wgf1 && fcsj<=wgf2){
733   - sjbc++;
734   - }
735   - }else{
736   - sjbc++;
737   - }
738   - }
739   - }*/
740 670 }
741 671 }
742 672 }
... ... @@ -750,14 +680,13 @@ public class CulateMileageServiceImpl implements CulateMileageService{
750 680 double ksgl =0;
751 681 for (int i = 0; i < lists.size(); i++) {
752 682 ScheduleRealInfo scheduleRealInfo=lists.get(i);
753   - if (!(scheduleRealInfo.getBcType().equals("in")
754   - || scheduleRealInfo.getBcType().equals("out"))) {
  683 + if (!isInOut(scheduleRealInfo)) {
755 684 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
756 685 if(!childTaskPlans.isEmpty()){
757 686 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
758 687 while (it.hasNext()) {
759 688 ChildTaskPlan childTaskPlan = it.next();
760   - if(childTaskPlan.getMileageType().equals("empty")){
  689 + if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
761 690 if (!childTaskPlan.isDestroy()) {
762 691 Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
763 692 ksgl=Arith.add(ksgl,jhgl);
... ... @@ -786,7 +715,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
786 715 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
787 716 while (it.hasNext()) {
788 717 ChildTaskPlan childTaskPlan = it.next();
789   - if(childTaskPlan.getMileageType().equals("empty")){
  718 + if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
790 719 if (!childTaskPlan.isDestroy()) {
791 720 Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
792 721 jcclc=Arith.add(jcclc,jhgl);
... ... @@ -907,7 +836,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
907 836 double jcclc =0;
908 837 for (int i = 0; i < lists.size(); i++) {
909 838 ScheduleRealInfo scheduleRealInfo=lists.get(i);
910   - if(!scheduleRealInfo.isSflj()){
  839 + if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
911 840 if (scheduleRealInfo.getBcType().equals("in")
912 841 || scheduleRealInfo.getBcType().equals("out")|| scheduleRealInfo.getBcType().equals("ldks")) {
913 842 if(!scheduleRealInfo.isSflj()){
... ... @@ -946,16 +875,17 @@ public class CulateMileageServiceImpl implements CulateMileageService{
946 875 //有子任务
947 876 if (cts != null && cts.size() > 0) {
948 877 for(ChildTaskPlan c : cts){
949   - if(item.equals("其他")){
950   - if(c.isDestroy() &&
951   - ((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
952   - (c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
953   - sum = Arith.add(sum, c.getMileage());
954   - }else{
955   - if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
956   - sum = Arith.add(sum, c.getMileage());
  878 + if(c.getCcId()==null){
  879 + if(item.equals("其他")){
  880 + if(c.isDestroy() &&
  881 + ((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
  882 + (c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
  883 + sum = Arith.add(sum, c.getMileage());
  884 + }else{
  885 + if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
  886 + sum = Arith.add(sum, c.getMileage());
  887 + }
957 888 }
958   -
959 889 }
960 890 }
961 891 else if(isInOut(sch))
... ... @@ -984,7 +914,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{
984 914 int fzbc=0;
985 915 for (int i = 0; i < lists.size(); i++) {
986 916 ScheduleRealInfo scheduleRealInfo=lists.get(i);
987   - if (scheduleRealInfo.getBcType().equals("venting")) {
  917 + if (scheduleRealInfo.getBcType().equals("venting")
  918 + || scheduleRealInfo.getBcType().equals("major")) {
988 919 // if(!scheduleRealInfo.isSflj()){
989 920 String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
990 921 long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @a34aa5c
... ... @@ -1916,7 +1916,7 @@ public class ReportServiceImpl implements ReportService{
1916 1916 if(cts != null && cts.size() > 0){
1917 1917 lists.add(s);
1918 1918 }else{
1919   - if(s.getZdsjActual()!=null){
  1919 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
1920 1920 lists.add(s);
1921 1921 }
1922 1922 }
... ... @@ -2534,7 +2534,7 @@ public class ReportServiceImpl implements ReportService{
2534 2534 if(cts != null && cts.size() > 0){
2535 2535 lists.add(s);
2536 2536 }else{
2537   - if(s.getZdsjActual()!=null){
  2537 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
2538 2538 lists.add(s);
2539 2539 }
2540 2540 }
... ...
src/main/resources/static/pages/forms/statement/jobSummary.html
  View file @a34aa5c
... ... @@ -273,7 +273,13 @@
273 273 })
274 274  
275 275 $get('/report/jobHzxx',{line:line,date:date},function(result){
276   - console
  276 + //临加
  277 + $("#ljbcs").html(result.ljbc);
  278 + $("#ljgls").html(result.ljgl)
  279 +
  280 + //烂班
  281 + $("#lbbcs").html(result.lbbc);
  282 + $("#lbgls").html(result.lbgl)
277 283 var list_xxsj=template('list_xxsj',result);
278 284 $('#forms .list_xxsj').html(list_xxsj);
279 285  
... ...