采购服务站字段返回修改

purchase-system/src/main/java/com/ozs/plan/doman/ProvisionalPlan.java

@@ -64,11 +64,11 @@ public class ProvisionalPlan {
     @TableField("is_excess")
     private String isExcess;
 
+    @Excel(name = "采购服务站")
     @ApiModelProperty(value = "采购服务站")
     @TableField("purchase_services")
     private String purchaseServices;
 
-    @Excel(name = "采购服务站")
     @TableField(exist = false)
     private String purchaseServicesStr;
 

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -634,30 +634,43 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success();
     }
 
+    /**
+     * 需求单位--首页--计划管理总数
+     * @return
+     */
     @Override
     public AjaxResult demandUnitPlanManagementTotal() {
-        List<PlanYears> planYears = new ArrayList<>();
+        // List<PlanYears> planYears = new ArrayList<>();
+        Long count = null;
         try {
+            // 通过用户ID查询角色
             List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            // 获取角色权限 demand_unit
             List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
             if (sysRoleList.size() > 0) {
+                // 获取用户
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                // 获取部门
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                // 查询年度计划
                 LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(PlanYears::getPurchaseDeptId, sysDept.getDeptId());
                 queryWrapper.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
-                planYears = planYearsMapper.selectList(queryWrapper);
+                // planYears = planYearsMapper.selectList(queryWrapper);
+                count = planYearsMapper.selectCount(queryWrapper);
             }
+            // 获取角色权限 admin
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
             if (sysRoleList2.size() > 0) {
                 LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
-                planYears = planYearsMapper.selectList(queryWrapper);
+                // planYears = planYearsMapper.selectList(queryWrapper);
+                count = planYearsMapper.selectCount(queryWrapper);
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return AjaxResult.success(planYears.size());
+        return AjaxResult.success(count);
     }
 
     @Override
@@ -686,17 +699,23 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success(planYears.size());
     }
 
+    /**
+     * 需求单位--首页--需求管理总数
+     * @return
+     */
     @Override
     public AjaxResult demandUnitDemandManagementTotal() {
         List<PmDemand> pmDemands = new ArrayList<>();
         try {
+            // 通过用户ID 查询角色
             List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            // 获取角色权限 demand_unit
             List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
             if (sysRoleList.size() > 0) {
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId());
+                queryWrapper.in(PmDemand::getPurchaseDeptId, sysDept.getDeptId());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
             List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -120,7 +120,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
         HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
-        HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
+        // HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
 
         int successNum = 0;
         int failureNum = 0;
@@ -156,7 +156,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                         builder.append(projectAttributes.get(ofProvisionalPlan.getProjectAttr()));
                     }
                     ofProvisionalPlan.setProjectAttr(builder.toString());
-                    ofProvisionalPlan.setPurchaseServices(purchaseServices.get(ofProvisionalPlan.getPurchaseServicesStr()));
+                    // ofProvisionalPlan.setPurchaseServices(purchaseServices.get(ofProvisionalPlan.getPurchaseServicesStr()));
                     ofProvisionalPlan.setIsExcess(deptService.isExcessOrNo(ofProvisionalPlan.getProjectType(), ofProvisionalPlan.getEvaluation(), info.getDeptId()));
                     ofProvisionalPlan.setCreated(String.valueOf(loginUser.getUserId()));
                     ofProvisionalPlan.setCreateTime(new Date());
@@ -572,12 +572,12 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 }
             }
         }
-        for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
+        /*for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
             if (provisionalPlan.getPurchaseServices() != null && provisionalPlan.getPurchaseServices().equals(entry.getValue())) {
                 provisionalPlan.setPurchaseServicesStr(entry.getKey());
                 break;
             }
-        }
+        }*/
         return provisionalPlan;
     }
 
@@ -627,13 +627,13 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     }
                 }
             }
-            for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
-                if (provisionalPlan.getPurchaseServices() != null && provisionalPlan.getPurchaseServices().equals(entry.getValue())) {
-                    provisionalPlan.setPurchaseServicesStr(entry.getKey());
-                    break;
-                }
-            }
-
+            // 采购服务站
+//            for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
+//                if (provisionalPlan.getPurchaseServices() != null && provisionalPlan.getPurchaseServices().equals(entry.getValue())) {
+//                    provisionalPlan.setPurchaseServicesStr(entry.getKey());
+//                    break;
+//                }
+//            }
             list.add(provisionalPlan);
         }
         return list;