潘钊 / bsth_control · Commits

Commit 8f19eb2577854c23d12e56ff887409a67631173f

Authored by 徐烜
1 parent c7218aac
build: skipped

Update

Inline Side-by-side
Showing 6 changed files with 62 additions and 28 deletions
src/main/java/com/bsth/data/pinyin/PersionPinYin.java
  View file @8f19eb2
... ... @@ -9,6 +9,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
9 9 public class PersionPinYin {
10 10  
11 11 /**
  12 + * Id
  13 + */
  14 + private Integer id;
  15 +
  16 + /**
12 17 * 工号
13 18 */
14 19 private String workId;
... ... @@ -87,4 +92,12 @@ public class PersionPinYin {
87 92 public void setFgsCompanyId(String fgsCompanyId) {
88 93 this.fgsCompanyId = fgsCompanyId;
89 94 }
  95 +
  96 + public Integer getId() {
  97 + return id;
  98 + }
  99 +
  100 + public void setId(Integer id) {
  101 + this.id = id;
  102 + }
90 103 }
... ...
src/main/java/com/bsth/data/pinyin/PersionPinYinBuffer.java
  View file @8f19eb2
... ... @@ -36,6 +36,7 @@ public class PersionPinYinBuffer {
36 36 Collection<Personnel> list = BasicData.perMap.values();
37 37 for(Personnel p : list){
38 38 ppy = new PersionPinYin();
  39 + ppy.setId(p.getId());
39 40 ppy.setCompanyId(p.getCompanyCode());
40 41 ppy.setFgsCompanyId(p.getBrancheCompanyCode());
41 42 ppy.setName(p.getPersonnelName());
... ...
src/main/resources/static/pages/scheduleApp/module/common/main.js
  View file @8f19eb2
... ... @@ -67,28 +67,48 @@ ScheduleApp.factory(&#39;DataStore&#39;, [
67 67 // 简拼数据
68 68 dataMap.cl = result.data.data;
69 69 angular.forEach(result.data.data, function(obj) {
  70 + //// 全拼
  71 + //obj["$fullChars"] = pinyin.getFullChars(obj.insideCode ? obj.insideCode: "");
  72 + //// 简拼
  73 + //obj["$camelChars"] = pinyin.getCamelChars(obj.insideCode ? obj.insideCode: "");
70 74 // 全拼
71   - obj["$fullChars"] = pinyin.getFullChars(obj.insideCode ? obj.insideCode: "");
  75 + obj["$fullChars"] = obj.insideCode? obj.insideCode: "";
72 76 // 简拼
73   - obj["$camelChars"] = pinyin.getCamelChars(obj.insideCode ? obj.insideCode: "");
  77 + obj["$camelChars"] = obj.insideCode? obj.insideCode: "";
74 78 // 原值
75 79 obj["$calcu_str"] = obj.insideCode? obj.insideCode: "";
76 80 });
77 81 });
78 82  
  83 + //$http({
  84 + // method: 'GET',
  85 + // url: '/ee/all'
  86 + //}).then(function(result) {
  87 + // // 简拼数据
  88 + // dataMap.ry = result.data.data;
  89 + // angular.forEach(result.data.data, function(obj) {
  90 + // // 全拼
  91 + // obj["$fullChars"] = pinyin.getFullChars(obj.personnelName + "-" + obj.jobCode);
  92 + // // 简拼
  93 + // obj["$camelChars"] = pinyin.getCamelChars(obj.personnelName + "-" + obj.jobCode);
  94 + // // 原值
  95 + // obj["$calcu_str"] = obj.personnelName + "-" + obj.jobCode;
  96 + // });
  97 + //});
  98 +
79 99 $http({
80 100 method: 'GET',
81   - url: '/ee/all'
  101 + url: '/personnel/all_py'
82 102 }).then(function(result) {
83 103 // 简拼数据
84   - dataMap.ry = result.data.data;
85   - angular.forEach(result.data.data, function(obj) {
  104 + dataMap.ry = result.data;
  105 + angular.forEach(result.data, function(obj) {
86 106 // 全拼
87   - obj["$fullChars"] = pinyin.getFullChars(obj.personnelName + "-" + obj.jobCode);
  107 + obj["$fullChars"] = obj.fullChars;
88 108 // 简拼
89   - obj["$camelChars"] = pinyin.getCamelChars(obj.personnelName + "-" + obj.jobCode);
  109 + obj["$camelChars"] = obj.camelChars;
90 110 // 原值
91   - obj["$calcu_str"] = obj.personnelName + "-" + obj.jobCode;
  111 + obj["$calcu_str"] = obj.name + "-" + obj.workId;
92 112 });
93 113 });
94 114  
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
  View file @8f19eb2
... ... @@ -84,9 +84,9 @@
84 84 icname="id"
85 85 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
86 86 iterobjname="item"
87   - iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  87 + iterobjexp="item.name + '<' + item.workId + '>'"
88 88 searchph="请输拼音..."
89   - searchexp="this.personnelName + '<' + this.jobCode + '>'"
  89 + searchexp="this.name + '<' + this.workId + '>'"
90 90 required >
91 91 </sa-Select5>
92 92 <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"
... ... @@ -116,9 +116,9 @@
116 116 icname="id"
117 117 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
118 118 iterobjname="item"
119   - iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  119 + iterobjexp="item.name + '<' + item.workId + '>'"
120 120 searchph="请输拼音..."
121   - searchexp="this.personnelName + '<' + this.jobCode + '>'"
  121 + searchexp="this.name + '<' + this.workId + '>'"
122 122 >
123 123 </sa-Select5>
124 124 <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/form.html
  View file @8f19eb2
... ... @@ -84,9 +84,9 @@
84 84 icname="id"
85 85 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
86 86 iterobjname="item"
87   - iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  87 + iterobjexp="item.name + '<' + item.workId + '>'"
88 88 searchph="请输拼音..."
89   - searchexp="this.personnelName + '<' + this.jobCode + '>'"
  89 + searchexp="this.name + '<' + this.workId + '>'"
90 90 required >
91 91 </sa-Select5>
92 92 <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"
... ... @@ -116,9 +116,9 @@
116 116 icname="id"
117 117 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
118 118 iterobjname="item"
119   - iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  119 + iterobjexp="item.name + '<' + item.workId + '>'"
120 120 searchph="请输拼音..."
121   - searchexp="this.personnelName + '<' + this.jobCode + '>'"
  121 + searchexp="this.name + '<' + this.workId + '>'"
122 122 >
123 123 </sa-Select5>
124 124 <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html
  View file @8f19eb2
... ... @@ -96,9 +96,9 @@
96 96 icname="id"
97 97 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
98 98 iterobjname="item"
99   - iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  99 + iterobjexp="item.name + '（' + item.workId + '）'"
100 100 searchph="请输拼音..."
101   - searchexp="this.personnelName"
  101 + searchexp="this.name"
102 102 required
103 103 >
104 104 </sa-Select5>
... ... @@ -119,9 +119,9 @@
119 119 icname="id"
120 120 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
121 121 iterobjname="item"
122   - iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  122 + iterobjexp="item.name + '（' + item.workId + '）'"
123 123 searchph="请输拼音..."
124   - searchexp="this.personnelName"
  124 + searchexp="this.name"
125 125 >
126 126 </sa-Select5>
127 127 </div>
... ... @@ -137,9 +137,9 @@
137 137 icname="id"
138 138 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
139 139 iterobjname="item"
140   - iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  140 + iterobjexp="item.name + '（' + item.workId + '）'"
141 141 searchph="请输拼音..."
142   - searchexp="this.personnelName"
  142 + searchexp="this.name"
143 143 >
144 144 </sa-Select5>
145 145 </div>
... ... @@ -155,9 +155,9 @@
155 155 icname="id"
156 156 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
157 157 iterobjname="item"
158   - iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  158 + iterobjexp="item.name + '（' + item.workId + '）'"
159 159 searchph="请输拼音..."
160   - searchexp="this.personnelName"
  160 + searchexp="this.name"
161 161 >
162 162 </sa-Select5>
163 163 </div>
... ... @@ -173,9 +173,9 @@
173 173 icname="id"
174 174 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
175 175 iterobjname="item"
176   - iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  176 + iterobjexp="item.name + '（' + item.workId + '）'"
177 177 searchph="请输拼音..."
178   - searchexp="this.personnelName"
  178 + searchexp="this.name"
179 179 >
180 180 </sa-Select5>
181 181 </div>
... ... @@ -191,9 +191,9 @@
191 191 icname="id"
192 192 dsparams="{{ {type: 'local', param: 'ry' } | json }}"
193 193 iterobjname="item"
194   - iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  194 + iterobjexp="item.name + '（' + item.workId + '）'"
195 195 searchph="请输拼音..."
196   - searchexp="this.personnelName"
  196 + searchexp="this.name"
197 197 >
198 198 </sa-Select5>
199 199 </div>
... ...