潘钊 / bsth_control · Commits

Commit 50f5e720da254c87040290e4a5f6c63f657a243e

Authored by 潘钊
2 parents 4ac7ebf2 c7432f92
build: skipped

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

Inline Side-by-side
Showing 4 changed files with 56 additions and 40 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @50f5e72
... ... @@ -2365,7 +2365,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2365 2365 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
2366 2366 int jhbc = 0,cjbc = 0,ljbc = 0;
2367 2367 double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
2368   - float addMileage = 0l,remMileage = 0l;
  2368 + float addMileage = 0l,remMileage = 0l, addgl = 0, remgl = 0;
2369 2369 int xyz=1;
2370 2370 Map<String,Object> map;
2371 2371 for(ScheduleRealInfo scheduleRealInfo : scheduleRealInfos){
... ... @@ -2375,6 +2375,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2375 2375 //烂班里程（主任务烂班），
2376 2376 //临加里程（主任务临加），
2377 2377 //计划班次，烂班班次，增加班次
  2378 + double jh = 0, sj = 0;
2378 2379 tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
2379 2380 if(scheduleRealInfo.isSflj()){
2380 2381 ljbc++;
... ... @@ -2382,7 +2383,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2382 2383 if( !(scheduleRealInfo.getBcType().equals("in")
2383 2384 ||scheduleRealInfo.getBcType().equals("out")) ){
2384 2385 jhbc++;
2385   - jhlc += tempJhlc;
  2386 + jh += tempJhlc;
2386 2387 }
2387 2388 if(scheduleRealInfo.getStatus() == -1){
2388 2389 remMileage += tempJhlc;
... ... @@ -2405,7 +2406,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2405 2406 if(scheduleRealInfo.isSflj()){
2406 2407 addMileage += tempJhlc;
2407 2408 }
2408   - yygl += tempJhlc;
  2409 + sj += tempJhlc;
2409 2410 }
2410 2411 }
2411 2412 }else{
... ... @@ -2429,7 +2430,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2429 2430 if(scheduleRealInfo.isSflj()){
2430 2431 addMileage += tempJhlc;
2431 2432 }
2432   - yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  2433 + sj += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
2433 2434 }
2434 2435 }
2435 2436 }
... ... @@ -2480,6 +2481,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2480 2481 e.printStackTrace();
2481 2482 }
2482 2483 }
  2484 + jhlc += jh;
  2485 + yygl += sj;
  2486 + if(jh > sj){
  2487 + remgl += jh - sj;
  2488 + } else {
  2489 + addgl += sj - jh;
  2490 + }
2483 2491 }
2484 2492 }
2485 2493  
... ... @@ -2496,17 +2504,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2496 2504 map.put("jzl", jzl);
2497 2505 map.put("jhlc", format.format(jhlc+jcclc));
2498 2506 map.put("yygljh", format.format(jhlc));
2499   - map.put("ssgl", format.format(remMileage));
  2507 + map.put("ssgl", format.format(remgl));
2500 2508 map.put("ksgl", format.format(ksgl));
2501   - map.put("yyglsj", format.format(yygl+remMileage));
  2509 + map.put("yyglsj", format.format(yygl));
2502 2510 map.put("jhbc", jhbc);
2503 2511 map.put("jcclc", jcclc);
2504 2512  
2505   - map.put("ljgl", format.format(addMileage));
  2513 + map.put("ljgl", format.format(addgl));
2506 2514 map.put("ssbc", cjbc);
2507 2515 map.put("ysgl", format.format(yygl));
2508 2516 map.put("sjbc", jhbc-cjbc+ljbc);
2509   - map.put("zgl", format.format(yygl+remMileage+ksgl+jcclc));
  2517 + map.put("zgl", format.format(yygl+ksgl+jcclc));
