From c8324bcbb8adb726c7aad1394045cf61383955b8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 19 Oct 2023 10:16:24 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 1f66f94..fbfcd40 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -640,7 +640,7 @@
public List<AllocationFindVo> selectSmallRoutine(Integer state,String startTime,String endTime) {
ArrayList<AllocationFindVo> allocationFindVos = new ArrayList<>();
LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
-
+ wrapper.orderByDesc(Allocation::getEscalationTime);
//������������������
List<Integer> list = unitResult();
if (!ObjectUtils.isEmpty(list)){
@@ -679,9 +679,12 @@
for (Allocation allocation : allocations) {
AllocationFindVo allocationFindVo = new AllocationFindVo();
BeanUtils.copyProperties(allocation,allocationFindVo);
+ if (integer==0 || integer==1){
+
+ }
allocationFindVos.add(allocationFindVo);
}
-// List<AllocationFindVo> allocationFindVos = allocationMapper.selectSmallRoutine(state);
+ List<AllocationFindVo> allocationFindVo = allocationMapper.selectSmallRoutine(state,startTime,endTime);
return allocationFindVos;
}
@@ -694,8 +697,8 @@
@Transactional
public void changeSmallRoutine(AllocationChangeCond changeCond) {
Integer integer = unitAreaCode();
- if (integer==1){
- throw new BusinessException("���������������������������������������");
+ if (integer==2){
+ throw new BusinessException("���������������������������������������");
}
AllocationExt allocationExt = oneAllocation(changeCond.getAllocationId());
if(!AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {
--
Gitblit v1.8.0