DeBugDeBugDeBug

purchase-admin/src/main/java/com/ozs/web/controller/home/SystemHomepageController.java

@@ -79,7 +79,7 @@ public class SystemHomepageController extends BaseController {
         return planYearsService.procurementOfficeProcurementExecutionTotal();
     }
 
-    @ApiOperation(value = "采购办首已中标项目理总数")
+    @ApiOperation(value = "采购办首已中标项目总数")
     @GetMapping("/procurementOffice/winningTheBid/total")
     public AjaxResult procurementOfficeWinningTheBidTotal() {
         return planYearsService.procurementOfficeWinningTheBidTotal();

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

@@ -753,13 +753,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
-                        .lt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                        .gt(PmDemand::getProjectStatus, 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) {
                 LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.lt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                queryWrapper.gt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -779,13 +779,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
-                        .gt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                        .lt(PmDemand::getProjectStatus, 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) {
                 LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.gt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                queryWrapper.lt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {