bug fix

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/repository/CostTypeRepository.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface CostTypeRepository extends BasicRepository<CostType> {
 
-    List<CostType> findByStatusOrderBySortDesc(BaseStatusEnum status);
-
     CostType findByName(String name);
+
+    List<CostType>  findByStatusOrderByCodeAsc(BaseStatusEnum status);
 }

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

@@ -4,12 +4,14 @@ import cn.efunbox.manage.base.entity.Company;
 import cn.efunbox.manage.base.enums.BaseStatusEnum;
 import cn.efunbox.manage.base.repository.CompanyRepository;
 import cn.efunbox.manage.base.service.CompanyService;
+import cn.efunbox.manage.common.enums.BaseOrderEnum;
+import cn.efunbox.manage.common.helper.SortHelper;
 import cn.efunbox.manage.common.result.ApiCode;
 import cn.efunbox.manage.common.result.ApiResult;
-import com.sun.xml.internal.rngom.parse.host.Base;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;
 
@@ -26,7 +28,9 @@ public class CompanyServiceImpl implements CompanyService {
 
     @Override
     public ApiResult list(Company company) {
-        List<Company> companies = companyRepository.find(company);
+        List<Company> companies = companyRepository.find(company, SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{
+            put("code",BaseOrderEnum.ASC);
+        }}));
         if(Objects.nonNull(companies)){
             return ApiResult.ok(companies);
         }

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

@@ -4,12 +4,14 @@ import cn.efunbox.manage.base.entity.CostType;
 import cn.efunbox.manage.base.enums.BaseStatusEnum;
 import cn.efunbox.manage.base.repository.CostTypeRepository;
 import cn.efunbox.manage.base.service.CostTypeService;
+import cn.efunbox.manage.common.enums.BaseOrderEnum;
+import cn.efunbox.manage.common.helper.SortHelper;
 import cn.efunbox.manage.common.result.ApiCode;
 import cn.efunbox.manage.common.result.ApiResult;
-import com.sun.xml.internal.rngom.parse.host.Base;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;
 
