Update

徐烜
1 parent f10a219b
Showing 7 changed files with 56 additions and 7 deletions
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/Personnel.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/common/main.js
@@ -2,6 +2,7 @@ package com.bsth.entity;
 import com.bsth.entity.schedule.BEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.Formula;
 import javax.persistence.*;
 import java.io.Serializable;
@@ -47,6 +48,10 @@ public class Cars extends BEntity implements Serializable {
     /** 分公司 */
     private String brancheCompany;
+    /** 组合公司分公司编码 */
+    @Formula(" concat(business_code, '_', branche_company_code) ")
+    private String cgsbm;
+
     /** 车辆编码（TODO：在原系统里没有，这里暂时留着） */
     @Column(nullable = false)
 	private String carCode;
@@ -499,4 +504,12 @@ public class Cars extends BEntity implements Serializable {
     public void setXlmc(String xlmc) {
         this.xlmc = xlmc;
     }
+
+    public String getCgsbm() {
+        return cgsbm;
+    }
+
+    public void setCgsbm(String cgsbm) {
+        this.cgsbm = cgsbm;
+    }
 }
@@ -2,6 +2,7 @@ package com.bsth.entity;
 import com.bsth.entity.schedule.BEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.Formula;
 import javax.persistence.*;
@@ -39,6 +40,10 @@ public class Personnel extends BEntity {
     private String brancheCompany;
     /** 分公司编码 */
     private String brancheCompanyCode;
+    /** 组合公司分公司编码 */
+    @Formula(" concat(company_code, '_', branche_company_code) ")
+    private String cgsbm;
+
     /** 工号 */
     @Column(nullable = false)
     private String jobCode;
@@ -218,4 +223,12 @@ public class Personnel extends BEntity {
     public void setDescriptions(String descriptions) {
         this.descriptions = descriptions;
     }
+
+    public String getCgsbm() {
+        return cgsbm;
+    }
+
+    public void setCgsbm(String cgsbm) {
+        this.cgsbm = cgsbm;
+    }
 }
@@ -6,11 +6,11 @@ spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
-spring.jpa.show-sql= false
+spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://localhost:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root
+spring.datasource.password=
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -4,7 +4,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     'BusInfoManageService',
     [
         'BusInfoManageService_g',
-        function(service) {
+        'UserPrincipal',
+        function(service, UserPrincipal) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {
@@ -36,6 +37,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                  */
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 /**
@@ -4,7 +4,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     'DeviceInfoManageService',
     [
         'DeviceInfoManageService_g',
-        function(service) {
+        'UserPrincipal',
+        function(service, UserPrincipal) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {'isCancel_eq': false};
@@ -26,6 +27,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 },
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 getPage: function(page) {
@@ -4,7 +4,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     'EmployeeInfoManageService',
     [
         'EmployeeInfoManageService_g',
-        function(service) {
+        'UserPrincipal',
+        function(service, UserPrincipal) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {
@@ -36,6 +37,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                  */
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 /**
@@ -15,7 +15,8 @@ ScheduleApp.factory(&#39;UserPrincipal&#39;, [
         // 登录后获取用户公司信息
         var gsinfos = []; // 原始返回的对象数据
-        var gsinfo_strs = []; // 拼装以后的
+        var gsinfo_strs = []; // 拼装以后的（公司代码_分公司代码）
+        var gsinfo_strs_u = []; // 拼装以后的（分公司代码_公司代码）
         $http({
             method: 'GET',
@@ -28,6 +29,7 @@ ScheduleApp.factory(&#39;UserPrincipal&#39;, [
                     angular.forEach(obj.children, function(obj2) {
                         var fgsbm = obj2.code;
                         gsinfo_strs.push(gsbm + "_" + fgsbm);
+                        gsinfo_strs_u.push(fgsbm + "_" + gsbm);
                     });
                 });
@@ -39,6 +41,9 @@ ScheduleApp.factory(&#39;UserPrincipal&#39;, [
         return {
             getGsStrs: function() {
                 return gsinfo_strs;
+            },
+            getGsStrsU: function() {
+                return gsinfo_strs_u;
             }
         };
     }