buzhanyi 2 роки тому
батько
коміт
c26096db94

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

@@ -1,6 +1,7 @@
 package com.ozs.plan.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,6 +34,7 @@ import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.mapper.ProvisionalPlanMapper;
 import com.ozs.plan.service.PlanYearsService;
 import com.ozs.pm.doman.*;
+import com.ozs.pm.doman.vo.requestVo.PmDemandReqVo;
 import com.ozs.pm.doman.vo.responseVo.*;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.*;
@@ -826,41 +828,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Override
     public AjaxResult procurementOfficeProcurementExecutionTotal() {
-        List<PmDemand> pmDemands = new ArrayList<>();
-        try {
-            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
-            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("procurement_office")).collect(Collectors.toList());
-            if (sysRoleList.size() > 0) {
-                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
-                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId())
-                        .in("project_status",
-                                PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
-                                PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
-                                PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
-                                PmProjectStatus.WAIT_OPEN_BID.getCode(),
-                                PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getCode(),
-                                PmProjectStatus.BIDDING_PUBLICITY.getCode(),
-                                PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
-                pmDemands = pmDemandMapper.selectList(queryWrapper);
-            }
-            List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
-            if (sysRoleList2.size() > 0) {
-                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
-                queryWrapper.in("project_status", PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
-                        PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
-                        PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
-                        PmProjectStatus.WAIT_OPEN_BID.getCode(),
-                        PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getCode(),
-                        PmProjectStatus.BIDDING_PUBLICITY.getCode(),
-                        PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
-                pmDemands = pmDemandMapper.selectList(queryWrapper);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return AjaxResult.success(pmDemands.size());
+        SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+        SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+        PmDemandReqVo pmDemandReqVo = new PmDemandReqVo();
+        pmDemandReqVo.setPageNum(1L);
+        pmDemandReqVo.setPageSize(10L);
+        pmDemandReqVo.setUserId(sysUser.getUserId());
+        pmDemandReqVo.setPurchaseDeptId(Math.toIntExact(sysDept.getDeptId()));
+        IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 3);
+        return AjaxResult.success(page.getTotal());
     }
 
     @Override