|
@@ -53,8 +53,11 @@ public class ManageServiceImpl implements ManageService {
|
|
|
public Predicate toPredicate(Root<Manage> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
|
|
|
|
|
|
List<Predicate> predicates = new ArrayList<>();
|
|
|
- if(Objects.nonNull(manage.getCompanyId()) && 0 == manage.getCompanyId()){
|
|
|
- predicates.add(criteriaBuilder.equal(root.get("companyId"), manage.getCompanyId()));
|
|
|
+ if(Objects.nonNull(manage.getToProjectId()) && 0 == manage.getToProjectId()){
|
|
|
+ predicates.add(criteriaBuilder.equal(root.get("toProjectId"), manage.getToProjectId()));
|
|
|
+ }
|
|
|
+ if(Objects.nonNull(manage.getToDeptId()) && 0 == manage.getToDeptId()){
|
|
|
+ predicates.add(criteriaBuilder.equal(root.get("toDeptId"), manage.getToProjectId()));
|
|
|
}
|
|
|
if(Objects.nonNull(manage.getProductId()) && 0 == manage.getProductId()){
|
|
|
predicates.add(criteriaBuilder.equal(root.get("productId"), manage.getProductId()));
|
|
@@ -105,26 +108,29 @@ public class ManageServiceImpl implements ManageService {
|
|
|
if(Objects.nonNull(m.getProjectId())){
|
|
|
projectIds.add(m.getProjectId());
|
|
|
}
|
|
|
- if(Objects.equals(m.getType(), ManageTypeEnum.COST)){
|
|
|
- switch (m.getCompanyType()){
|
|
|
- case COMPANY:
|
|
|
- if(Objects.nonNull(m.getCompanyId())){
|
|
|
- companyIds.add(m.getCompanyId());
|
|
|
- }
|
|
|
- break;
|
|
|
- case DEPARTMENT:
|
|
|
- if(Objects.nonNull(m.getCompanyId())){
|
|
|
- deptIds.add(m.getCompanyId());
|
|
|
- }
|
|
|
- break;
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
- }else {
|
|
|
- if(Objects.nonNull(m.getProductId())){
|
|
|
- productIds.add(m.getProductId());
|
|
|
- }
|
|
|
+ if(Objects.nonNull(m.getToDeptId())){
|
|
|
+ deptIds.add(m.getToDeptId());
|
|
|
}
|
|
|
+// if(Objects.equals(m.getType(), ManageTypeEnum.COST)){
|
|
|
+// switch (m.getCompanyType()){
|
|
|
+// case COMPANY:
|
|
|
+// if(Objects.nonNull(m.getCompanyId())){
|
|
|
+// companyIds.add(m.getCompanyId());
|
|
|
+// }
|
|
|
+// break;
|
|
|
+// case DEPARTMENT:
|
|
|
+// if(Objects.nonNull(m.getCompanyId())){
|
|
|
+// deptIds.add(m.getCompanyId());
|
|
|
+// }
|
|
|
+// break;
|
|
|
+// default:
|
|
|
+// break;
|
|
|
+// }
|
|
|
+// }else {
|
|
|
+// if(Objects.nonNull(m.getProductId())){
|
|
|
+// productIds.add(m.getProductId());
|
|
|
+// }
|
|
|
+// }
|
|
|
if(Objects.nonNull(m.getCostTypeId())){
|
|
|
costTypeIds.add(m.getCostTypeId());
|
|
|
}
|
|
@@ -171,22 +177,23 @@ public class ManageServiceImpl implements ManageService {
|
|
|
if(Objects.nonNull(m.getCostTypeId())){
|
|
|
m.setCostType(costTypeMap.get(m.getCostTypeId()));
|
|
|
}
|
|
|
- if(Objects.nonNull(m.getCompanyType())){
|
|
|
- switch (m.getCompanyType()){
|
|
|
- case COMPANY:
|
|
|
- if(Objects.nonNull(m.getCompanyId())){
|
|
|
- m.setCompany(companyMap.get(m.getCompanyId()));
|
|
|
- }
|
|
|
- break;
|
|
|
- case DEPARTMENT:
|
|
|
- if(Objects.nonNull(m.getCompanyId())){
|
|
|
- m.setCompany(companyMap.get(m.getDeptId()));
|
|
|
- }
|
|
|
- break;
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
+ m.setToDepartment(departmentMap.get(m.getToDeptId()));
|
|
|
+// if(Objects.nonNull(m.getCompanyType())){
|
|
|
+// switch (m.getCompanyType()){
|
|
|
+// case COMPANY:
|
|
|
+// if(Objects.nonNull(m.getCompanyId())){
|
|
|
+// m.setCompany(companyMap.get(m.getCompanyId()));
|
|
|
+// }
|
|
|
+// break;
|
|
|
+// case DEPARTMENT:
|
|
|
+// if(Objects.nonNull(m.getCompanyId())){
|
|
|
+// m.setCompany(companyMap.get(m.getDeptId()));
|
|
|
+// }
|
|
|
+// break;
|
|
|
+// default:
|
|
|
+// break;
|
|
|
+// }
|
|
|
+// }
|
|
|
});
|
|
|
return ApiResult.ok(manages);
|
|
|
}
|
|
@@ -228,23 +235,24 @@ public class ManageServiceImpl implements ManageService {
|
|
|
manage.setProject(projectRepository.find(manage.getProjectId()));
|
|
|
manage.setProduct(productRepository.find(manage.getProductId()));
|
|
|
manage.setToProject(projectRepository.find(manage.getToProjectId()));
|
|
|
- if(Objects.nonNull(manage.getCompanyType())){
|
|
|
-
|
|
|
- switch (manage.getCompanyType()){
|
|
|
- case COMPANY:
|
|
|
- if(Objects.nonNull(manage.getCompanyId())){
|
|
|
- manage.setCompany(companyRepository.find(manage.getCompanyId()));
|
|
|
- }
|
|
|
- break;
|
|
|
- case DEPARTMENT:
|
|
|
- if(Objects.nonNull(manage.getCompanyId())){
|
|
|
- manage.setCompany(departmentRepository.find(manage.getDeptId()));
|
|
|
- }
|
|
|
- break;
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
+ manage.setToDepartment(departmentRepository.find(manage.getToDeptId()));
|
|
|
+// if(Objects.nonNull(manage.getCompanyType())){
|
|
|
+//
|
|
|
+// switch (manage.getCompanyType()){
|
|
|
+// case COMPANY:
|
|
|
+// if(Objects.nonNull(manage.getCompanyId())){
|
|
|
+// manage.setCompany(companyRepository.find(manage.getCompanyId()));
|
|
|
+// }
|
|
|
+// break;
|
|
|
+// case DEPARTMENT:
|
|
|
+// if(Objects.nonNull(manage.getCompanyId())){
|
|
|
+// manage.setCompany(departmentRepository.find(manage.getDeptId()));
|
|
|
+// }
|
|
|
+// break;
|
|
|
+// default:
|
|
|
+// break;
|
|
|
+// }
|
|
|
+// }
|
|
|
return ApiResult.ok(manage);
|
|
|
}
|
|
|
}
|