Merge branch 'minhang' into qingpu

# Conflicts: # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java # src/main/resources/ms-jdbc.properties # src/main/resources/static/real_control_v2/js/north/toolbar.js

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java # src/main/resources/ms-jdbc.properties # src/main/resources/static/real_control_v2/js/north/toolbar.js
潘钊
1 parent 143d992a
Showing 3 changed files with 31 additions and 33 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/real_control_v2/css/line_schedule.css
@@ -420,6 +420,8 @@ public class DayOfSchedule implements CommandLineRunner {
         while (itrab.hasNext()) {
             sp = itrab.next();
             sp.setSchedulePlan(null);
+            sp.setCreateBy(null);
+            sp.setUpdateBy(null);
             list.add(sp);
         }
         return list;
@@ -633,6 +635,7 @@ public class DayOfSchedule implements CommandLineRunner {
 //	}
     public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
+        Collections.sort(nbbmScheduleMap.get(nbbm), schFCSJComparator);
         return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
     }
@@ -785,6 +788,8 @@ public class DayOfSchedule implements CommandLineRunner {
     public void addExecPlan(ScheduleRealInfo sch) {
         if(sch != null)
             carExecutePlanMap.put(sch.getClZbh(), sch);
+        else
+            carExecutePlanMap.remove(sch.getClZbh());
     }
     public void removeExecPlan(String clzbh) {
@@ -836,6 +841,14 @@ public class DayOfSchedule implements CommandLineRunner {
         return ups;
     }
+    public void removeNbbm2SchMapp(ScheduleRealInfo sch, String nbbm){
+        nbbmScheduleMap.remove(nbbm, sch);
+    }
+
+    public void addNbbm2SchMapp(ScheduleRealInfo sch, String nbbm){
+        nbbmScheduleMap.put(nbbm, sch);
+    }
+
     public void reCalcExecPlan(String nbbm){
         carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(nbbmScheduleMap.get(nbbm)));
     }
 package com.bsth.service.oil.impl;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
 import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Ylb;
@@ -40,7 +15,20 @@ import com.bsth.service.oil.YlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.Arith;
 import com.bsth.util.BatchSaveUtils;
-import com.github.abel533.echarts.code.Y;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Service
 public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbService{
@@ -95,7 +95,7 @@
 }
 .line-schedule-table dl dt:nth-of-type(3), .line-schedule-table dl dd:nth-of-type(3) {
-    width: calc(2% + 66px);
+    width: calc(2% + 86px);
 }
 .line-schedule-table dl dt:nth-of-type(4), .line-schedule-table dl dd:nth-of-type(4) {
@@ -121,7 +121,7 @@
 }
 .line-schedule-table dl dt:nth-of-type(9), .line-schedule-table dl dd:nth-of-type(9) {
-    width: 70px;
+    width: 50px;
     border-right: 0;
 }
@@ -237,10 +237,6 @@
     height: 36px;
 }
-.schedule-body .ct_table dl:nth-child(even){
-    background: rgba(101, 204, 220, 0.13);
-}
-
 span.fcsj-diff {
     color: gray;
     margin-left: 3px;
@@ -531,7 +527,8 @@ div.drop-rail[data-type=&quot;car&quot;]:before {
 }
 dl.relevance-active dd:nth-child(n+2) {
-    background: #d2d2d2 !important;
+    background: #f1efef !important;
+    color: #333;
 }
 dl.relevance-active.intimity dd:nth-child(n+2) {