项目管理

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmDemandController.java

@@ -56,16 +56,6 @@ public class PmDemandController extends BaseController
         return success(pmDemandService.selectPmDemandByDemandId(demandId));
     }
 
-    /**
-     * 新增采购需求
-     */
-    @PreAuthorize("@ss.hasPermi('system:demand:add')")
-    @Log(title = "采购需求", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PmDemand pmDemand)
-    {
-        return toAjax(pmDemandService.insertPmDemand(pmDemand));
-    }
 
     /**
      * 修改采购需求

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -120,6 +120,14 @@ public class PmDemandServiceImpl implements IPmDemandService
                 if(list !=null && list.size() > 0){
                     PmDemandEquipResponseVo responseVo = new PmDemandEquipResponseVo();
                     BeanUtils.copyProperties(list.get(0),responseVo);
+                    //采购方式建议
+                    for (ProcurementMethodSuggest value : ProcurementMethodSuggest.values()) {
+                        if (responseVo.getProcurementMethodSuggest() != null && responseVo.getProcurementMethodSuggest().equals(value.getCode())) {
+                            responseVo.setProcurementMethodSuggestName(value.getInfo());
+                            break;
+                        }
+                    }
+
                     vo.setPmDemandEquipResponseVo(responseVo);
                 }
             } else if(ProjectTypes.MATERIALTYPE.getCode().equals(vo.getProjectType())){ //物资类
@@ -129,6 +137,13 @@ public class PmDemandServiceImpl implements IPmDemandService
                 if(list !=null && list.size() > 0){
                     PmDemandMaterialsResponseVo responseVo = new PmDemandMaterialsResponseVo();
                     BeanUtils.copyProperties(list.get(0),responseVo);
+                    //采购方式建议
+                    for (ProcurementMethodSuggest value : ProcurementMethodSuggest.values()) {
+                        if (responseVo.getProcurementMethodSuggest() != null && responseVo.getProcurementMethodSuggest().equals(value.getCode())) {
+                            responseVo.setProcurementMethodSuggestName(value.getInfo());
+                            break;
+                        }
+                    }
                     vo.setPmDemandMaterialsResponseVo(responseVo);
                 }
             } else if(ProjectTypes.SERVICESTYPE.getCode().equals(vo.getProjectType())){//服务类
@@ -138,6 +153,13 @@ public class PmDemandServiceImpl implements IPmDemandService
                 if(list !=null && list.size() > 0){
                     PmDemandServeResponseVo responseVo = new PmDemandServeResponseVo();
                     BeanUtils.copyProperties(list.get(0),responseVo);
+                    //采购方式建议
+                    for (ProcurementMethodSuggest value : ProcurementMethodSuggest.values()) {
+                        if (responseVo.getProcurementMethodSuggest() != null && responseVo.getProcurementMethodSuggest().equals(value.getCode())) {
+                            responseVo.setProcurementMethodSuggestName(value.getInfo());
+                            break;
+                        }
+                    }
                     vo.setPmDemandServeResponseVo(responseVo);
                 }
             } else if(ProjectTypes.PLANTOEXAMINETYPE.getCode().equals(vo.getProjectType())){//工程类
@@ -147,6 +169,35 @@ public class PmDemandServiceImpl implements IPmDemandService
                 if(list !=null && list.size() > 0){
                     PmDemandEngineeringResponseVo responseVo = new PmDemandEngineeringResponseVo();
                     BeanUtils.copyProperties(list.get(0),responseVo);
+                    //采购方式建议
+                    for (ProcurementMethodSuggest value : ProcurementMethodSuggest.values()) {
+                        if (responseVo.getProcurementMethodSuggest() != null && responseVo.getProcurementMethodSuggest().equals(value.getCode())) {
+                            responseVo.setProcurementMethodSuggestName(value.getInfo());
+                            break;
+                        }
+                    }
+                    //项目类别
+                    for (EngineeringProjectCategory value : EngineeringProjectCategory.values()) {
+                        if (responseVo.getProjectCategory() != null && responseVo.getProjectCategory().equals(value.getCode())) {
+                            responseVo.setProjectCategoryName(value.getInfo());
+                            break;
+                        }
+                    }
+                    //承包方式
+                    for (EngineeringContractingMode value : EngineeringContractingMode.values()) {
+                        if (responseVo.getContractingMode() != null && responseVo.getContractingMode().equals(value.getCode())) {
+                            responseVo.setContractingModeName(value.getInfo());
+                            break;
+                        }
+                    }
+                    //施工图是否完成
+                    for (ConstructionDrawing value : ConstructionDrawing.values()) {
+                        if (responseVo.getConstructionDrawing() != null && responseVo.getConstructionDrawing().equals(value.getCode())) {
+                            responseVo.setConstructionDrawingName(value.getInfo());
+                            break;
+                        }
+                    }
+
                     vo.setPmDemandEngineeringResponseVo(responseVo);
                 }
             }
@@ -180,6 +231,60 @@ public class PmDemandServiceImpl implements IPmDemandService
             for(PmDemand pmDemand1 : pmDemandList){
                 PmDemandResponseVo vo = new PmDemandResponseVo();
                 BeanUtils.copyBeanProp(pmDemand1,vo);
+                SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(vo.getPurchaseDeptId()).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);
             }
         }