项目管理

purchase-common/src/main/java/com/ozs/common/enums/ConstructionDrawing.java

@@ -0,0 +1,27 @@
+package com.ozs.common.enums;
+
+/**
+ * 是否为超限额计划
+ *
+ * @author buzhanyi
+ */
+public enum ConstructionDrawing {
+    NO_COMPLETE("0", "未完成"),
+    COMPLETE("1", "完成");
+
+    private final String code;
+    private final String info;
+
+    ConstructionDrawing(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/EngineeringContractingMode.java

@@ -0,0 +1,28 @@
+package com.ozs.common.enums;
+
+/**
+ * 工程类项目类别
+ *
+ * @author buzhanyi
+ */
+public enum EngineeringContractingMode {
+    EPC("1", "工程总承包"),
+    HCC("2", "施工总承包"),
+    PC("3", "专业承包");
+
+    private final String code;
+    private final String info;
+
+    EngineeringContractingMode(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/EngineeringProjectCategory.java

@@ -0,0 +1,31 @@
+package com.ozs.common.enums;
+
+/**
+ * 工程类项目类别
+ *
+ * @author buzhanyi
+ */
+public enum EngineeringProjectCategory {
+    RECONNAISSANCE("1", "勘察"),
+    DEVISE("2", "设计"),
+    CONSTRUCTION("3", "施工"),
+    SUPERVISION("4", "监理"),
+    CONSULT("5", "咨询"),
+    MATERIAL("6", "设备材料");
+
+    private final String code;
+    private final String info;
+
+    EngineeringProjectCategory(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/IsExcess.java

@@ -0,0 +1,27 @@
+package com.ozs.common.enums;
+
+/**
+ * 是否为超限额计划
+ *
+ * @author buzhanyi
+ */
+public enum IsExcess {
+    NO_EXCESS("0", "未超额"),
+    EXCESS("1", "超额");
+
+    private final String code;
+    private final String info;
+
+    IsExcess(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/PmProjectStatus.java

@@ -0,0 +1,35 @@
+package com.ozs.common.enums;
+
+/**
+ * 项目审核状态
+ *
+ * @author buzhanyi
+ */
+public enum PmProjectStatus {
+    DEMAND_WAIT_FILL("4", "需求待填制"),
+    DEMAND_WAIT_COMMIT("5", "需求待提交"),
+    TASK_WAIT_RELEASE("6", "任务待下达"),
+    TASK_RELEASED("7", "任务已下达"),
+    BID_INFO_WAIT_FILL("8", "中标信息待填制"),
+    BID_INFO_FILLED("9", "中标信息已填制"),
+    CONTRACT_WAIT_FILL("10", "合同待填制"),
+    CONTRACT_FILLED("11", "合同已填制"),
+    UNDER_CONSTRUCTION("12", "项目建设中"),
+    COMPLETION_CONSTRUCTION("13", "项目建设完成");
+
+    private final String code;
+    private final String info;
+
+    PmProjectStatus(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/ProcurementMethodSuggest.java

@@ -0,0 +1,30 @@
+package com.ozs.common.enums;
+
+/**
+ * 采购方式建议
+ *
+ * @author buzhanyi
+ */
+public enum ProcurementMethodSuggest {
+    OPEN_BIDDING("1", "公开招标"),
+    SELECTED_BIDDING("2", "邀请招标"),
+    COMPETITIVE_NEGOTIATION("3", "竞争性谈判"),
+    ENQUIRY("4", "询价"),
+    SINGLE_SOURCE ("5", "单一来源");
+
+    private final String code;
+    private final String info;
+
+    ProcurementMethodSuggest(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/WarnStatus.java

@@ -0,0 +1,27 @@
+package com.ozs.common.enums;
+
+/**
+ * 预警状态
+ *
+ * @author buzhanyi
+ */
+public enum WarnStatus {
+    NORMAL ("0", "正常"),
+    WARNING("1", "预警");
+
+    private final String code;
+    private final String info;
+
+    WarnStatus(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

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

@@ -10,6 +10,9 @@ import com.ozs.pm.doman.vo.requestVo.PmRequestVo;
 import com.ozs.pm.doman.vo.responseVo.*;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.*;
+import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
+import com.ozs.system.service.ISysDeptService;
+import com.ozs.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +36,11 @@ public class PmDemandServiceImpl implements IPmDemandService
     private IPmDemandEquipService iPmDemandEquipService;
     @Autowired
     private IPmDemandEngineeringService iPmDemandEngineeringService;
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
 
     /**
      * 查询采购需求
@@ -48,6 +56,20 @@ public class PmDemandServiceImpl implements IPmDemandService
             PmDemandResponseVo vo = new PmDemandResponseVo();
             BeanUtils.copyProperties(pmDemand, vo);
 
+            SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(vo.getPurchaseDeptId()).get("sysDept");
+            if(sysDeptResponseVo != null){
+                vo.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
+            }
+
+            //项目类型
+            for (ProjectTypes value : ProjectTypes.values()) {
+                if (vo.getProjectType() != null && vo.getProjectType().equals(value.getCode())) {
+                    vo.setProjectTypeName(value.getInfo());
+                    break;
+                }
+            }
+
+
             if(ProjectTypes.EQUIPMENTTYPE.getCode().equals(vo.getProjectType())){//装备类
                 PmDemandEquip obj = new PmDemandEquip();
                 obj.setDemandId(demandId);