PSM-15

徐烜
2 parents e4b83c31 8e5d681a
Showing 3 changed files with 82 additions and 30 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
@@ -49,6 +49,9 @@ public class EmployeeConfigInfo {
     @Formula(" dbbm + 0 ")
     private Integer dbbmFormula;
+    /** 是否删除（标记） */
+    @Column(nullable = false)
+    private Boolean isCancel = false;
     /** 创建人 */
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
@@ -96,6 +99,22 @@ public class EmployeeConfigInfo {
         this.jsy = jsy;
     }
+    public Personnel getSpy() {
+        return spy;
+    }
+
+    public void setSpy(Personnel spy) {
+        this.spy = spy;
+    }
+
+    public String getDbbm() {
+        return dbbm;
+    }
+
+    public void setDbbm(String dbbm) {
+        this.dbbm = dbbm;
+    }
+
     public Integer getDbbmFormula() {
         return dbbmFormula;
     }
@@ -104,6 +123,14 @@ public class EmployeeConfigInfo {
         this.dbbmFormula = dbbmFormula;
     }
+    public Boolean getIsCancel() {
+        return isCancel;
+    }
+
+    public void setIsCancel(Boolean isCancel) {
+        this.isCancel = isCancel;
+    }
+
     public SysUser getCreateBy() {
         return createBy;
     }
@@ -120,22 +147,6 @@ public class EmployeeConfigInfo {
         this.updateBy = updateBy;
     }
-    public Personnel getSpy() {
-        return spy;
-    }
-
-    public void setSpy(Personnel spy) {
-        this.spy = spy;
-    }
-
-    public String getDbbm() {
-        return dbbm;
-    }
-
-    public void setDbbm(String dbbm) {
-        this.dbbm = dbbm;
-    }
-
     public Date getCreateDate() {
         return createDate;
     }
 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;
+    }
+
 }