|
@@ -38,13 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.HashSet;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -246,6 +240,8 @@ public class SysImplementPlanManager {
|
|
|
LocalDate[] period) {
|
|
|
|
|
|
LambdaQueryWrapper<SysImplementPlan> wrapper = Wrappers.<SysImplementPlan>lambdaQuery()
|
|
|
+ .eq(Objects.nonNull(consigneeId), SysImplementPlan::getConsigneeId, consigneeId)
|
|
|
+ .eq(Objects.nonNull(consignorId), SysImplementPlan::getConsignorId, consignorId)
|
|
|
.like(StrUtil.isNotBlank(planName), SysImplementPlan::getPlanName, planName);
|
|
|
|
|
|
// 服务商管理员(只查询发给我的)
|