项目管理

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

@@ -45,8 +45,6 @@ import java.util.List;
 public class PmProjectConstructionController extends BaseController {
     @Autowired
     private IPmDemandService pmDemandService;
-    @Autowired
-    private PmProjectConstructionService pmProjectConstructionService;
 
     /**
      * 项目建设查询列表

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

@@ -5,16 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.base.domain.BaseAgency;
 import com.ozs.base.domain.BaseExpert;
+import com.ozs.base.domain.vo.BaseExpertVo;
 import com.ozs.base.service.BaseAgencyService;
 import com.ozs.base.service.BaseExpertService;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.enums.BusinessType;
-import com.ozs.common.enums.NameListType;
-import com.ozs.common.enums.PmProjectStatus;
-import com.ozs.common.enums.SysFileRefEnum;
+import com.ozs.common.enums.*;
 import com.ozs.common.utils.RandomUtil;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.pm.doman.PmBidOpening;
@@ -31,6 +29,7 @@ import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -509,17 +508,22 @@ public class PmPurchaseExecutionController extends BaseController {
         pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRef::getDemandId,demandId);
         pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRef::getAccessTime,accessTime);
         List<PmDemandExpertRef> pmDemandExpertRefList = pmDemandExpertRefService.list(pmDemandExpertRefLambdaQueryWrapper);
-        List<BaseExpert> list = new ArrayList<>();
+        List<BaseExpertVo> baseExpertVoList = new ArrayList<>();
         if(!ObjectUtils.isEmpty(pmDemandExpertRefList)) {
             for(PmDemandExpertRef pmDemandExpertRef : pmDemandExpertRefList) {
                 BaseExpert baseExpert = baseExpertService.getById(pmDemandExpertRef.getExpertId());
                 if(baseExpert != null){
-                    list.add(baseExpert);
+                    BaseExpertVo baseExpertVo = new BaseExpertVo();
+                    BeanUtils.copyProperties(baseExpert,baseExpertVo);
+                    baseExpertVo.setMajorTypeName(MajorType.getCodeToInfo(baseExpertVo.getMajorType()));
+                    baseExpertVo.setExpertTypeName(ExpertType.getCodeToInfo(baseExpertVo.getExpertType()));
+                    baseExpertVo.setVarietyPurchaseName(PurchaseType.getCodeToInfo(baseExpertVo.getVarietyPurchase()));
+                    baseExpertVoList.add(baseExpertVo);
                 }
             }
         }
 
-        return success(list);
+        return success(baseExpertVoList);
     }
 
   /**

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

@@ -1,5 +1,7 @@
 package com.ozs.common.enums;
 
+import org.springframework.util.ObjectUtils;
+
 /**
  * 专家类型
  *
@@ -26,4 +28,32 @@ public enum ExpertType {
     public String getInfo() {
         return info;
     }
+
+    public static String getCodeToInfo(String code){
+        if (ObjectUtils.isEmpty(code)){
+            return null;
+        }
+
+        StringBuilder infos = new StringBuilder();
+        String[] codes = code.split(",");
+        if (codes.length > 0){
+            for(String item : codes){
+                if (TECHNICAL_EXPERT.getCode().equals(item)){
+                    infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
+                } else if (ECONOMIC_EXPERT.getCode().equals(item)){
+                    infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
+                } else if (LEGALAFFAIRS_EXPERT.getCode().equals(item)){
+                    infos.append(LEGALAFFAIRS_EXPERT.getInfo()).append(",");
+                } else if (SPARE_EXPERT.getCode().equals(item)){
+                    infos.append(SPARE_EXPERT.getInfo()).append(",");
+                }
+            }
+        }
+        String infoStr = infos.toString();
+        if(infoStr.endsWith(",")) {
+            infoStr = infoStr.substring(0,infos.length() - 1);
+        }
+        return infoStr;
+
+    }
 }

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

@@ -0,0 +1,59 @@
+package com.ozs.common.enums;
+
+import org.springframework.util.ObjectUtils;
+
+/**
+ * 专家类型
+ *
+ * @author buzhanyi
+ */
+public enum MajorType {
+    TECHNICAL_EXPERT("1", "机电设备安装工程"),
+    ECONOMIC_EXPERT("2", "城市供热工程"),
+    LEGALAFFAIRS_EXPERT("3", "电子通信"),
+    SPARE_EXPERT("4", "房主建筑");
+
+    private final String code;
+    private final String info;
+
+    MajorType(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public static String getCodeToInfo(String code){
+        if (ObjectUtils.isEmpty(code)){
+            return null;
+        }
+
+        StringBuilder infos = new StringBuilder();
+        String[] codes = code.split(",");
+        if (codes.length > 0){
+            for(String item : codes){
+                if (TECHNICAL_EXPERT.getCode().equals(item)){
+                    infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
+                } else if (ECONOMIC_EXPERT.getCode().equals(item)){
+                    infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
+                } else if (LEGALAFFAIRS_EXPERT.getCode().equals(item)){
+                    infos.append(LEGALAFFAIRS_EXPERT.getInfo()).append(",");
+                } else if (SPARE_EXPERT.getCode().equals(item)){
+                    infos.append(SPARE_EXPERT.getInfo()).append(",");
+                }
+            }
+        }
+        String infoStr = infos.toString();
+        if(infoStr.endsWith(",")) {
+            infoStr = infoStr.substring(0,infos.length() - 1);
+        }
+        return infoStr;
+
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.ozs.common.enums;
+
+import org.springframework.util.ObjectUtils;
+
+/**
+ * 专家类型
+ *
+ * @author buzhanyi
+ */
+public enum PurchaseType {
+    TECHNICAL_EXPERT("0", "装备类"),
+    ECONOMIC_EXPERT("1", "物资类"),
+    LEGALAFFAIRS_EXPERT("2", "服务类"),
+    SPARE_EXPERT("3", "工程类");
+
+    private final String code;
+    private final String info;
+
+    PurchaseType(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public static String getCodeToInfo(String code){
+        if (ObjectUtils.isEmpty(code)){
+            return null;
+        }
+
+        StringBuilder infos = new StringBuilder();
+        String[] codes = code.split(",");
+        if (codes.length > 0){
+            for(String item : codes){
+                if (TECHNICAL_EXPERT.getCode().equals(item)){
+                    infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
+                } else if (ECONOMIC_EXPERT.getCode().equals(item)){
+                    infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
+                } else if (LEGALAFFAIRS_EXPERT.getCode().equals(item)){
+                    infos.append(LEGALAFFAIRS_EXPERT.getInfo()).append(",");
+                } else if (SPARE_EXPERT.getCode().equals(item)){
+                    infos.append(SPARE_EXPERT.getInfo()).append(",");
+                }
+            }
+        }
+        String infoStr = infos.toString();
+        if(infoStr.endsWith(",")) {
+            infoStr = infoStr.substring(0,infos.length() - 1);
+        }
+        return infoStr;
+
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.ozs.common.enums;
+
+/**
+ * 系统角色权限字符串
+ *
+ * @author buzhanyi
+ */
+public enum SysRoleKey {
+    ADMIN("admin", "超级管理员"),
+    COMMON("common", "普通角色"),
+    DEMAND_UNIT("demand_unit", "需求单位管理员"),
+    PURCHASING_MANAGEMENT("purchasing_management", "采购管理部门管理员"),
+    PROCUREMENT_OFFICE("procurement_office", "采购办管理员");
+
+    private final String code;
+    private final String info;
+
+    SysRoleKey(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/base/domain/vo/BaseExpertVo.java

@@ -1,6 +1,6 @@
 package com.ozs.base.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.vo.PageVo;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,9 +33,15 @@ public class BaseExpertVo extends PageVo {
     /**
      * 专家类型
      */
-    @ApiModelProperty(value = "专家类型")
+    @ApiModelProperty(value = "专家类型，多个使用英文逗号分隔")
     private String expertType;
 
+    /**
+     * 专家类型名
+     */
+    @ApiModelProperty(value = "专家类型名，多个使用英文逗号分隔")
+    private String expertTypeName;
+
     /**
      * 专家性别
      */
@@ -58,9 +64,15 @@ public class BaseExpertVo extends PageVo {
     /**
      * 专业类型
      */
-    @ApiModelProperty(value = "专业类型")
+    @ApiModelProperty(value = "专业类型，多个使用英文逗号分隔")
     private String majorType;
 
+    /**
+     * 专业类型名
+     */
+    @ApiModelProperty(value = "专业类型名，多个使用英文逗号分隔")
+    private String majorTypeName;
+
     /**
      * 单位信息
      */
@@ -76,9 +88,15 @@ public class BaseExpertVo extends PageVo {
     /**
      * 采购品种
      */
-    @ApiModelProperty(value = "采购品种")
+    @ApiModelProperty(value = "采购品种，多个使用英文逗号分隔")
     private String varietyPurchase;
 
+    /**
+     * 采购品种名
+     */
+    @ApiModelProperty(value = "采购品种名，多个使用英文逗号分隔")
+    private String varietyPurchaseName;
+
     /**
      * 职称
      */