潘钊 / bsth_control · Commits

Commit f10b2d694f251504d019f467897d039d4ccfa654

Authored by 徐烜
1 parent bac419d3

Update

Inline Side-by-side
Showing 5 changed files with 66 additions and 24 deletions
src/main/java/com/bsth/entity/CarDevice.java
  View file @f10b2d6
1 package com.bsth.entity; 1 package com.bsth.entity;
2 2
3 import com.bsth.entity.schedule.BEntity; 3 import com.bsth.entity.schedule.BEntity;
  4 +import org.hibernate.annotations.Formula;
4 import org.joda.time.DateTime; 5 import org.joda.time.DateTime;
5 6
6 import javax.persistence.*; 7 import javax.persistence.*;
@@ -22,6 +23,16 @@ public class CarDevice extends BEntity { @@ -22,6 +23,16 @@ public class CarDevice extends BEntity {
22 @Column 23 @Column
23 private String gsName; 24 private String gsName;
24 25
  26 + /** 所属公司 varchar length(50) */
  27 + private String company;
  28 +
  29 + /** 分公司 varchar length(50)*/
  30 + private String brancheCompany;
  31 +
  32 + /** 组合公司分公司编码 */
  33 + @Formula(" concat(company, '_', branche_company) ")
  34 + private String cgsbm;
  35 +
25 /** 车辆id，关联bsth_c_cars */ 36 /** 车辆id，关联bsth_c_cars */
26 @Column(nullable = false) 37 @Column(nullable = false)
27 private Integer cl; 38 private Integer cl;
@@ -203,4 +214,20 @@ public class CarDevice extends BEntity { @@ -203,4 +214,20 @@ public class CarDevice extends BEntity {
203 public void setIsCancel(Boolean isCancel) { 214 public void setIsCancel(Boolean isCancel) {
204 this.isCancel = isCancel; 215 this.isCancel = isCancel;
205 } 216 }
  217 +
  218 + public String getCompany() {
  219 + return company;
  220 + }
  221 +
  222 + public void setCompany(String company) {
  223 + this.company = company;
  224 + }
  225 +
  226 + public String getBrancheCompany() {
  227 + return brancheCompany;
  228 + }
  229 +
  230 + public void setBrancheCompany(String brancheCompany) {
  231 + this.brancheCompany = brancheCompany;
  232 + }
206 } 233 }
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html
  View file @f10b2d6
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <div class="col-md-3"> 39 <div class="col-md-3">
40 <sa-Select5 name="xl" 40 <sa-Select5 name="xl"
41 model="ctrl.deviceInfoForSave" 41 model="ctrl.deviceInfoForSave"
42 - cmaps="{'xl': 'id', 'xlName': 'name', 'xlBm': 'lineCode'}" 42 + cmaps="{'xl': 'id', 'xlName': 'name', 'xlBm': 'lineCode', 'company': 'company', 'brancheCompany': 'brancheCompany'}"
43 dcname="xl" 43 dcname="xl"
44 icname="id" 44 icname="id"
45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}" 45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
@@ -61,14 +61,15 @@ @@ -61,14 +61,15 @@
61 <div class="col-md-3"> 61 <div class="col-md-3">
62 <sa-Select5 name="cl" 62 <sa-Select5 name="cl"
63 model="ctrl.deviceInfoForSave" 63 model="ctrl.deviceInfoForSave"
64 - cmaps="{'cl': 'id', 'clZbh': 'insideCode', 'oldDeviceNo': 'equipmentCode'}" 64 + cmaps="{'cl' : 'cl.id', 'clZbh': 'cl.insideCode', 'oldDeviceNo': 'cl.equipmentCode'}"
65 dcname="cl" 65 dcname="cl"
66 - icname="id"  
67 - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'cl' } | json }}" 66 + icname="cl.id"
  67 + dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.deviceInfoForSave.xl}, atype:'cci2' } | json }}"
  68 + dsparamsextra="{'type':'all', 'isCancel_eq': false}"
