潘钊 / bsth_control · Commits

Commit e86c449d476e6f5dd721685360fcacd8de9bf3b3

Authored by 娄高锋
1 parent 179055a5
build: skipped

公司实体类新增排序字段：order_no int 11;审计公里汇总表、调度日报汇总表按照公司类的排序字段排序。

Inline Side-by-side
Showing 2 changed files with 133 additions and 120 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 2 of 6 files are displayed.

src/main/java/com/bsth/entity/Business.java
  View file @e86c449
1   -package com.bsth.entity;
2   -
3   -import java.util.Date;
4   -
5   -import javax.persistence.Column;
6   -import javax.persistence.Entity;
7   -import javax.persistence.GeneratedValue;
8   -import javax.persistence.GenerationType;
9   -import javax.persistence.Id;
10   -import javax.persistence.Table;
11   -
12   -/**
13   - *
14   - * @ClassName : Business(公司实体类)
15   - *
16   - * @Author : bsth@lq
17   - *
18   - * @Description : TODO(公司信息)
19   - *
20   - * @Data : 2016-04-27
21   - *
22   - * @Version 公交调度系统BS版 0.1
23   - *
24   - */
25   -
26   -@Entity
27   -@Table(name = "bsth_c_business")
28   -public class Business {
29   -
30   - // ID
31   - @Id
32   - @GeneratedValue(strategy = GenerationType.IDENTITY)
33   - private Integer id;
34   -
35   - // 企业<公司>名称
36   - private String businessName;
37   -
38   - // 企业<公司>代码
39   - private String businessCode;
40   -
41   - // 所属企业<公司>代码
42   - private String upCode;
43   -
44   - // 描述
45   - private String descriptions;
46   - // 描述
47   - private String phoneNum;
48   -
49   - // 创建日期
50   - @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
51   - private Date createDate;
52   -
53   - // 修改日期
54   - @Column(name = "update_date", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
55   - private Date updateDate;
56   - public Date getCreateDate() {
57   - return createDate;
58   - }
59   -
60   - public void setCreateDate(Date createDate) {
61   - this.createDate = createDate;
62   - }
63   -
64   - public Date getUpdateDate() {
65   - return updateDate;
66   - }
67   -
68   - public void setUpdateDate(Date updateDate) {
69   - this.updateDate = updateDate;
70   - }
71   -
72   - public Integer getId() {
73   - return id;
74   - }
75   -
76   - public void setId(Integer id) {
77   - this.id = id;
78   - }
79   -
80   - public String getBusinessName() {
81   - return businessName;
82   - }
83   -
84   - public void setBusinessName(String businessName) {
85   - this.businessName = businessName;
86   - }
87   -
88   - public String getBusinessCode() {
89   - return businessCode;
90   - }
91   -
92   - public void setBusinessCode(String businessCode) {
93   - this.businessCode = businessCode;
94   - }
95   -
96   - public String getUpCode() {
97   - return upCode;
98   - }
99   -
100   - public void setUpCode(String upCode) {
101   - this.upCode = upCode;
102   - }
103   -
104   - public String getDescriptions() {
105   - return descriptions;
106   - }
107   -
108   - public void setDescriptions(String descriptions) {
109   - this.descriptions = descriptions;
110   - }
111   -
112   - public String getPhoneNum() {
113   - return phoneNum;
114   - }
115   -
116   - public void setPhoneNum(String phoneNum) {
117   - this.phoneNum = phoneNum;
118   - }
119   -
120   -}
  1 +package com.bsth.entity;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import javax.persistence.Column;
  6 +import javax.persistence.Entity;
  7 +import javax.persistence.GeneratedValue;
  8 +import javax.persistence.GenerationType;
  9 +import javax.persistence.Id;
  10 +import javax.persistence.Table;
  11 +
  12 +/**
  13 + *
  14 + * @ClassName : Business(公司实体类)
  15 + *
  16 + * @Author : bsth@lq
  17 + *
  18 + * @Description : TODO(公司信息)
  19 + *
  20 + * @Data : 2016-04-27
  21 + *
  22 + * @Version 公交调度系统BS版 0.1
  23 + *
  24 + */
  25 +
  26 +@Entity
  27 +@Table(name = "bsth_c_business")
  28 +public class Business {
  29 +
  30 + // ID
  31 + @Id
  32 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  33 + private Integer id;
  34 +
  35 + // 企业<公司>名称
  36 + private String businessName;
  37 +
  38 + // 企业<公司>代码
  39 + private String businessCode;
  40 +
  41 + // 所属企业<公司>代码
  42 + private String upCode;
  43 +
  44 + // 描述
  45 + private String descriptions;
  46 + // 描述
  47 + private String phoneNum;
  48 +
  49 + private Integer orderNo;
  50 +
  51 + // 创建日期
  52 + @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
  53 + private Date createDate;
  54 +
  55 + // 修改日期
  56 + @Column(name = "update_date", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
  57 + private Date updateDate;
  58 + public Date getCreateDate() {
  59 + return createDate;
  60 + }
  61 +
  62 + public void setCreateDate(Date createDate) {
  63 + this.createDate = createDate;
  64 + }
  65 +
  66 + public Date getUpdateDate() {
  67 + return updateDate;
  68 + }
  69 +
  70 + public void setUpdateDate(Date updateDate) {
  71 + this.updateDate = updateDate;
  72 + }
  73 +
  74 + public Integer getId() {
  75 + return id;
  76 + }
  77 +
  78 + public void setId(Integer id) {
  79 + this.id = id;
  80 + }
  81 +
  82 + public String getBusinessName() {
  83 + return businessName;
  84 + }
  85 +
  86 + public void setBusinessName(String businessName) {
  87 + this.businessName = businessName;
  88 + }
  89 +
  90 + public String getBusinessCode() {
  91 + return businessCode;
  92 + }
  93 +
  94 + public void setBusinessCode(String businessCode) {
  95 + this.businessCode = businessCode;
  96 + }
  97 +
  98 + public String getUpCode() {
  99 + return upCode;
  100 + }
  101 +
  102 + public void setUpCode(String upCode) {
  103 + this.upCode = upCode;
  104 + }
  105 +
  106 + public String getDescriptions() {
  107 + return descriptions;
  108 + }
  109 +
  110 + public void setDescriptions(String descriptions) {
  111 + this.descriptions = descriptions;
  112 + }
  113 +
  114 + public String getPhoneNum() {
  115 + return phoneNum;
  116 + }
  117 +
  118 + public void setPhoneNum(String phoneNum) {
  119 + this.phoneNum = phoneNum;
  120 + }
  121 +
  122 + public Integer getOrderNo() {
  123 + return orderNo;
  124 + }
  125 +
  126 + public void setOrderNo(Integer orderNo) {
  127 + this.orderNo = orderNo;
  128 + }
  129 +
  130 +}
... ...
src/main/java/com/bsth/repository/BusinessRepository.java
  View file @e86c449
... ... @@ -32,4 +32,7 @@ public interface BusinessRepository extends BaseRepository&lt;Business, Integer&gt; {
32 32  
33 33 @Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_business) k" , nativeQuery=true)
34 34 long getMaxId();
  35 +
  36 + @Query(value = "SELECT B FROM Business B where orderNo IS NOT NULL ORDER BY orderNo")
  37 + List<Business> getOrder();
35 38 }
... ...