update...

潘钊
1 parent f5c22260
Showing 5 changed files with 116 additions and 89 deletions
src/main/java/com/bsth/data/schedule/SchModifyLog.java → src/main/java/com/bsth/data/schedule/edit_logs/FormLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/SchEditLogger.java → src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/css/modal_extend.css
src/main/resources/static/real_control_v2/js/main.js
-package com.bsth.data.schedule;
-
-import com.bsth.controller.realcontrol.dto.ChangePersonCar;
-import com.bsth.entity.mcy_forms.Changetochange;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.form.ChangetochangeRepository;
-import com.bsth.security.util.SecurityUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-/**
- * 线调实际排班修改日志记录
- * Created by panzhao on 2017/5/7.
- */
-@Service
-public class SchModifyLog {
-
-    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    ChangetochangeRepository changetochangeRepository;
-
-    /**
-     * 换人换车情况表
-     */
-    public void saveChangetochange(ScheduleRealInfo sch, ChangePersonCar cpc){
-        try {
-            String newNbbm = cpc.getClZbh();
-            String newJsy = cpc.getJsy();
-            String oldJsy = sch.getjGh()+"/"+sch.getjName();
-
-            if(newNbbm == null && newJsy == null)
-                return;
-
-            if(newNbbm != null && newJsy != null
-                    && newNbbm.equals(sch.getClZbh()) && newJsy.equals(oldJsy))
-                return;
-
-            Date d = new Date();
-            SysUser user = SecurityUtils.getCurrentUser();
-            Changetochange cc = new Changetochange();
-            cc.setRq(sch.getScheduleDateStr());
-            cc.setGs(sch.getGsBm());
-            cc.setFgs(sch.getFgsBm());
-            cc.setXl(sch.getXlBm());
-            cc.setLp(sch.getLpName());
-            cc.setFssj(fmtHHmm.print(d.getTime()));
-            cc.setXgsj(fmtHHmm.print(d.getTime()));
-            if(user != null)
-                cc.setXgr(user.getUserName());
-
-            cc.setPcch(sch.getClZbh());
-            cc.setPcry(oldJsy);
-            cc.setJhch(sch.getClZbh());
-            cc.setJhgh(sch.getjGh());
-
-            if(StringUtils.isNotEmpty(newNbbm))
-                cc.setSjch(newNbbm);
-            if(StringUtils.isNotEmpty(newJsy))
-                cc.setSjgh(newJsy);
-
-            changetochangeRepository.save(cc);
-        }catch (Exception e){
-            log.error("纪录换人换车情况表", e);
-        }
-    }
-
-    public void saveChangetochange(ScheduleRealInfo sch, String nbbm, String jsy){
-        ChangePersonCar cpc = new ChangePersonCar();
-        cpc.setClZbh(nbbm);
-        cpc.setJsy(jsy);
-        saveChangetochange(sch, cpc);
-    }
-}
+package com.bsth.data.schedule.edit_logs;
+
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.form.ChangetochangeRepository;
+import com.bsth.security.util.SecurityUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * 为报表写入相关的班次修改记录
+ * Created by panzhao on 2017/5/7.
+ */
+@Service
+public class FormLogger {
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    ChangetochangeRepository changetochangeRepository;
+
+    /**
+     * 换人换车情况表
+     */
+    public void saveChangetochange(ScheduleRealInfo sch, ChangePersonCar cpc){
+        try {
+            String newNbbm = cpc.getClZbh();
+            String newJsy = cpc.getJsy();
+            String oldJsy = sch.getjGh()+"/"+sch.getjName();
+
+            if(newNbbm == null && newJsy == null)
+                return;
+
+            if(newNbbm != null && newJsy != null
+                    && newNbbm.equals(sch.getClZbh()) && newJsy.equals(oldJsy))
+                return;
+
+            Date d = new Date();
+            SysUser user = SecurityUtils.getCurrentUser();
+            Changetochange cc = new Changetochange();
+            cc.setRq(sch.getScheduleDateStr());
+            cc.setGs(sch.getGsBm());
+            cc.setFgs(sch.getFgsBm());
+            cc.setXl(sch.getXlBm());
+            cc.setLp(sch.getLpName());
+            cc.setFssj(fmtHHmm.print(d.getTime()));
+            cc.setXgsj(fmtHHmm.print(d.getTime()));
+            if(user != null)
+                cc.setXgr(user.getUserName());
+
+            cc.setPcch(sch.getClZbh());
+            cc.setPcry(oldJsy);
+            cc.setJhch(sch.getClZbh());
+            cc.setJhgh(sch.getjGh());
+
+            if(StringUtils.isNotEmpty(newNbbm))
+                cc.setSjch(newNbbm);
+            if(StringUtils.isNotEmpty(newJsy))
+                cc.setSjgh(newJsy);
+
+            changetochangeRepository.save(cc);
+        }catch (Exception e){
+            log.error("纪录换人换车情况表", e);
+        }
+    }
+
+    public void saveChangetochange(ScheduleRealInfo sch, String nbbm, String jsy){
+        ChangePersonCar cpc = new ChangePersonCar();
+        cpc.setClZbh(nbbm);
+        cpc.setJsy(jsy);
+        saveChangetochange(sch, cpc);
+    }
+}
@@ -4,7 +4,7 @@ package com.bsth.data.schedule.edit_logs;
  * 班次修正记录
  * Created by panzhao on 2017/5/16.
  */
-public class SchEditLogger {
+public class ScheduleModifyLogger {
     /**
      * 待发调整
@@ -13,7 +13,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
-import com.bsth.data.schedule.SchModifyLog;
+import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.Cars;
@@ -135,7 +135,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     CulateMileageService culateService;
     @Autowired
-    SchModifyLog schModifyLog;
+    FormLogger schModifyLog;
     @Autowired
     DirectiveService directiveService;
@@ -1076,6 +1076,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 sch.setStatus(0);
                 sch.setRemarks("");//清空备注
                 sch.setJhlc(sch.getJhlcOrig());
+
+                //入库
+                dayOfSchedule.save(sch);
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
@@ -15,4 +15,28 @@
 .uk-modal.ct_move_modal .uk-modal-header{
     cursor: move;
     user-select: none;
+}
+
+#ssspVedioModal .uk-modal-dialog-large{
+    height: 650px;
+}
+
+#ssspVedioModal .uk-modal-header{
+    border-bottom: 1px solid #a2bfe7;
+}
+
+#ssspVedioModal iframe{
+    width: calc(100% + 37px);
+    height: calc(100% - 32px);
+    margin-left: -18px;
+    margin-top: -15px;
+}
+
+#ssspVedioModal #vedioIframe{
+    display: none;
+}
+
+#ssspVedioModal p.loading{
+    text-align: center;
+    margin-top: 50px;
 }
 \ No newline at end of file
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-16',
-        text: '<h5>修复了进出场班次公里设置为0后自动烂班的问题</h5>'
+        date: '2017-05-18',
+        text: '<h5>现在自定义子任务，勾选是否烂班后，烂班原因必填。</h5><h5>修复了在驾驶员请求出场时，误下发分班出场指令的问题</h5>'
     };
     var storage = window.localStorage