68 iterobjname="item" 69 iterobjname="item"
69 - iterobjexp="item.insideCode" 70 + iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
70 searchph="请输拼音..." 71 searchph="请输拼音..."
71 - searchexp="this.insideCode" 72 + searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
72 required > 73 required >
73 </sa-Select5> 74 </sa-Select5>
74 </div> 75 </div>
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
  View file @f10b2d6
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <div class="col-md-3"> 39 <div class="col-md-3">
40 <sa-Select5 name="xl" 40 <sa-Select5 name="xl"
41 model="ctrl.deviceInfoForSave" 41 model="ctrl.deviceInfoForSave"
42 - cmaps="{'xl': 'id', 'xlName': 'name', 'xlBm': 'lineCode'}" 42 + cmaps="{'xl': 'id', 'xlName': 'name', 'xlBm': 'lineCode', 'company': 'company', 'brancheCompany': 'brancheCompany'}"
43 dcname="xl" 43 dcname="xl"
44 icname="id" 44 icname="id"
45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}" 45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
@@ -61,14 +61,15 @@ @@ -61,14 +61,15 @@
61 <div class="col-md-3"> 61 <div class="col-md-3">
62 <sa-Select5 name="cl" 62 <sa-Select5 name="cl"
63 model="ctrl.deviceInfoForSave" 63 model="ctrl.deviceInfoForSave"
64 - cmaps="{'cl': 'id', 'clZbh': 'insideCode', 'oldDeviceNo': 'equipmentCode'}" 64 + cmaps="{'cl' : 'cl.id', 'clZbh': 'cl.insideCode', 'oldDeviceNo': 'cl.equipmentCode'}"
65 dcname="cl" 65 dcname="cl"
66 - icname="id"  
67 - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'cl' } | json }}" 66 + icname="cl.id"
  67 + dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.deviceInfoForSave.xl}, atype:'cci2' } | json }}"
  68 + dsparamsextra="{'type':'all', 'isCancel_eq': false}"
68 iterobjname="item" 69 iterobjname="item"
69 - iterobjexp="item.insideCode" 70 + iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
70 searchph="请输拼音..." 71 searchph="请输拼音..."
71 - searchexp="this.insideCode" 72 + searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
72 required > 73 required >
73 </sa-Select5> 74 </sa-Select5>
74 </div> 75 </div>
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
  View file @f10b2d6
@@ -10,9 +10,7 @@ @@ -10,9 +10,7 @@
10 <th style="width: 100px;">启用日期</th> 10 <th style="width: 100px;">启用日期</th>
11 <th>旧设备编号</th> 11 <th>旧设备编号</th>
12 <th>新设备编号</th> 12 <th>新设备编号</th>
13 - <th>旧SIM卡</th>  
14 - <th>新SIM卡</th>  
15 - <th style="width: 180px;">更新时间</th> 13 + <th style="width: 180px;">操作人/操作时间</th>
16 <th style="width: 80px;" >状态</th> 14 <th style="width: 80px;" >状态</th>
17 <th style="width: 150pt;">操作</th> 15 <th style="width: 150pt;">操作</th>
18 </tr> 16 </tr>
@@ -39,8 +37,6 @@ @@ -39,8 +37,6 @@
39 <td></td> 37 <td></td>
40 <td></td> 38 <td></td>
41 <td></td> 39 <td></td>
42 - <td></td>  
43 - <td></td>  
44 <td> 40 <td>
45 <label class="checkbox-inline input"> 41 <label class="checkbox-inline input">
46 <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />已作废 42 <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />已作废
@@ -79,13 +75,18 @@ @@ -79,13 +75,18 @@
79 <span ng-bind="info.newDeviceNo"></span> 75 <span ng-bind="info.newDeviceNo"></span>
80 </td> 76 </td>
81 <td> 77 <td>
82 - <span ng-bind="info.oldSimNo"></span>  
83 - </td>  
84 - <td>  
85 - <span ng-bind="info.newSimNo"></span>  
86 - </td>  
87 - <td>  
88 - <span ng-bind="info.updateDate | date:'yyyy-MM-dd HH:mm:ss'"></span> 78 + <div>
  79 + <a href="#">
  80 + <i class="fa fa-user"></i>
  81 + <span ng-bind="info.updateBy.userName"></span>
  82 + </a>
  83 + </div>
  84 + <div>
  85 + <a href="#">
  86 + <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  87 + </a>
  88 + </div>
  89 +
89 </td> 90 </td>
90 <td> 91 <td>
91 <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span> 92 <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
  View file @f10b2d6
@@ -86,6 +86,18 @@ @@ -86,6 +86,18 @@
86 </td> 86 </td>
87 <td> 87 <td>
88 <span ng-bind="info.personnelType | dict:'sexType':'未知'"></span> 88 <span ng-bind="info.personnelType | dict:'sexType':'未知'"></span>
  89 +
  90 + <!--<div ng-if="info.personnelType == '1'">-->
  91 + <!--<a href="#">-->
  92 + <!--<i class="fa fa-male"></i>-->
  93 + <!--</a>-->
  94 + <!--</div>-->
  95 + <!--<div ng-if="info.personnelType == '2'">-->
  96 + <!--<a href="#">-->
  97 + <!--<i class="fa fa-female"></i>-->
  98 + <!--</a>-->
  99 + <!--</div>-->
  100 +
89 </td> 101 </td>
90 <td> 102 <td>
91 <span ng-bind="info.company"></span> 103 <span ng-bind="info.company"></span>