返回字段转义：单位性质and采购类型

purchase-system/src/main/java/com/ozs/base/domain/BaseAgency.java

@@ -1,6 +1,7 @@
 package com.ozs.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.vo.BaseDto;
@@ -38,6 +39,11 @@ public class BaseAgency extends BaseDto {
     @ApiModelProperty("类型")
     @NotEmpty(message = "类型不能为空")
     private Integer companyType;
+    /**
+     * 采购类型转义
+     */
+    @TableField(exist = false)
+    private String companyTypeName;
     // 注册时间
     @ApiModelProperty("注册时间")
     @NotEmpty(message = "注册时间不能为空")
@@ -47,6 +53,8 @@ public class BaseAgency extends BaseDto {
     @ApiModelProperty("公司性质")
     @NotBlank(message = "公司性质不能为空")
     private String companyNature;
+    @TableField(exist = false)
+    private String companyNatureName;
     // 公司办公地址
     @ApiModelProperty("公司办公地址")
     @NotBlank(message = "公司办公地址不能为空")

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

@@ -17,6 +17,7 @@ import com.ozs.base.service.BaseAgencyService;
 import com.ozs.base.service.BaseExpertService;
 import com.ozs.base.service.BaseNoticeService;
 import com.ozs.base.service.BaseNoticeTypeService;
+import com.ozs.common.constant.Constants;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
@@ -382,6 +383,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
         //代理商信息
         BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
+        List<SysDictData> dictData = dictTypeService.selectDictDataByType(Constants.SYS_COMPANY_NATURE);
+        for (SysDictData data : dictData) {
+            if (data.getDictValue().equals(baseAgency.getCompanyType())) {
+                baseAgency.setCompanyTypeName(data.getDictLabel());
+                break;
+            }
+        }
+        List<SysDictData> dictDataT = dictTypeService.selectDictDataByType(Constants.SYS_PROJECT_TYPE);
+        for (SysDictData data : dictDataT) {
+            if (data.getDictValue().equals(baseAgency.getCompanyNature())) {
+                baseAgency.setCompanyNatureName(data.getDictLabel());
+                break;
+            }
+        }
         pmPurchaseExecutionResVo.setBaseAgency(baseAgency);
         vo.setPurchaseTaskDocumentNumber(pmDemand.getPurchaseTaskDocumentNumber());
         //专家意见反馈