2510 2518 map.put("ljbc", ljbc);
2511 2519 String zdp="",zwdp="",wdp="";
2512 2520 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
... ... @@ -2557,7 +2565,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2557 2565 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
2558 2566 int jhbc = 0,cjbc = 0,ljbc = 0;
2559 2567 double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
2560   - float addMileage = 0l,remMileage = 0l;
  2568 + float addMileage = 0l,remMileage = 0l, addgl = 0, remgl = 0;
2561 2569 Map<String,Object> map = new HashMap<String, Object>();
2562 2570 for(ScheduleRealInfo scheduleRealInfo : list){
2563 2571 if(scheduleRealInfo != null){
... ... @@ -2565,6 +2573,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2565 2573 //烂班里程（主任务烂班），
2566 2574 //临加里程（主任务临加），
2567 2575 //计划班次，烂班班次，增加班次
  2576 + double jh = 0, sj = 0;
2568 2577 tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
2569 2578 if(scheduleRealInfo.isSflj()){
2570 2579 ljbc++;
... ... @@ -2572,7 +2581,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2572 2581 if( !(scheduleRealInfo.getBcType().equals("in")
2573 2582 ||scheduleRealInfo.getBcType().equals("out")) ){
2574 2583 jhbc++;
2575   - jhlc += tempJhlc;
  2584 + jh += tempJhlc;
2576 2585 }
2577 2586  
2578 2587 if(scheduleRealInfo.getStatus() == -1){
... ... @@ -2597,7 +2606,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2597 2606 if(scheduleRealInfo.isSflj()){
2598 2607 addMileage += tempJhlc;
2599 2608 }
2600   - yygl += tempJhlc;
  2609 + sj += tempJhlc;
2601 2610 }
2602 2611 }
2603 2612 }else{
... ... @@ -2621,26 +2630,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2621 2630 if(scheduleRealInfo.isSflj()){
2622 2631 addMileage += tempJhlc;
2623 2632 }
2624   - yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  2633 + sj += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
2625 2634 }
2626 2635 }
2627 2636 }
2628 2637 }
  2638 + jhlc += jh;
  2639 + yygl += sj;
  2640 + if(jh > sj){
  2641 + remgl += jh - sj;
  2642 + } else if(sj > jh){
  2643 + addgl += sj - jh;
  2644 + }
2629 2645 }
2630 2646 }
2631 2647 map.put("jhlc", format.format(jhlc+jcclc));
2632 2648 map.put("yygljh", format.format(jhlc));
2633   - map.put("ssgl", format.format(remMileage));
  2649 + map.put("ssgl", format.format(remgl));
2634 2650 map.put("ksgl", format.format(ksgl));
2635   - map.put("yyglsj", format.format(yygl+remMileage));
  2651 + map.put("yyglsj", format.format(yygl));
2636 2652 map.put("jhbc", jhbc);
2637 2653 map.put("jcclc", jcclc);
2638 2654  
2639   - map.put("ljgl", format.format(addMileage));
  2655 + map.put("ljgl", format.format(addgl));
2640 2656 map.put("ssbc", cjbc);
2641 2657 map.put("ysgl", format.format(yygl));
2642 2658 map.put("sjbc", jhbc-cjbc+ljbc);
2643   - map.put("zgl", format.format(yygl+remMileage+ksgl+jcclc));
  2659 + map.put("zgl", format.format(yygl+ksgl+jcclc));
2644 2660 map.put("ljbc", ljbc);
2645 2661  
2646 2662 return map;
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/employeeGroup/saEmployeegroup.js
  View file @50f5e72
