PSM-15

徐烜
1 parent 11f520fd
Showing 7 changed files with 191 additions and 34 deletions
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
src/main/java/com/bsth/entity/search/CustomerSpecs.java
src/main/java/com/bsth/service/schedule/EmployeeConfigInfoServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/employeeConfig.js
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
@@ -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,13 @@ public class EmployeeConfigInfo {
     @NotNull
     private String dbbm;
+    @Formula(" dbbm + 0 ")
+    private Integer dbbmFormula;
+
+    /** 是否删除（标记） */
+    @Column(nullable = false)
+    private Boolean isCancel = false;
+
     /** 创建人 */
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private SysUser createBy;
@@ -122,4 +130,36 @@ public class EmployeeConfigInfo {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    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 Boolean getIsCancel() {
+        return isCancel;
+    }
+
+    public void setIsCancel(Boolean isCancel) {
+        this.isCancel = isCancel;
+    }
 }
 package com.bsth.entity.search;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
+import com.bsth.entity.search.exception.UnrecognizableSearchSymbolException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.jpa.domain.Specification;
-import com.bsth.entity.search.exception.UnrecognizableSearchSymbolException;
+import javax.persistence.criteria.*;
+import java.lang.reflect.Method;
+import java.util.*;
 /**
  * 
@@ -74,6 +64,14 @@ public class CustomerSpecs&lt;T&gt; implements Specification&lt;T&gt; {
 			// 值为空的不参与查询
 			if (value == null || (value instanceof String && value.equals(""))) 
 				continue;
+
+            // 如果是布尔值，转换，限定 'true'，'false' 字符串
+            if ("true".equals(value)) {
+                value = Boolean.TRUE;
+            }
+            if ("false".equals(value)) {
+                value = Boolean.FALSE;
+            }
 			try {
 				if(!eSet.contains(searchs[1]))
 package com.bsth.service.schedule;
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.Line;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import javax.transaction.Transactional;
+import java.util.*;
+
 /**
  * Created by xu on 16/5/10.
  */
 @Service
 public class EmployeeConfigInfoServiceImpl extends BaseServiceImpl<EmployeeConfigInfo, Long> implements EmployeeConfigInfoService {
+    @Autowired
+    private EmployeeConfigInfoRepository employeeConfigInfoRepository;
+    @Autowired
+    private ScheduleRule1FlatService scheduleRule1FlatService;
+
+
+    @Override
+    @Transactional
+    public Map<String, Object> delete(Long aLong) {
+        // 获取待作废的人员配置
+        EmployeeConfigInfo employeeConfigInfo = employeeConfigInfoRepository.findOne(aLong);
+        // 获取线路
+        Line xl = employeeConfigInfo.getXl();
+        // 查找线路的规则，比较人员配置信息
+        Map<String, Object> param = new HashMap<>();
+        param.put("xl.id_eq", xl.getId());
+        Iterator<ScheduleRule1Flat> employeeConfigInfoIterator = scheduleRule1FlatService.list(param).iterator();
+        List<String> ryConfigIds = new ArrayList<>();
+        while (employeeConfigInfoIterator.hasNext()) {
+            ScheduleRule1Flat scheduleRule1Flat = employeeConfigInfoIterator.next();
+            ryConfigIds.addAll(Arrays.asList(scheduleRule1Flat.getRyConfigIds().split(",")));
+        }
+
+        Map<String, Object> map = new HashMap<>();
+
+        if (ryConfigIds.contains(employeeConfigInfo.getId().toString())) {
+            throw new RuntimeException("人员配置已被规则使用，不能删除，请先修改规则！");
+        } else {
+            employeeConfigInfo.setIsCancel(true);
+            map.put("status", ResponseCode.SUCCESS);
+        }
+
+        return map;
+    }
+
 }
@@ -2362,7 +2362,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
                                 console.log("xlidvalue=" + value);
                                 employeeConfigService_g.rest.list(
-                                    {"xl.id_eq": value, size: 100},
+                                    {"xl.id_eq": value, "isCancel_eq" : false, size: 100},
                                     function(result) {
                                         // 获取值了
                                         console.log("人员配置获取了");
@@ -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,isCancel,dbbmFormula', direction: 'ASC', id: '@id_route'},
             {
                 list: {
                     method: 'GET',
@@ -235,6 +235,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
                 },
                 save: {
                     method: 'POST'
+                },
+                delete: {
+                    method: 'DELETE'
                 }
             }
         ),
@@ -57,6 +57,14 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService&#39;, [&#39;EmployeeConfigS
          */
         saveDetail: function(obj) {
             return service.rest.save(obj).$promise;
+        },
+        /**
+         * 删除信息。
+         * @param id 主键id
+         * @returns {*|Function|promise|n}
+         */
+        deleteDetail: function(id) {
+            return service.rest.delete({id: id}).$promise;
         }
     };
 }]);
