|
|
@@ -21,6 +21,7 @@ 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.SysUser;
|
|
|
+import com.ozs.common.core.domain.model.LoginUser;
|
|
|
import com.ozs.common.enums.BidWinningStatus;
|
|
|
import com.ozs.common.enums.ExpertType;
|
|
|
import com.ozs.common.enums.IsExcess;
|
|
|
@@ -1851,7 +1852,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
@Override
|
|
|
public AjaxResult procurementOfficeWillManipulateTotal() {
|
|
|
List<HomeToDoQueryResVo> homeRes = new ArrayList<>();
|
|
|
- // 待选取代理, 待上传招标文件, 待发布公告, 待开标, 待发布中标公告, 中标公示中
|
|
|
+ // 采购需求对接,专家意见反馈,采购文件编制审核,采购公告发布,标前质疑投诉,待开标,评标结果公告,流废标处置,标后质疑
|
|
|
List<PmDemandResVo> demandRes = new ArrayList<>();
|
|
|
demandRes.addAll(getListByStatus(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode()));
|
|
|
demandRes.addAll(getListByStatus(PmProjectStatus.EXPERT_FEEDBACK.getCode()));
|
|
|
@@ -3768,10 +3769,30 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
|
|
|
//查询不同状态下的项目数据
|
|
|
public List<PmDemandResVo> getListByStatus(String projectStatus) {
|
|
|
+ LoginUser user = SecurityUtils.getLoginUser();
|
|
|
LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
|
|
|
lw.eq(PmDemand::getProjectStatus, projectStatus);
|
|
|
-
|
|
|
+ // 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 (!user.getUserId().toString().equals("1")) {
|
|
|
+ if (Arrays.asList(1, 2, 3).contains(0)) {
|
|
|
+ if (!ObjectUtils.isEmpty(list) && !SecurityUtils.getUserId().equals(Integer.parseInt("1"))) {
|
|
|
+ lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ lw.eq(PmDemand::getProjectStatus, projectStatus);
|
|
|
+ lw.last(" order by project_status, plan_demand_sub_time");
|
|
|
List<PmDemand> demandList = this.baseMapper.selectList(lw);
|
|
|
+
|
|
|
//数据转换
|
|
|
List<PmDemandResVo> pmDemandResponseVoList = new ArrayList<>();
|
|
|
if (!ObjectUtils.isEmpty(demandList) && demandList.size() > 0) {
|
buzhanyi