Merge branch 'PSQP-1' into qingpu

徐烜
2 parents 73bb0961 c34d580a
Showing 2 changed files with 30 additions and 1 deletions
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
@@ -4,6 +4,7 @@ import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.sys.SysUser;
+import org.hibernate.annotations.Formula;
  
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
@@ -45,6 +46,10 @@ public class EmployeeConfigInfo {
     @NotNull
     private String dbbm;
  
+    @Formula(" dbbm + 0 ")
+    private Integer dbbmFormula;
+
+
     /** 创建人 */
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private SysUser createBy;
@@ -91,6 +96,30 @@ public class EmployeeConfigInfo {
         this.jsy = jsy;
     }
  
+    public Integer getDbbmFormula() {
+        return dbbmFormula;
+    }
+
+    public void setDbbmFormula(Integer dbbmFormula) {
+        this.dbbmFormula = dbbmFormula;
+    }
+
+    public SysUser getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
+
+    public SysUser getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
+    }
+
     public Personnel getSpy() {
         return spy;
     }
@@ -222,7 +222,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
     return {
         rest : $resource(
             '/eci/:id',
-            {order: 'createDate', direction: 'ASC', id: '@id_route'},
+            {order: 'xl.id,dbbmFormula', direction: 'ASC', id: '@id_route'},
             {
                 list: {
                     method: 'GET',