|
@@ -3,22 +3,17 @@ 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;
|
|
|
-import com.github.pagehelper.PageHelper;
|
|
|
import com.ozs.base.domain.BaseAgency;
|
|
|
import com.ozs.base.service.BaseAgencyService;
|
|
|
-import com.ozs.common.constant.Constants;
|
|
|
import com.ozs.common.core.domain.AjaxResult;
|
|
|
import com.ozs.common.core.domain.entity.SysDept;
|
|
|
import com.ozs.common.core.domain.entity.SysDictData;
|
|
|
-import com.ozs.common.core.domain.entity.SysProcurementStandard;
|
|
|
import com.ozs.common.core.domain.entity.SysRole;
|
|
|
import com.ozs.common.core.domain.entity.SysUser;
|
|
|
import com.ozs.common.core.domain.model.LoginUser;
|
|
|
import com.ozs.common.enums.*;
|
|
|
import com.ozs.common.exception.ServiceException;
|
|
|
-import com.ozs.common.utils.PageUtils;
|
|
|
import com.ozs.common.utils.SecurityUtils;
|
|
|
import com.ozs.common.utils.StringUtils;
|
|
|
import com.ozs.common.utils.bean.BeanUtils;
|
|
@@ -126,7 +121,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
@Autowired
|
|
|
private PmAuditDeptRefService pmAuditDeptRefService;
|
|
|
|
|
|
-
|
|
|
@Override
|
|
|
public List<PlanYearsResponseVo> selectPlanYearsListEXP(PlanYearsStandardVo vo, LoginUser loginUser) {
|
|
|
List<PlanYears> list = new ArrayList<>();
|
|
@@ -672,27 +666,32 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
|
|
|
@Override
|
|
|
public AjaxResult purchasingManagementPurchasingManagementTotal() {
|
|
|
- List<PlanYears> planYears = new ArrayList<>();
|
|
|
- try {
|
|
|
- List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
|
|
|
- List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("purchasing_management")).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())
|
|
|
- .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) {
|
|
|
- LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.in(PlanYears::getProjectStatus, ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
|
|
|
- planYears = planYearsMapper.selectList(queryWrapper);
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+// List<PlanYears> planYears = new ArrayList<>();
|
|
|
+// try {
|
|
|
+// List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
|
|
|
+// List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("purchasing_management")).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())
|
|
|
+// .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) {
|
|
|
+// LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+// queryWrapper.in(PlanYears::getProjectStatus, ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
|
|
|
+// planYears = planYearsMapper.selectList(queryWrapper);
|
|
|
+// }
|
|
|
+// } catch (Exception e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// }
|
|
|
+ LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
+ PlanYearsStandardVo vo = new PlanYearsStandardVo();
|
|
|
+ vo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
|
|
|
+ vo.setCreated(String.valueOf(loginUser.getUserId()));
|
|
|
+ List<PlanYears> planYears = planYearsMapper.query(vo);
|
|
|
return AjaxResult.success(planYears.size());
|
|
|
}
|
|
|
|
|
@@ -728,28 +727,41 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
|
|
|
@Override
|
|
|
public AjaxResult purchasingManagementDemandManagementTotal() {
|
|
|
- List<PmDemand> pmDemands = new ArrayList<>();
|
|
|
- try {
|
|
|
- List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
|
|
|
- List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("purchasing_management")).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())
|
|
|
- .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) {
|
|
|
- LambdaQueryWrapper<PmDemand> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.in(PmDemand::getProjectStatus, PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
|
|
|
- pmDemands = pmDemandMapper.selectList(queryWrapper);
|
|
|
+ long ii = selectPmDemandCount(1);
|
|
|
+ return AjaxResult.success(ii);
|
|
|
+ }
|
|
|
+
|
|
|
+ public long selectPmDemandCount(int reqType) {
|
|
|
+ LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<>();
|
|
|
+ // 4 (合同信息管理)、 0(需求单位管理) 、 5(项目建设管理) 需求单位
|
|
|
+ // 1(需求需求审核) 、2 (任务下达管理) 采购管理部门
|
|
|
+ // 3(采购执行管理) 采购办
|
|
|
+ List<PmAuditDeptRef> list = new ArrayList<>();
|
|
|
+ LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
|
|
|
+ l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
|
|
|
+ l.eq(PmAuditDeptRef::getRefType, "2");
|
|
|
+ list = pmAuditDeptRefService.list(l);
|
|
|
+ if (Arrays.asList(1, 2, 3).contains(reqType)) {
|
|
|
+ if (!ObjectUtils.isEmpty(list) && !SecurityUtils.getUserId().equals(Integer.parseInt("1"))) {
|
|
|
+ lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
|
}
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
+ } else {
|
|
|
+ lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
|
|
|
}
|
|
|
- return AjaxResult.success(pmDemands.size());
|
|
|
+ if (reqType == 1) { //需求审核单位列表
|
|
|
+ lw.apply("(project_status = 6 or project_status = 8 )");
|
|
|
+ } else if (reqType == 2) { //任务下达列表
|
|
|
+ lw.apply("(project_status = 8 or project_status = 9 )");
|
|
|
+ } else if (reqType == 3) { //采购执行列表
|
|
|
+ lw.apply("(project_status = 9 or project_status = 10 or project_status = 11 or project_status = 12 or project_status = 13 or project_status = 14 or project_status = 15)");
|
|
|
+ } else if (reqType == 4) { //合同信息列表
|
|
|
+ lw.apply("(project_status = 15 or project_status = 16 )");
|
|
|
+ } else if (reqType == 5) { //项目建设列表
|
|
|
+ lw.apply("(project_status = 16 or project_status = 17 )");
|
|
|
+ }
|
|
|
+ lw.last(" order by project_status, plan_demand_sub_time");
|
|
|
+ long count = demandService.count(lw);
|
|
|
+ return count;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -806,41 +818,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
|
|
|
|
@Override
|
|
|
public AjaxResult purchasingManagementTaskReleaseTotal() {
|
|
|
- List<PmDemand> pmDemands = new ArrayList<>();
|
|
|
- try {
|
|
|
- List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
|
|
|
- List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("purchasing_management")).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())
|
|
|
- .in(PmDemand::getProjectStatus, PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
|
|
|
- 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()
|
|
|
- );
|
|
|
- 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.in(PmDemand::getProjectStatus, PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
|
|
|
- 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());
|
|
|
- pmDemands = pmDemandMapper.selectList(queryWrapper);
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- return AjaxResult.success(pmDemands.size());
|
|
|
+ long ii = selectPmDemandCount(2);
|
|
|
+ return AjaxResult.success(ii);
|
|
|
}
|
|
|
|
|
|
@Override
|