|
@@ -669,15 +669,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
if (sysRoleList.size() > 0) {
|
|
|
SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
|
|
|
SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
|
|
|
- QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("purchaseDeptId", sysDept.getDeptId())
|
|
|
- .in("project_status", ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
|
|
|
+ LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(PlanYears::getPurchaseDeptId, sysDept.getDeptId())
|
|
|
+ .in(PlanYears::getProjectStatus, ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
|
|
|
planYears = planYearsMapper.selectList(queryWrapper);
|
|
|
}
|
|
|
List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
|
|
|
if (sysRoleList2.size() > 0) {
|
|
|
- QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.in("project_status", ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
|
|
|
+ LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.in(PlanYears::getProjectStatus, ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
|
|
|
planYears = planYearsMapper.selectList(queryWrapper);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -695,13 +695,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
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());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId());
|
|
|
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<>();
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
pmDemands = pmDemandMapper.selectList(queryWrapper);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -719,16 +719,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
if (sysRoleList.size() > 0) {
|
|
|
SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
|
|
|
SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
|
|
|
- List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
|
|
|
- QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("purchaseDeptId", sysDept.getDeptId())
|
|
|
- .in("project_status", PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
|
|
|
+ .in(PmDemand::getProjectStatus, PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.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.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
|
|
|
pmDemands = pmDemandMapper.selectList(queryWrapper);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -746,15 +745,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
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());
|
|
|
- queryWrapper.in("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId());
|
|
|
+ queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.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.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.getCode());
|
|
|
pmDemands = pmDemandMapper.selectList(queryWrapper);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -772,15 +771,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
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());
|
|
|
- queryWrapper.in("project_status", PmProjectStatus.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId());
|
|
|
+ queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.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.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
|
|
|
pmDemands = pmDemandMapper.selectList(queryWrapper);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -798,9 +797,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
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.TASK_WAIT_RELEASE.getCode(),
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
|
|
|
+ .in(PmDemand::getProjectStatus, PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
|
|
|
PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
|
|
|
PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
|
|
|
PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
|
|
@@ -812,8 +811,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
}
|
|
|
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.TASK_WAIT_RELEASE.getCode(),
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
|
|
|
PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
|
|
|
PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
|
|
|
PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
|
|
@@ -850,15 +849,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
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())
|
|
|
- .lt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
|
|
|
+ .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) {
|
|
|
- QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.lt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.lt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
|
|
|
pmDemands = pmDemandMapper.selectList(queryWrapper);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -876,15 +875,15 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
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())
|
|
|
- .gt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
|
|
|
+ .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) {
|
|
|
- QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.gt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
|
|
|
+ LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.gt(PmDemand::getProjectStatus, PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
|
|
|
pmDemands = pmDemandMapper.selectList(queryWrapper);
|
|
|
}
|
|
|
} catch (Exception e) {
|