|
@@ -351,6 +351,111 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
return results;
|
|
return results;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 审核单位查询采购需求列表
|
|
|
|
+ *
|
|
|
|
+ * @param pmDemandReqVo
|
|
|
|
+ * @return 采购需求
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ public IPage<PmDemandResVo> selectPmDemanDexamineList(PmDemandReqVo pmDemandReqVo) {
|
|
|
|
+
|
|
|
|
+ LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<>();
|
|
|
|
+ if (!StringUtils.isBlank(pmDemandReqVo.getProjectName())) {
|
|
|
|
+ lw.like(PmDemand::getProjectName, "%" + pmDemandReqVo.getProjectName() + "%");
|
|
|
|
+ }
|
|
|
|
+ if (!StringUtils.isBlank(pmDemandReqVo.getPurchaseServices())) {
|
|
|
|
+ lw.eq(PmDemand::getPurchaseServices, pmDemandReqVo.getPurchaseServices());
|
|
|
|
+ }
|
|
|
|
+ if (pmDemandReqVo.getProjectStatus() != null) {
|
|
|
|
+ lw.eq(PmDemand::getProjectStatus, pmDemandReqVo.getProjectStatus());
|
|
|
|
+ }
|
|
|
|
+ if (pmDemandReqVo.getIsExcess() != null) {
|
|
|
|
+ lw.eq(PmDemand::getIsExcess, pmDemandReqVo.getIsExcess());
|
|
|
|
+ }
|
|
|
|
+ if (!StringUtils.isBlank(pmDemandReqVo.getBeginDate())) {
|
|
|
|
+ lw.apply("(plan_demand_sub_time >= '" + pmDemandReqVo.getBeginDate() +"' or plan_purchase_finish_time >= '" + pmDemandReqVo.getBeginDate() + "' or plan_deliver_time >= '" + pmDemandReqVo.getBeginDate() +"' )");
|
|
|
|
+ }
|
|
|
|
+ if (!StringUtils.isBlank(pmDemandReqVo.getEndDate())) {
|
|
|
|
+ lw.apply("(plan_demand_sub_time <= '" + pmDemandReqVo.getEndDate() +"' or plan_purchase_finish_time <= '" + pmDemandReqVo.getEndDate() + "' or plan_deliver_time <= '" + pmDemandReqVo.getEndDate() +"' )");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ lw.eq(PmDemand::getProjectStatus, PmProjectStatus.DEMAND_WAIT_AUDIT.getCode());
|
|
|
|
+
|
|
|
|
+ IPage<PmDemand> pageRes = this.page(new Page<>(pmDemandReqVo.getPageNum(), pmDemandReqVo.getPageSize()), lw);
|
|
|
|
+ IPage<PmDemandResVo> results = new Page<>(pageRes.getCurrent(), pageRes.getSize(), pageRes.getTotal());
|
|
|
|
+ if(pageRes.getRecords() != null && pageRes.getRecords().size() > 0){
|
|
|
|
+ List<PmDemandResVo> pmDemandResponseVoList = new ArrayList<>();
|
|
|
|
+ for(PmDemand pmDemand1 : pageRes.getRecords()){
|
|
|
|
+ PmDemandResVo vo = new PmDemandResVo();
|
|
|
|
+ BeanUtils.copyProperties(pmDemand1,vo);
|
|
|
|
+ if(vo.getPurchaseDeptId() != null){
|
|
|
|
+ Map<String, Object> deptMap = deptService.selectDeptById(vo.getPurchaseDeptId());
|
|
|
|
+ if(deptMap!= null){
|
|
|
|
+ SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo)deptMap.get("sysDept");
|
|
|
|
+ if(sysDeptResponseVo != null){
|
|
|
|
+ vo.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ String purchaseServicesName = dictDataService.selectDictLabel("purchase_services",vo.getPurchaseServices());
|
|
|
|
+ if(StringUtils.isNotEmpty(purchaseServicesName)){
|
|
|
|
+ vo.setPurchaseServicesName(purchaseServicesName);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //项目类型
|
|
|
|
+ for (ProjectTypes value : ProjectTypes.values()) {
|
|
|
|
+ if (vo.getProjectType() != null && vo.getProjectType().equals(value.getCode())) {
|
|
|
|
+ vo.setProjectTypeName(value.getInfo());
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ //是否为超限额计划
|
|
|
|
+ for (IsExcess value : IsExcess.values()) {
|
|
|
|
+ if (vo.getIsExcess() != null && vo.getIsExcess().equals(value.getCode())) {
|
|
|
|
+ vo.setIsExcessName(value.getInfo());
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //采购方式
|
|
|
|
+ for (PlanPurchaseMode value : PlanPurchaseMode.values()) {
|
|
|
|
+ if (vo.getPurchaseMode() != null && vo.getPurchaseMode().equals(value.getCode())) {
|
|
|
|
+ vo.setPurchaseModeName(value.getInfo());
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ //项目属性
|
|
|
|
+ for (ProjectAttribute value : ProjectAttribute.values()) {
|
|
|
|
+ if (vo.getProjectAttr() != null && vo.getProjectAttr().equals(value.getCode())) {
|
|
|
|
+ vo.setProjectAttrName(value.getInfo());
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ //预警状态
|
|
|
|
+ for (WarnStatus value : WarnStatus.values()) {
|
|
|
|
+ if (vo.getWarnStatus() != null && vo.getWarnStatus().equals(value.getCode())) {
|
|
|
|
+ vo.setWarnStatusName(value.getInfo());
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //项目状态
|
|
|
|
+ for (PmProjectStatus value : PmProjectStatus.values()) {
|
|
|
|
+ if (vo.getProjectStatus() != null && vo.getProjectStatus().equals(value.getCode())) {
|
|
|
|
+ vo.setProjectStatusName(value.getInfo());
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ pmDemandResponseVoList.add(vo);
|
|
|
|
+ }
|
|
|
|
+ results.setRecords(pmDemandResponseVoList);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return results;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 新增采购需求
|
|
* 新增采购需求
|
|
*
|
|
*
|