|
@@ -645,54 +645,35 @@ public class SysImplementPlanManager {
|
|
|
return detailsMap;
|
|
|
}
|
|
|
|
|
|
- public List<SysImplementPlanVO.ToList> listPlans(UpmsState.ImplementPlanState planState, UpmsType.ImplementPlanType planType, HnqzUser user) {
|
|
|
+ public List<SysImplementPlanVO.ToList> listPlans(UpmsState.ImplementPlanState planState, UpmsType.ImplementPlanType planType, String pkgId, HnqzUser user) {
|
|
|
|
|
|
- Integer entId = user.getDeptId();
|
|
|
- List<SysImplementPlan> plans = implementPlanService.list(Wrappers.<SysImplementPlan>lambdaQuery()
|
|
|
- .eq(SysImplementPlan::getConsignorId, entId)
|
|
|
+ LambdaQueryWrapper<SysImplementPlan> queryWrapper = Wrappers.<SysImplementPlan>lambdaQuery()
|
|
|
.eq(Objects.nonNull(planType), SysImplementPlan::getPlanType, planType)
|
|
|
- .eq(SysImplementPlan::getPlanState, planState));
|
|
|
+ .eq(SysImplementPlan::getPlanState, planState);
|
|
|
+
|
|
|
+ // 药企
|
|
|
+ if ("-1".equals(pkgId)){
|
|
|
+ Integer entId = user.getDeptId();
|
|
|
+ queryWrapper.eq(SysImplementPlan::getConsignorId, entId);
|
|
|
+
|
|
|
+ } else {
|
|
|
+
|
|
|
+ SysPlanPkg one = planPkgService.getOne(Wrappers.<SysPlanPkg>lambdaQuery().eq(SysPlanPkg::getPkgId, Integer.valueOf(pkgId)));
|
|
|
+ if (one == null) {
|
|
|
+ return Collections.emptyList();
|
|
|
+ }
|
|
|
+
|
|
|
+ queryWrapper.eq(SysImplementPlan::getParentId, one.getPlanId());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ List<SysImplementPlan> plans = implementPlanService.list(queryWrapper);
|
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(plans)) {
|
|
|
return Collections.emptyList();
|
|
|
}
|
|
|
|
|
|
- // Set<Long> p0Ids = plans.stream().mapToLong(SysImplementPlan::getPlanId).boxed().collect(Collectors.toSet());
|
|
|
- //
|
|
|
- // // 判断拆解拆解状态是否可用
|
|
|
- // int entLevel = roleService.getEntLevel();
|
|
|
- // if (-1 == entLevel) {
|
|
|
- // // 查询区域和服务商
|
|
|
- // List<SysImplementPlan> plans1 = implementPlanService.list(Wrappers.<SysImplementPlan>lambdaQuery()
|
|
|
- // .in(SysImplementPlan::getParentId, p0Ids)
|
|
|
- // .eq(SysImplementPlan::getPlanState, planState));
|
|
|
- //
|
|
|
- // if (CollUtil.isEmpty(plans1)){
|
|
|
- // return Collections.emptyList();
|
|
|
- // }
|
|
|
- // Set<Long> p1Ids = plans1.stream().mapToLong(SysImplementPlan::getPlanId).boxed().collect(Collectors.toSet());
|
|
|
- // // 查询区域和服务商
|
|
|
- // List<SysImplementPlan> plans2 = implementPlanService.list(Wrappers.<SysImplementPlan>lambdaQuery()
|
|
|
- // .in(SysImplementPlan::getParentId, p1Ids)
|
|
|
- // .eq(SysImplementPlan::getPlanState, planState));
|
|
|
- //
|
|
|
- // if (CollUtil.isEmpty(plans2)){
|
|
|
- // return Collections.emptyList();
|
|
|
- // }
|
|
|
- //
|
|
|
- //
|
|
|
- //
|
|
|
- //
|
|
|
- // } else if (1 == entLevel) {
|
|
|
- //
|
|
|
- // } else if (2 == entLevel) {
|
|
|
- //
|
|
|
- // }
|
|
|
-
|
|
|
-
|
|
|
- // plans.stream().map(SysImplementPlanlan::get)
|
|
|
-
|
|
|
|
|
|
// 获取承接人ID
|
|
|
Set<Integer> consigneeIds = plans.stream().mapToInt(SysImplementPlan::getConsigneeId).boxed().collect(Collectors.toSet());
|