... ... @@ -60,9 +60,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
60 60 angular.forEach(self.$$dataReal, function(obj) {
61 61 if (self.$$isAll) { // 显示全部
62 62 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
63   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
64   - || obj.$camelChars.indexOf(self.$$searchText) != -1
65   - || obj.$str.indexOf(self.$$searchText) != -1) {
  63 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  64 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  65 + || obj.$str.indexOf(self.$$searchText.toUpperCase()) != -1) {
66 66 this.push(obj);
67 67 }
68 68 } else {
... ... @@ -71,9 +71,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
71 71 } else { // 显示限定数量
72 72 if (this.length < self.$$showNumber) {
73 73 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
74   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
75   - || obj.$camelChars.indexOf(self.$$searchText) != -1
76   - || obj.$str.indexOf(self.$$searchText) != -1) {
  74 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  75 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  76 + || obj.$str.indexOf(self.$$searchText.toUpperCase()) != -1) {
77 77 this.push(obj);
78 78 }
79 79 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/guideboardGroup/saGuideboardgroup.js
  View file @50f5e72
... ... @@ -49,9 +49,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
49 49 angular.forEach(self.$$dataReal, function(obj) {
50 50 if (self.$$isAll) { // 显示全部
51 51 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
52   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
53   - || obj.$camelChars.indexOf(self.$$searchText) != -1
54   - || obj.lpname.indexOf(self.$$searchText) != -1) {
  52 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  53 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  54 + || obj.lpname.indexOf(self.$$searchText.toUpperCase()) != -1) {
55 55 this.push(obj);
56 56 }
57 57 } else {
... ... @@ -60,9 +60,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
60 60 } else { // 显示限定数量
61 61 if (this.length < self.$$showNumber) {
62 62 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
63   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
64   - || obj.$camelChars.indexOf(self.$$searchText) != -1
65   - || obj.lpname.indexOf(self.$$searchText) != -1) {
  63 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  64 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  65 + || obj.lpname.indexOf(self.$$searchText.toUpperCase()) != -1) {
66 66 this.push(obj);
67 67 }
68 68 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @50f5e72
... ... @@ -2254,9 +2254,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
2254 2254 angular.forEach(self.$$dataReal, function(obj) {
2255 2255 if (self.$$isAll) { // 显示全部
2256 2256 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
2257   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
2258   - || obj.$camelChars.indexOf(self.$$searchText) != -1
2259   - || obj.lpname.indexOf(self.$$searchText) != -1) {
  2257 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2258 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2259 + || obj.lpname.indexOf(self.$$searchText.toUpperCase()) != -1) {
2260 2260 this.push(obj);
2261 2261 }
2262 2262 } else {
... ... @@ -2265,9 +2265,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
2265 2265 } else { // 显示限定数量
2266 2266 if (this.length < self.$$showNumber) {
2267 2267 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
2268   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
2269   - || obj.$camelChars.indexOf(self.$$searchText) != -1
2270   - || obj.lpname.indexOf(self.$$searchText) != -1) {
  2268 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2269 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2270 + || obj.lpname.indexOf(self.$$searchText.toUpperCase()) != -1) {
2271 2271 this.push(obj);
2272 2272 }
2273 2273 } else {
... ... @@ -2708,9 +2708,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
2708 2708 angular.forEach(self.$$dataReal, function(obj) {
2709 2709 if (self.$$isAll) { // 显示全部
2710 2710 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
2711   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
2712   - || obj.$camelChars.indexOf(self.$$searchText) != -1
2713   - || obj.$str.indexOf(self.$$searchText) != -1) {
  2711 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2712 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2713 + || obj.$str.indexOf(self.$$searchText.toUpperCase()) != -1) {
2714 2714 this.push(obj);
2715 2715 }
2716 2716 } else {
... ... @@ -2719,9 +2719,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
2719 2719 } else { // 显示限定数量
2720 2720 if (this.length < self.$$showNumber) {
2721 2721 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
2722   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
2723   - || obj.$camelChars.indexOf(self.$$searchText) != -1
2724   - || obj.$str.indexOf(self.$$searchText) != -1) {
  2722 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2723 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2724 + || obj.$str.indexOf(self.$$searchText.toUpperCase()) != -1) {
2725 2725 this.push(obj);
2726 2726 }
2727 2727 } else {
... ...