bugfix

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/ManageService.java

@@ -1,11 +1,12 @@
 package cn.efunbox.manage.base.service;
 
 import cn.efunbox.manage.base.entity.Manage;
+import cn.efunbox.manage.base.vo.ManageVO;
 import cn.efunbox.manage.common.result.ApiResult;
 
 public interface ManageService {
 
-    ApiResult list(Manage manage);
+    ApiResult list(ManageVO manageVO);
 
     ApiResult save(Manage manage);
 

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ManageServiceImpl.java

@@ -5,6 +5,7 @@ import cn.efunbox.manage.base.enums.CompanyTypeEnum;
 import cn.efunbox.manage.base.enums.ManageTypeEnum;
 import cn.efunbox.manage.base.repository.*;
 import cn.efunbox.manage.base.service.ManageService;
+import cn.efunbox.manage.base.vo.ManageVO;
 import cn.efunbox.manage.common.result.ApiCode;
 import cn.efunbox.manage.common.result.ApiResult;
 import org.apache.commons.lang3.StringUtils;
@@ -47,41 +48,47 @@ public class ManageServiceImpl implements ManageService {
     CostTypeRepository costTypeRepository;
 
     @Override
-    public ApiResult list(Manage manage) {
+    public ApiResult list(ManageVO manageVO) {
         Specification querySpecifi = new Specification<Manage>() {
             @Override
             public Predicate toPredicate(Root<Manage> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
 
                 List<Predicate> predicates = new ArrayList<>();
-                if(Objects.nonNull(manage.getToProjectId()) && 0 == manage.getToProjectId()){
-                    predicates.add(criteriaBuilder.equal(root.get("toProjectId"), manage.getToProjectId()));
+                if(Objects.nonNull(manageVO.getToProjectId()) && 0 == manageVO.getToProjectId()){
+                    predicates.add(criteriaBuilder.equal(root.get("toProjectId"), manageVO.getToProjectId()));
                 }
-                if(Objects.nonNull(manage.getToDeptId()) && 0 == manage.getToDeptId()){
-                    predicates.add(criteriaBuilder.equal(root.get("toDeptId"), manage.getToProjectId()));
+                if(Objects.nonNull(manageVO.getToDeptId()) && 0 == manageVO.getToDeptId()){
+                    predicates.add(criteriaBuilder.equal(root.get("toDeptId"), manageVO.getToProjectId()));
                 }
-                if(Objects.nonNull(manage.getProductId()) && 0 == manage.getProductId()){
-                    predicates.add(criteriaBuilder.equal(root.get("productId"), manage.getProductId()));
+                if(Objects.nonNull(manageVO.getProductId()) && 0 == manageVO.getProductId()){
+                    predicates.add(criteriaBuilder.equal(root.get("productId"), manageVO.getProductId()));
                 }
-                if(Objects.nonNull(manage.getProductId()) && 0 == manage.getProductId()){
-                    predicates.add(criteriaBuilder.equal(root.get("projectId"), manage.getProductId()));
+                if(Objects.nonNull(manageVO.getProductId()) && 0 == manageVO.getProductId()){
+                    predicates.add(criteriaBuilder.equal(root.get("projectId"), manageVO.getProductId()));
                 }
-                if(Objects.nonNull(manage.getType())){
-                    predicates.add(criteriaBuilder.equal(root.get("type"), manage.getType()));
+                if(Objects.nonNull(manageVO.getType())){
+                    predicates.add(criteriaBuilder.equal(root.get("type"), manageVO.getType()));
                 }
-                if(Objects.nonNull(manage.getCostType()) && 0 == manage.getCostTypeId()){
-                    predicates.add(criteriaBuilder.equal(root.get("costType"), manage.getCostType()));
+                if(Objects.nonNull(manageVO.getCostTypeId()) && 0 == manageVO.getCostTypeId()){
+                    predicates.add(criteriaBuilder.equal(root.get("costTypeId"), manageVO.getCostTypeId()));
                 }
-                if(Objects.nonNull(manage.getIncomeStatus())){
-                    predicates.add(criteriaBuilder.equal(root.get("incomeStatus"), manage.getIncomeStatus()));
+                if(Objects.nonNull(manageVO.getIncomeStatus())){
+                    predicates.add(criteriaBuilder.equal(root.get("incomeStatus"), manageVO.getIncomeStatus()));
                 }
-                if(Objects.nonNull(manage.getStatus())){
-                    predicates.add(criteriaBuilder.equal(root.get("status"), manage.getStatus()));
+                if(Objects.nonNull(manageVO.getStatus())){
+                    predicates.add(criteriaBuilder.equal(root.get("status"), manageVO.getStatus()));
                 }
-                if(manage.getDeptIds() != null && manage.getDeptIds().size() > 0){
+                if(Objects.nonNull(manageVO.getStartTime())){
+                    predicates.add(criteriaBuilder.greaterThanOrEqualTo(root.get("happenTime"), manageVO.getStartTime()));
+                }
+                if(Objects.nonNull(manageVO.getEndTime())){
+                    predicates.add(criteriaBuilder.lessThanOrEqualTo(root.get("happenTime"), manageVO.getEndTime()));
+                }
+                if(manageVO.getDeptIds() != null && manageVO.getDeptIds().size() > 0){
                     List<Predicate> list = new ArrayList<>();
-                    if (manage.getDeptIds() != null && manage.getDeptIds().size() > 0) {
+                    if (manageVO.getDeptIds() != null && manageVO.getDeptIds().size() > 0) {
                         CriteriaBuilder.In<Object> in = criteriaBuilder.in(root.get("deptId"));
-                        for (Long id : manage.getDeptIds()) {
+                        for (Long id : manageVO.getDeptIds()) {
                             in.value(id);
                         }
                         list.add(in);

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/vo/ManageVO.java

@@ -0,0 +1,43 @@
+package cn.efunbox.manage.base.vo;
+
+import cn.efunbox.manage.base.enums.BaseStatusEnum;
+import cn.efunbox.manage.base.enums.IncomeStatusEnum;
+import cn.efunbox.manage.base.enums.ManageTypeEnum;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Manage
+ * Created by wangys on 2019/03/07
+ */
+@Data
+public class ManageVO implements Serializable {
+
+    private Long deptId;
+
+    private String deptName;
+
+    private Long productId;
+
+    private Long projectId;
+
+    private Long toDeptId;
+
+    private Long toProjectId;
+
+    private ManageTypeEnum type;
+
+    private IncomeStatusEnum incomeStatus;
+
+    private BaseStatusEnum status;
+
+    private Long costTypeId;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private List<Long> deptIds;
+}

efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/controller/ManageController.java

@@ -4,6 +4,7 @@ import cn.efunbox.manage.base.entity.Department;
 import cn.efunbox.manage.base.entity.Manage;
 import cn.efunbox.manage.base.service.DepartmentService;
 import cn.efunbox.manage.base.service.ManageService;
+import cn.efunbox.manage.base.vo.ManageVO;
 import cn.efunbox.manage.common.result.ApiResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,15 +26,15 @@ public class ManageController {
     @Autowired
     DepartmentService departmentService;
 
-    @GetMapping
-    public ApiResult findManage(Manage manage){
-        ApiResult<List<Department>> deptResult = departmentService.getDeptChild(manage.getDeptId() == null ? 0l : manage.getDeptId());
+    @PostMapping("/list")
+    public ApiResult findManage(@RequestBody ManageVO manageVO){
+        ApiResult<List<Department>> deptResult = departmentService.getDeptChild(manageVO.getDeptId() == null ? 0l : manageVO.getDeptId());
         List<Long> deptIds = new ArrayList<>();
         deptResult.getData().stream().forEach(department -> {
             deptIds.add(department.getId());
         });
-        manage.setDeptIds(deptIds);
-        return manageService.list(manage);
+        manageVO.setDeptIds(deptIds);
+        return manageService.list(manageVO);
     }
 
     @PostMapping