浦东公交计划调度功能优化

1、人员配置添加停用checkbox选项，可以查询出停用人员（后台EmployeeConfigInfo添加了一个@Formula计算驾驶员和售票员的停用情况）

浦东公交计划调度功能优化
1、人员配置添加停用checkbox选项，可以查询出停用人员（后台EmployeeConfigInfo添加了一个@Formula计算驾驶员和售票员的停用情况）
徐烜
1 parent c4c70082
Showing 3 changed files with 38 additions and 2 deletions
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/module.js
@@ -54,6 +54,22 @@ public class EmployeeConfigInfo extends BEntity implements Serializable {
     @Column(nullable = false)
     private Boolean isCancel = false;
+    /** 驾驶员停用信息 */
+    @Formula("(" +
+            "(select IFNULL(t2.destroy, 0) from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.jsy = t2.id where t1.id = id)" +
+            "+" +
+            "(select IFNULL(t2.destroy, 0) from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.spy = t2.id where t1.id = id)" +
+            ")")
+    private Integer ryDestroyStatus;
+
+    public Integer getRyDestroyStatus() {
+        return ryDestroyStatus;
+    }
+
+    public void setRyDestroyStatus(Integer ryDestroyStatus) {
+        this.ryDestroyStatus = ryDestroyStatus;
+    }
+
     public EmployeeConfigInfo() {}
     public EmployeeConfigInfo(Object id, Object xlid, Object xlname, Object jsyid, Object spyid) {
@@ -11,7 +11,8 @@
                 <th style="width: 15%;">驾驶员</th>
                 <th >售票员工号</th>
                 <th >售票员</th>
-                <th style="width: 80px;">状态</th>
+                <th style="width: 80px;">状态1</th>
+                <th style="width: 80px;">状态2</th>
                 <th style="width: 21%">操作</th>
             </tr>
             <tr role="row" class="filter">
@@ -51,6 +52,11 @@
                     </label>
                 </td>
                 <td>
+                    <label class="checkbox-inline">
+                        <input type="checkbox" ng-model="ctrl.personIsDestroyCheck"/>已停用
+                    </label>
+                </td>
+                <td>
                     <div class="btn-group">
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
                                 ng-click="ctrl.doPage()">
@@ -111,6 +117,10 @@
                     <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
                 </td>
                 <td>
+                    <span class="glyphicon glyphicon-ok" ng-if="info.ryDestroyStatus == 0"></span>
+                    <span class="glyphicon glyphicon-remove" ng-if="info.ryDestroyStatus > 0"></span>
+                </td>
+                <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="employeeConfig_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
@@ -147,4 +157,4 @@
         </div>
     </div>
-</div>
 \ No newline at end of file
+</div>
@@ -236,7 +236,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.searchCondition = function() {
                 return service.getSearchCondition();
             };
+            self.personIsDestroyCheck = false; // 人员停用选择框
             self.doPage = function() {
+                // 人员停用判定（目前只判定驾驶员）
+                delete self.searchCondition()['ryDestroyStatus_gt'];
+                delete self.searchCondition()['ryDestroyStatus_eq'];
+                if (self.personIsDestroyCheck) {
+                    self.searchCondition()['ryDestroyStatus_gt'] = 0; // 选中时，true替换成1
+                } else {
+                    self.searchCondition()['ryDestroyStatus_eq'] = 0;
+                }
+
                 var page = EmpConfig.list(self.searchCondition(), function() {
                     service.getPage(page);
                 });