feat: 统计页面 update

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysStatisticManager.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysStatisticDto;
 import com.qunzhixinxi.hnqz.admin.api.entity.ReDeptDrug;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
@@ -300,7 +301,7 @@ public class SysStatisticManager {
         // 获取当前操作人的角色
         List<Integer> roles = SecurityUtils.getRoles();
 
-        LambdaQueryWrapper<SysImplementPlan> queryWrapper = Wrappers.lambdaQuery();
+        LambdaQueryWrapper<SysImplementPlan> queryWrapper = Wrappers.<SysImplementPlan>lambdaQuery().eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.PASSED);
 
         boolean rootFlag = false;
 
@@ -470,7 +471,7 @@ public class SysStatisticManager {
         // 获取当前操作人的角色
         List<Integer> roles = SecurityUtils.getRoles();
 
-        LambdaQueryWrapper<WmScorePackage> queryWrapper = Wrappers.lambdaQuery();
+        LambdaQueryWrapper<WmScorePackage> queryWrapper = Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val());
 
         boolean rootFlag = false;
 
@@ -520,7 +521,9 @@ public class SysStatisticManager {
                 // 获取子集
                 List<String> parentPkgIds = pkgs.stream().map(WmScorePackage::getId).distinct().sorted().collect(Collectors.toList());
 
-                List<WmScorePackage> subPkgs = packageService.list(Wrappers.<WmScorePackage>lambdaQuery().in(WmScorePackage::getRelationScoreId, parentPkgIds));
+                List<WmScorePackage> subPkgs = packageService.list(Wrappers.<WmScorePackage>lambdaQuery()
+                        .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
+                        .in(WmScorePackage::getRelationScoreId, parentPkgIds));
 
                 if (CollUtil.isEmpty(subPkgs)) {
                     break;
@@ -679,9 +682,11 @@ public class SysStatisticManager {
         if (CollUtil.isNotEmpty(deptDrugs)) {
             List<String> drugIds = deptDrugs.stream().map(dd -> dd.getDrugId().toString()).distinct().sorted().collect(Collectors.toList());
             Map<String, String> drugtableMap = drugTableService.list(Wrappers.<WmDaDrugEntDrugtable>lambdaQuery()
-                    .eq(WmDaDrugEntDrugtable::getDelFlag, CommonConstants.STATUS_NORMAL)
-                    .eq(WmDaDrugEntDrugtable::getEnableFlag, CommonConstants.STATUS_NORMAL)
-                    .in(WmDaDrugEntDrugtable::getId, drugIds)).stream().collect(Collectors.toMap(WmDaDrugEntDrugtable::getId, WmDaDrugEntDrugtable::getDrugname));
+                            .eq(WmDaDrugEntDrugtable::getDelFlag, CommonConstants.STATUS_NORMAL)
+                            .eq(WmDaDrugEntDrugtable::getEnableFlag, CommonConstants.STATUS_NORMAL)
+                            .in(WmDaDrugEntDrugtable::getId, drugIds))
+                    .stream()
+                    .collect(Collectors.toMap(WmDaDrugEntDrugtable::getId, WmDaDrugEntDrugtable::getDrugnameTy));
 
             drugMap = deptDrugs.stream().collect(Collectors.groupingBy(ReDeptDrug::getDeptId, Collectors.mapping(dd -> drugtableMap.get(dd.getDrugId().toString()), Collectors.toList())));