Update

徐烜
1 parent d9ea8cf2
Showing 7 changed files with 90 additions and 51 deletions
.gitignore
src/main/java/com/bsth/controller/PersonnelController.java
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/service/schedule/utils/PoiUtils.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/common/main.js
@@ -8,6 +8,7 @@ test_junitReport/
 test_coverage/
 .idea
 .DS_Store
+npm-debug.log
 *.iml
 tmp
 E:/
@@ -36,6 +36,7 @@ public class PersonnelController extends BaseController&lt;Personnel, Integer&gt; {
     @RequestMapping(value = "/all_py", method = RequestMethod.GET)
 	public List<PersionPinYin> findAll_PY(){
+        persionPinYinBuffer.refresh();
         return persionPinYinBuffer.getAll();
     }
@@ -213,6 +213,7 @@ public class BController&lt;T, ID extends Serializable&gt; {
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("msg", "上传&导入文件成功");
         } catch (Exception exp) {
+            exp.printStackTrace();
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -18,7 +18,7 @@ public class PoiUtils {
      * @return
      */
     public static String getStringValueFromCell(Cell cell) {
-        SimpleDateFormat sFormat = new SimpleDateFormat("MM/dd/yyyy");
+        SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd");
         DecimalFormat decimalFormat = new DecimalFormat("#.#");
         String cellValue = "";
         if(cell == null) {
@@ -229,7 +229,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         'BusInfoManageService',
         '$stateParams',
         '$state',
-        function(service, $stateParams, $state) {
+        'DataStore',
+        function(service, $stateParams, $state, DataStore) {
             var self = this;
             var Cars = service.getQueryClass();
@@ -264,6 +265,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 console.log(self.busInfoForSave);
                 // 保存或者更新
                 self.busInfoForSave.$save(function() {
+                    DataStore.refreshData("cl");
                     $state.go("busInfoManage");
                 });
             };
@@ -245,7 +245,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         'EmployeeInfoManageService',
         '$stateParams',
         '$state',
-        function(service, $stateParams, $state) {
+        'DataStore',
+        function(service, $stateParams, $state, DataStore) {
             var self = this;
             var Employee = service.getQueryClass();
@@ -271,6 +272,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // 保存或更新
                 self.employeeInfoForSave.$save(function() {
+                    DataStore.refreshData("ry");
                     $state.go("employeeInfoManage");
                 });
             };
@@ -53,64 +53,89 @@ ScheduleApp.factory(&#39;UserPrincipal&#39;, [
 ScheduleApp.factory('DataStore', [
     '$http',
-    function($http) {
+    '$q',
+    function($http, $q) {
         // 本地数据存储，如车辆数据，人员数据
         var dataMap = {
             "cl": [],
             "ry": []
         };
-        $http({
-            method: 'GET',
-            url: '/cars_sc/all'
-        }).then(function(result) {
-            // 简拼数据
-            dataMap.cl = result.data.data;
-            angular.forEach(result.data.data, function(obj) {
-                //// 全拼
-                //obj["$fullChars"] = pinyin.getFullChars(obj.insideCode ? obj.insideCode: "");
-                //// 简拼
-                //obj["$camelChars"] = pinyin.getCamelChars(obj.insideCode ? obj.insideCode: "");
-                // 全拼
-                obj["$fullChars"] = obj.insideCode? obj.insideCode: "";
-                // 简拼
-                obj["$camelChars"] = obj.insideCode? obj.insideCode: "";
-                // 原值
-                obj["$calcu_str"] = obj.insideCode? obj.insideCode: "";
+        var dataPromise_cars = function() {
+            var deferred = $q.defer();
+            $http({
+                method: 'GET',
+                url: '/cars_sc/all'
+            }).then(function(result) {
+                // 简拼数据
+                var dd = result.data.data;
+                angular.forEach(result.data.data, function(obj) {
+                    //// 全拼
+                    //obj["$fullChars"] = pinyin.getFullChars(obj.insideCode ? obj.insideCode: "");
+                    //// 简拼
+                    //obj["$camelChars"] = pinyin.getCamelChars(obj.insideCode ? obj.insideCode: "");
+                    // 全拼
+                    obj["$fullChars"] = obj.insideCode? obj.insideCode: "";
+                    // 简拼
+                    obj["$camelChars"] = obj.insideCode? obj.insideCode: "";
+                    // 原值
+                    obj["$calcu_str"] = obj.insideCode? obj.insideCode: "";
+                });
+                deferred.resolve(dd);
             });
-        });
+            return deferred.promise;
+        };
-        //$http({
-        //    method: 'GET',
-        //    url: '/ee/all'
-        //}).then(function(result) {
-        //    // 简拼数据
-        //    dataMap.ry = result.data.data;
-        //    angular.forEach(result.data.data, function(obj) {
-        //        // 全拼
-        //        obj["$fullChars"] = pinyin.getFullChars(obj.personnelName + "-" + obj.jobCode);
-        //        // 简拼
-        //        obj["$camelChars"] = pinyin.getCamelChars(obj.personnelName + "-" + obj.jobCode);
-        //        // 原值
-        //        obj["$calcu_str"] = obj.personnelName + "-" + obj.jobCode;
-        //    });
-        //});
+        var dataPromise_ees = function() {
+            var deferred = $q.defer();
-        $http({
-            method: 'GET',
-            url: '/personnel/all_py'
-        }).then(function(result) {
-            // 简拼数据
-            dataMap.ry = result.data;
-            angular.forEach(result.data, function(obj) {
-                // 全拼
-                obj["$fullChars"] = obj.fullChars;
-                // 简拼
-                obj["$camelChars"] = obj.camelChars;
-                // 原值
-                obj["$calcu_str"] = obj.name + "-" + obj.workId;
+            $http({
+                method: 'POST',
+                url: '/basic/refresh_person_data'
+            }).then(function() {
+                $http({
+                    method: 'GET',
+                    url: '/personnel/all_py'
+                }).then(function(result) {
+                    // 简拼数据
+                    var dd = result.data;
+                    angular.forEach(result.data, function(obj) {
+                        // 全拼
+                        obj["$fullChars"] = obj.fullChars;
+                        // 简拼
+                        obj["$camelChars"] = obj.camelChars;
+                        // 原值
+                        obj["$calcu_str"] = obj.name + "-" + obj.workId;
+                    });
+                    deferred.resolve(dd);
+                });
             });
-        });
+            return deferred.promise;
+        };
+
+        var refreshCars = function() {
+            dataPromise_cars().then(function(res) {
+                console.log("refreshCars");
+                dataMap.cl = [];
+                angular.forEach(res, function(obj) {
+                    dataMap.cl.push(obj);
+                });
+            });
+        };
+
+        var refreshEes = function() {
+            dataPromise_ees().then(function(res) {
+                console.log("refreshEes");
+                dataMap.ry = [];
+                angular.forEach(res, function(obj) {
+                    dataMap.ry.push(obj);
+                });
+            });
+        };
+
+        // 初始化
+        refreshCars();
+        refreshEes();
         return {
             getData: function(type) {
@@ -119,6 +144,13 @@ ScheduleApp.factory(&#39;DataStore&#39;, [
                 } else {
                     return [];
                 }
+            },
+            refreshData: function(type) {
+                if (type == 'cl') {
+                    refreshCars();
+                } else if (type == 'ry') {
+                    refreshEes();
+                }
             }
         }