Merge remote-tracking branch 'origin/qingpu_20180808' into qingpu_20180808

王通
2 parents b19f44d4 4d865d7b
Showing 5 changed files with 89 additions and 12 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
src/main/resources/static/pages/forms/statement/refuelDc.html
src/main/resources/static/pages/forms/statement/refuelYc.html
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -76,12 +76,13 @@ public class GpsController {
         Map<String, VehicleArrivalStopRealMonitorDto> arrivalStopRealMonitorMap = new HashMap<>();
         if (lateReminderServiceFacade == null) {
             LOG.warn("LateReminderServiceFacade服务未导入，请检查dubbo相关配置！");
-        }
-        try {
-            // 按照车牌作为key，映射map
-            arrivalStopRealMonitorMap.putAll(lateReminderServiceFacade.getVehicleArrivalStopRealMonitorInfo_cph(lineArray));
-        } catch (Exception exp) {
-            LOG.warn("LateReminderServiceFacade远端调用异常，请检查dubbo服务部署情况！", exp);
+        } else {
+            try {
+                // 按照车牌作为key，映射map
+                arrivalStopRealMonitorMap.putAll(lateReminderServiceFacade.getVehicleArrivalStopRealMonitorInfo_cph(lineArray));
+            } catch (Exception exp) {
+                LOG.warn("LateReminderServiceFacade远端调用异常，请检查dubbo服务部署情况！message={}", exp.getLocalizedMessage());
+            }
         }
         rs.put("gpsList", gpsList);
@@ -307,6 +307,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			String realMileage = "", oil = "0", addOil = "0", consume = "", cr = "";
 			String ksMileage = "", ssMileage = "", bc = "", jhbc = "", sjbc = "";
+			String remarks = "";
 			Double sjgl = culateMileageService.culateSjgl(list2);
 			Double ksgl = culateMileageService.culateKsgl(list2);
@@ -331,6 +332,31 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			bc_z = new BigDecimal(bc_z).add(new BigDecimal(bc)).toString();
 			cr_z = new BigDecimal(cr_z).add(new BigDecimal(cr)).toString();
+			for(ScheduleRealInfo s : list2){
+				String remark = "";
+				if(s.getRemarks() != null){
+					remark += s.getRemarks().trim();
+				}
+				if (s.isDestroy()) {
+					remark += "(烂班)";
+	            }
+				if(remark.length() > 0 && remarks.length() > 0){
+					remarks += ";";
+				}
+				remarks += remark;
+				Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+				for(ChildTaskPlan c : childTaskPlans){
+					remark = "";
+					if(c.getRemarks() != null){
+						remark = c.getRemarks().trim();
+					}
+					if(remark.length() > 0 && remarks.length() > 0){
+						remarks += ";";
+					}
+					remarks += remark;
+				}
+			}
+			
 			List<Refuel> refuels = repository.selectByCarAndDriver(date, split[0], split[1]);
 			Refuel r = new Refuel();
@@ -479,7 +505,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			m.put("yw", "");	//业务
 			m.put("cj", "");	//车间
 			m.put("cr", cr);
-			m.put("remark", "");
+			m.put("remark", remarks);
 			resList.add(m);
@@ -638,6 +664,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			String realMileage = "", ksMileage = "", ssMileage = "",
 					bc = "", jhbc = "", sjbc = "", cr = "";
+			String remarks = "";
 			Double sjgl = culateMileageService.culateSjgl(list2);
 			Double ksgl = culateMileageService.culateKsgl(list2);
@@ -662,6 +689,31 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			bc_z = new BigDecimal(bc_z).add(new BigDecimal(bc)).toString();
 			cr_z = new BigDecimal(cr_z).add(new BigDecimal(cr)).toString();
+			for(ScheduleRealInfo s : list2){
+				String remark = "";
+				if(s.getRemarks() != null){
+					remark += s.getRemarks().trim();
+				}
+				if (s.isDestroy()) {
+					remark += "(烂班)";
+	            }
+				if(remark.length() > 0 && remarks.length() > 0){
+					remarks += ";";
+				}
+				remarks += remark;
+				Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+				for(ChildTaskPlan c : childTaskPlans){
+					remark = "";
+					if(c.getRemarks() != null){
+						remark = c.getRemarks().trim();
+					}
+					if(remark.length() > 0 && remarks.length() > 0){
+						remarks += ";";
+					}
+					remarks += remark;
+				}
+			}
+			
 			m.put("date", scheList.get(0).getScheduleDateStr());
 			m.put("line", list2.get(0).getXlName());
 			m.put("car", split[0]);
@@ -678,7 +730,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			m.put("jhbc", jhbc);
 			m.put("sjbc", sjbc);
 			m.put("cr", cr);
-			m.put("remark", "");
+			m.put("remark", remarks);
 			resList.add(m);
 		}
@@ -232,7 +232,15 @@
 			<td>{{obj.ssMileage}}</td>
 			<td>{{obj.bc}}</td>
 			<td>{{obj.cr}}</td>
-			<td>{{obj.remark}}</td>
+			<td title="{{obj.remark}}">
+             	{{if obj.remark !=""}}
+					<div class="caption">
+
+                    	<font style="font-size: 24px;font-weight: bold;">！</font>
+
+                    </div>
+				{{/if}}
+			</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -239,7 +239,15 @@
 			<td>{{obj.ssMileage}}</td>
 			<td>{{obj.bc}}</td>
 			<td>{{obj.cr}}</td>
-			<td>{{obj.remark}}</td>
+			<td title="{{obj.remark}}">
+             	{{if obj.remark !=""}}
+					<div class="caption">
+
+                    	<font style="font-size: 24px;font-weight: bold;">！</font>
+
+                    </div>
+				{{/if}}
+			</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -234,10 +234,18 @@
                     var zdsjActual = (obj.zdsjActual).split(":");
                     var zdsj = (obj.zdsj).split(":");
                     if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
-                        obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                    	if(zdsjActual[0]*60+Number(zdsjActual[1]) - zdsj[0]*60+Number(zdsj[1]) > 1000){
+                    		obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) + 1440;
+                    	} else {
+                        	obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                    	}
                     }
                     else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
-                        obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                    	if((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) > 1000){
+                    		obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1])) + 1440;
+                    	} else {
+                        	obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                    	}
                     }
                 }
             });