@@ -25,7 +27,9 @@ public class CostTypeServiceImpl implements CostTypeService {
 
     @Override
     public ApiResult list(CostType costType) {
-        List<CostType> costTypes = costTypeRepository.find(costType);
+        List<CostType> costTypes = costTypeRepository.find(costType, SortHelper.sortMap2Sort(new LinkedHashMap<String,BaseOrderEnum>() {{
+            put("code",BaseOrderEnum.ASC);
+        }}));
         if(Objects.nonNull(costTypes)){
             return ApiResult.ok(costTypes);
         }
@@ -77,6 +81,6 @@ public class CostTypeServiceImpl implements CostTypeService {
 
     @Override
     public ApiResult select(CostType costType) {
-        return ApiResult.ok(costTypeRepository.findByStatusOrderBySortDesc(BaseStatusEnum.NORMAL));
+        return ApiResult.ok(costTypeRepository.findByStatusOrderByCodeAsc(BaseStatusEnum.NORMAL));
     }
 }

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

@@ -17,9 +17,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.util.*;
 
 /**
@@ -49,87 +47,84 @@ public class ManageServiceImpl implements ManageService {
 
     @Override
     public ApiResult list(ManageVO manageVO) {
-        Pageable pageable = new PageRequest(manageVO.getPageNo() - 1,manageVO.getPageSize(), SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("happenTime", BaseOrderEnum.DESC);}}));
-        if(manageVO.getIsEntry()){
+        Pageable pageable = new PageRequest(manageVO.getPageNo() - 1,manageVO.getPageSize(), SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("gmtModified", BaseOrderEnum.DESC);}}));
+      /*  if(manageVO.getIsEntry()){
             pageable = new PageRequest(manageVO.getPageNo() - 1, manageVO.getPageSize(), SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("gmtModified", BaseOrderEnum.DESC);}}));
-        }
-        Specification specification = new Specification<Manage>() {
-            @Override
-            public Predicate toPredicate(Root<Manage> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+        }*/
+        Specification specification = (Specification<Manage>) (root, criteriaQuery, criteriaBuilder) -> {
 
-                List<Predicate> predicates = new ArrayList<>();
-                if(Objects.nonNull(manageVO.getToProjectId()) && 0 != manageVO.getToProjectId()){
-                    predicates.add(criteriaBuilder.equal(root.get("toProjectId"), manageVO.getToProjectId()));
-                }
-                if(Objects.nonNull(manageVO.getToDeptId()) && 0 != manageVO.getToDeptId()){
-                    predicates.add(criteriaBuilder.equal(root.get("toDeptId"), manageVO.getToDeptId()));
-                }
-                if(Objects.nonNull(manageVO.getProductId()) && 0 != manageVO.getProductId()){
-                    predicates.add(criteriaBuilder.equal(root.get("productId"), manageVO.getProductId()));
-                }
-                if(Objects.nonNull(manageVO.getProjectId()) && 0 != manageVO.getProjectId()){
-                    predicates.add(criteriaBuilder.equal(root.get("projectId"), manageVO.getProjectId()));
-                }
-                if(Objects.nonNull(manageVO.getType())){
-                    predicates.add(criteriaBuilder.equal(root.get("type"), manageVO.getType()));
-                }
-                if(manageVO.getCostTypeId() != null && manageVO.getCostTypeId().size() > 0){
-                    List<Predicate> list = new ArrayList<>();
-                    if (manageVO.getCostTypeId() != null && manageVO.getCostTypeId().size() > 0) {
-                        CriteriaBuilder.In<Object> in = criteriaBuilder.in(root.get("costTypeId"));
-                        for (Long id : manageVO.getCostTypeId()) {
-                            in.value(id);
-                        }
-                        list.add(in);
+            List<Predicate> predicates = new ArrayList<>();
+            if(Objects.nonNull(manageVO.getToProjectId()) && 0 != manageVO.getToProjectId()){
+                predicates.add(criteriaBuilder.equal(root.get("toProjectId"), manageVO.getToProjectId()));
+            }
+            if(Objects.nonNull(manageVO.getToDeptId()) && 0 != manageVO.getToDeptId()){
+                predicates.add(criteriaBuilder.equal(root.get("toDeptId"), manageVO.getToDeptId()));
+            }
+            if(Objects.nonNull(manageVO.getProductId()) && 0 != manageVO.getProductId()){
+                predicates.add(criteriaBuilder.equal(root.get("productId"), manageVO.getProductId()));
+            }
+            if(Objects.nonNull(manageVO.getProjectId()) && 0 != manageVO.getProjectId()){
+                predicates.add(criteriaBuilder.equal(root.get("projectId"), manageVO.getProjectId()));
+            }
+            if(Objects.nonNull(manageVO.getType())){
+                predicates.add(criteriaBuilder.equal(root.get("type"), manageVO.getType()));
+            }
+            if(manageVO.getCostTypeId() != null && manageVO.getCostTypeId().size() > 0){
+                List<Predicate> list = new ArrayList<>();
+                if (manageVO.getCostTypeId() != null && manageVO.getCostTypeId().size() > 0) {
+                    CriteriaBuilder.In<Object> in = criteriaBuilder.in(root.get("costTypeId"));
+                    for (Long id : manageVO.getCostTypeId()) {
+                        in.value(id);
                     }
-                    predicates.addAll(list);
+                    list.add(in);
                 }
+                predicates.addAll(list);
+            }
 //                if(Objects.nonNull(manageVO.getCostTypeId()) && 0 != manageVO.getCostTypeId()){
 //                    predicates.add(criteriaBuilder.equal(root.get("costTypeId"), manageVO.getCostTypeId()));
 //                }
-                if(manageVO.getIncomeStatus() != null && manageVO.getIncomeStatus().size() > 0){
-                    List<Predicate> list = new ArrayList<>();
-                    if (manageVO.getIncomeStatus() != null && manageVO.getIncomeStatus().size() > 0) {
-                        CriteriaBuilder.In<Object> in = criteriaBuilder.in(root.get("incomeStatus"));
-                        for (IncomeStatusEnum incomeStatus : manageVO.getIncomeStatus()) {
-                            in.value(incomeStatus);
-                        }
-                        list.add(in);
+            if(manageVO.getIncomeStatus() != null && manageVO.getIncomeStatus().size() > 0){
+                List<Predicate> list = new ArrayList<>();
+                if (manageVO.getIncomeStatus() != null && manageVO.getIncomeStatus().size() > 0) {
+                    CriteriaBuilder.In<Object> in = criteriaBuilder.in(root.get("incomeStatus"));
+                    for (IncomeStatusEnum incomeStatus : manageVO.getIncomeStatus()) {
+                        in.value(incomeStatus);
                     }
-                    predicates.addAll(list);
+                    list.add(in);
                 }
+                predicates.addAll(list);
+            }
 //                if(Objects.nonNull(manageVO.getIncomeStatus())){
 //                    predicates.add(criteriaBuilder.equal(root.get("incomeStatus"), manageVO.getIncomeStatus()));
 //                }
 
-                if(Objects.nonNull(manageVO.getStatus())){
-                    predicates.add(criteriaBuilder.equal(root.get("status"), manageVO.getStatus()));
-                }
-                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(Objects.nonNull(manageVO.getMinAmount()) && manageVO.getMinAmount() > 0){
-                    predicates.add(criteriaBuilder.ge(root.get("amount"), manageVO.getMinAmount()));
-                }
-                if(Objects.nonNull(manageVO.getMaxAmount()) && manageVO.getMaxAmount() > 0){
-                    predicates.add(criteriaBuilder.le(root.get("amount"), manageVO.getMaxAmount()));
-                }
-                if(manageVO.getDeptIds() != null && manageVO.getDeptIds().size() > 0){
-                    List<Predicate> list = new ArrayList<>();
-                    if (manageVO.getDeptIds() != null && manageVO.getDeptIds().size() > 0) {
-                        CriteriaBuilder.In<Object> in = criteriaBuilder.in(root.get("deptId"));
-                        for (Long id : manageVO.getDeptIds()) {
-                            in.value(id);
-                        }
-                        list.add(in);
+            if(Objects.nonNull(manageVO.getStatus())){
+                predicates.add(criteriaBuilder.equal(root.get("status"), manageVO.getStatus()));
+            }
+            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(Objects.nonNull(manageVO.getMinAmount()) && manageVO.getMinAmount() > 0){
+                predicates.add(criteriaBuilder.ge(root.get("amount"), manageVO.getMinAmount()));
+            }
+            if(Objects.nonNull(manageVO.getMaxAmount()) && manageVO.getMaxAmount() > 0){
+                predicates.add(criteriaBuilder.le(root.get("amount"), manageVO.getMaxAmount()));
+            }
+            if(manageVO.getDeptIds() != null && manageVO.getDeptIds().size() > 0){
+                List<Predicate> list = new ArrayList<>();
+                if (manageVO.getDeptIds() != null && manageVO.getDeptIds().size() > 0) {
+                    CriteriaBuilder.In<Object> in = criteriaBuilder.in(root.get("deptId"));
+                    for (Long id : manageVO.getDeptIds()) {
+                        in.value(id);
                     }
-                    predicates.addAll(list);
+                    list.add(in);
                 }
-                return criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()]));
+                predicates.addAll(list);
             }
+            return criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()]));
         };
         Long count = manageRepository.count(specification);
         if (count == 0) {

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

@@ -1,17 +1,20 @@
 package cn.efunbox.manage.base.service.impl;
 
-import cn.efunbox.manage.base.entity.Department;
 import cn.efunbox.manage.base.entity.Project;
 import cn.efunbox.manage.base.enums.BaseStatusEnum;
 import cn.efunbox.manage.base.repository.DepartmentRepository;
 import cn.efunbox.manage.base.repository.ProjectRepository;
 import cn.efunbox.manage.base.service.ProjectService;
+import cn.efunbox.manage.common.enums.BaseOrderEnum;
+import cn.efunbox.manage.common.helper.SortHelper;
 import cn.efunbox.manage.common.result.ApiCode;
 import cn.efunbox.manage.common.result.ApiResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * ProjectServiceImpl
@@ -28,7 +31,9 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public ApiResult list(Project project) {
-        List<Project> projects = projectRepository.find(project);
+        List<Project> projects = projectRepository.find(project, SortHelper.sortMap2Sort(new LinkedHashMap<String,BaseOrderEnum>(){{
+            put("code",BaseOrderEnum.ASC);
+        }}));
         if(Objects.nonNull(projects)){
             return ApiResult.ok(projects);
         }
@@ -37,7 +42,7 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public ApiResult save(Project project) {
-        if(project ==null){
+        if(Objects.isNull(project)){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
         if(Objects.nonNull(projectRepository.findByName(project.getName()))){

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

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
  * Created by wangys on 2019/03/07
  */
 @RestController
-    @RequestMapping("/dept")
+@RequestMapping("/dept")
 public class DepartmentController {
 
     @Autowired