feat: update something

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptController.java

@@ -154,6 +154,45 @@ public class SysDeptController {
     }
 
 
+    /**
+     * 查收父级列表
+     *
+     * @return 返回子级
+     */
+    @GetMapping(value = "/list/ancestor")
+    public R<List<SysDept>> listAncestors(@RequestParam(value = "deptId", required = false) Integer deptId,
+                                          @RequestParam(value = "onlySelf", required = false, defaultValue = "false") Boolean onlySelf) {
+
+
+
+        if (deptId == null) {
+            HnqzUser user = SecurityUtils.getUser();
+            deptId = user.getDeptId();
+        }
+
+        if (onlySelf){
+            SysDept service = sysDeptService.getById(deptId);
+            return R.ok(Collections.singletonList(service));
+        }
+
+        List<SysDeptRelation> list = relationService.list(Wrappers.<SysDeptRelation>lambdaQuery()
+                .ne(SysDeptRelation::getAncestor, deptId)
+                .eq(SysDeptRelation::getDescendant, deptId));
+
+        if (CollUtil.isNotEmpty(list)) {
+
+            Set<Integer> collect = list.stream().map(SysDeptRelation::getAncestor).collect(Collectors.toSet());
+
+            List<SysDept> sysDepts = sysDeptService.listByIds(collect);
+
+            return R.ok(sysDepts);
+
+        }
+
+
+        return R.ok(Collections.emptyList());
+    }
+
     /**
      * 获取登录用户企业的有效期
      *

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackaeServiceImpl.java

@@ -729,18 +729,33 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         List<WmPackageTaskTypeQty> packageTaskTypeQtyList = packageTaskTypeQtyService.listPkgTaskTypeQtyByPkgIds(pkgIds);
 
         if (CollUtil.isNotEmpty(packageTaskTypeQtyList)) {
+
+            // 获取子集包
+            List<WmScorePackage> wmScorePackages = wmScorePackageMapper.selectList(Wrappers.<WmScorePackage>lambdaQuery().in(WmScorePackage::getRelationScoreId, pkgIds));
+            Set<Integer> collect2 = wmScorePackages.stream().map(WmScorePackage::getId).map(Integer::valueOf).collect(Collectors.toSet());
+            Map<Integer, List<WmPackageTaskTypeQty>> collect3 = packageTaskTypeQtyService.listPkgTaskTypeQtyByPkgIds(collect2).stream().collect(Collectors.groupingBy(WmPackageTaskTypeQty::getTaskTypeId));
+
+
             Map<Integer, List<WmPackageTaskTypeQty>> collect = packageTaskTypeQtyList.stream().collect(Collectors.groupingBy(WmPackageTaskTypeQty::getPackageId));
 
             packageList.forEach(pkg -> {
                 List<WmPackageTaskTypeQty> relations = collect.get(Integer.parseInt(pkg.getId()));
                 if (CollUtil.isNotEmpty(relations)) {
-                    List<Map<String, Object>> collect1 = relations.stream().map(BeanUtil::beanToMap).collect(Collectors.toList());
+                    List<Map<String, Object>> collect1 = relations.stream().map( rel -> {
+                        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rel);
+                        List<WmPackageTaskTypeQty> qtyList = collect3.get(rel.getTaskTypeId());
+                        stringObjectMap.put("used", CollUtil.isEmpty(qtyList) ? 0 : qtyList.stream().mapToInt(WmPackageTaskTypeQty::getQty).sum());
+                        return stringObjectMap;
+                    }).collect(Collectors.toList());
                     pkg.setPkgTaskTypeQtyList(CollUtil.isNotEmpty(relations) ? collect1 : Collections.emptyList());
                 }
             });
         }
 
 
+
+
+
         log.info("查询关联积分包值+拼装参数总耗时:{}ms", System.currentTimeMillis() - start);
 
         return R.ok(packageList);