瀏覽代碼

feat: update something

shc 8 月之前
父節點
當前提交
859b1431f4

+ 2 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysImplementPlanController.java

@@ -134,8 +134,9 @@ public class SysImplementPlanController {
 
     @GetMapping(value = "/plan/list")
     public R<List<SysImplementPlanVO.ToList>> listPlans(@RequestParam(value = "planType", required = false) UpmsType.ImplementPlanType planType,
+                                                        @RequestParam(value = "pkgId") String pkgId,
                                                         @RequestParam(value = "planState", required = false, defaultValue = "PASSED") UpmsState.ImplementPlanState planState) {
-        return R.ok(implementPlanManager.listPlans(planState, planType, SecurityUtils.getUser()));
+        return R.ok(implementPlanManager.listPlans(planState, planType, pkgId, SecurityUtils.getUser()));
     }
 
 

+ 0 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmSupervisionController.java

@@ -3,7 +3,6 @@ package com.qunzhixinxi.hnqz.admin.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmSupervisionDto;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageSupervision;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmRoleSupervisionWarn;
 import com.qunzhixinxi.hnqz.admin.manager.WmSupervisionManager;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;

+ 21 - 40
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -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());

+ 7 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmPackageTaskTypeQtyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageTaskTypeQty;
@@ -10,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -32,6 +34,11 @@ public class WmPackageTaskTypeQtyServiceImpl extends ServiceImpl<WmPackageTaskTy
      */
     @Override
     public List<WmPackageTaskTypeQty> listPkgTaskTypeQtyByPkgIds(Collection<Integer> pkgIds) {
+
+        if (CollUtil.isEmpty(pkgIds)){
+            return Collections.emptyList();
+        }
+
         return this.list(Wrappers.<WmPackageTaskTypeQty>lambdaQuery().in(WmPackageTaskTypeQty::getPackageId, pkgIds));
     }
 }