@@ -183,6 +191,75 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;EmployeeConfigListCtrl&#39;, [&#39;EmployeeCon
         self.pageInfo.currentPage = 1;
         self.pageChanaged();
     };
+
+    // 删除时刻表
+    self.deleteEci = function(id) {
+        // TODO:
+        employeeConfigService.deleteDetail(id).then(
+            function(result) {
+                if (result.message) { // 暂时这样做，之后全局拦截
+                    alert("失败：" + result.message);
+                } else {
+                    alert("作废成功！");
+
+                    employeeConfigService.getPage().then(
+                        function(result) {
+                            self.pageInfo.totalItems = result.totalElements;
+                            self.pageInfo.currentPage = result.number + 1;
+                            self.pageInfo.infos = result.content;
+                            employeeConfigService.setCurrentPageNo(result.number + 1);
+                        },
+                        function(result) {
+                            alert("出错啦！");
+                        }
+                    );
+                }
+
+            },
+            function(result) {
+                alert("出错啦！" + result);
+            }
+        );
+    };
+
+    // 撤销修改
+    self.redoDeleteEci = function(id) {
+        employeeConfigService.getDetail(id).then(
+            function(result) {
+                result.isCancel = 'false';
+                employeeConfigService.saveDetail(result).then(
+                    function(result) {
+                        if (result.message) { // 暂时这样做，之后全局拦截
+                            alert("失败：" + result.message);
+                        } else {
+                            alert("撤销成功！");
+
+                            employeeConfigService.getPage().then(
+                                function(result) {
+                                    self.pageInfo.totalItems = result.totalElements;
+                                    self.pageInfo.currentPage = result.number + 1;
+                                    self.pageInfo.infos = result.content;
+                                    employeeConfigService.setCurrentPageNo(result.number + 1);
+                                },
+                                function(result) {
+                                    alert("出错啦！");
+                                }
+                            );
+                        }
+                    },
+                    function(result) {
+                        // TODO：弹出框方式以后改
+                        alert("出错啦！");
+                    }
+                );
+            },
+            function(result) {
+                // TODO：弹出框方式以后改
+                alert("出错啦！");
+            }
+        );
+    };
+
 }]);
 angular.module('ScheduleApp').controller('EmployeeConfigFormCtrl', ['EmployeeConfigService', '$stateParams', '$state', function(employeeConfigService, $stateParams, $state) {
@@ -31,24 +31,18 @@
                     </div>
                 </td>
                 <td></td>
-                <td></td>
                 <td>
-                    <div>
-                        <sa-Select3 model="ctrl.searchCondition()"
-                                    name="ry"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.searchCondition()['jsy.id_eq']}}"
-                                    dcname="jsy.id_eq"
-                                    icname="id"
-                                    icnames="personnelName"
-                                    datatype="ry"
-                                    dataassociate="true"
-                                    dataparam="{{ {'companyCode_eq': ctrl.searchCondition()['xl.company_eq']} | json }}" >
-                        </sa-Select3>
-                    </div>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['jsy.jobCode_like']" placeholder="输入工号..."/>
+                </td>
+                <td>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['jsy.personnelName_like']" placeholder="输入姓名..."/>
+                </td>
+                <td>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['spy.jobCode_like']" placeholder="输入工号..."/>
+                </td>
+                <td>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['spy.personnelName_like']" placeholder="输入姓名..."/>
                 </td>
-                <td></td>
-                <td></td>
                 <td>
                     <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
                             ng-click="ctrl.pageChanaged()">
@@ -63,7 +57,7 @@
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
+            <tr ng-repeat="info in ctrl.pageInfo.infos" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
                 <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
@@ -89,7 +83,9 @@
                     <!--<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 default blue-stripe btn-sm"> 详细 </a>
-                    <a ui-sref="employeeConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
+                    <a ui-sref="employeeConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
+                    <a ng-click="ctrl.deleteEci(info.id)" class="btn default blue-stripe btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
+                    <a ng-click="ctrl.redoDeleteEci(info.id)" class="btn default blue-stripe btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
                 </td>
             </tr>
             </tbody>