merge pudong

潘钊
1 parent 49040a0a
Showing 3 changed files with 52 additions and 2 deletions
src/main/java/com/bsth/controller/realcontrol/calc/ReCalcDataController.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
+package com.bsth.controller.realcontrol.calc;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.util.HttpClientUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 重新统计（数据汇总）
+ * Created by panzhao on 2018/1/25.
+ */
+@RestController
+@RequestMapping("/sch/reCalc")
+public class ReCalcDataController {
+
+    private static String reCalcUrl = "http://10.10.150.24:30571/reCalc/scheduleDetail";
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /**
+     * 重新统计班次明细
+     * @param date
+     * @param line
+     * @return
+     */
+    @RequestMapping(value = "/scheduleDetail", method = RequestMethod.POST)
+    public Map<String, Object> reCalcScheduleDetail(@RequestParam String date, @RequestParam String line){
+        Map<String, Object> rs = new HashMap();
+        try{
+            HttpClientUtils.post(reCalcUrl + "?rq=" + date + "&lineCode=" + line, "");
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
+}
@@ -1234,7 +1234,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleModifyLogger.sftz(sch, fcsjActual, remarks);
  
             sch.setFcsjActualAll(fcsjActual);
-            sch.setRemark(remarks);
+            sch.setRemarks(remarks);
             sch.calcStatus();
             //if(sch.isLate2()){
                 //取消应发未到标记
@@ -431,7 +431,7 @@
                     $(that).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>');
  
  
-                    var reCountEp = EventProxy.create('ylbUpdate', function () {
+                    var reCountEp = EventProxy.create('ylbUpdate', 'calcWaybill', 'scheduleDetail', function () {
                         $('i.uk-icon-spin', that).remove();
                         $(that).removeAttr('disabled');
                         notify_succ('重新统计成功！');
@@ -447,6 +447,11 @@
                         reCountEp.emitLater('ylbUpdate');
                     });
  
+                    //重新统计班次明细
+                    gb_common.$post('/sch/reCalc/scheduleDetail', {date:rq, line: lineCode}, function () {
+                        reCountEp.emitLater('scheduleDetail');
+                    });
+
                 }, '我确定');
             });
         })();