月度对表-列表查询-采购服务站转换

purchase-admin/src/main/java/com/ozs/web/controller/plan/MonthlyReconciliationController.java

@@ -8,6 +8,7 @@ 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.core.domain.entity.SysDictData;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.plan.doman.MonthlyReconciliation;
@@ -17,6 +18,7 @@ import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.service.ISysDeptService;
+import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.SysFileRefService;
 import com.ozs.system.service.SysFileService;
 import io.swagger.annotations.Api;
@@ -47,6 +49,8 @@ public class MonthlyReconciliationController extends BaseController {
     private SysFileService sysFileService;
     @Autowired
     private ISysDeptService iSysDeptService;
+    @Autowired
+    private ISysDictTypeService dictTypeService;
 
     @ApiOperation(value = "分页查询月度对表")
     @PostMapping("/page")
@@ -73,11 +77,21 @@ public class MonthlyReconciliationController extends BaseController {
         IPage<MonthlyReconciliation> page = monthlyReconciliationService.page(new Page<>(vo.getPageNum(), vo.getPageSize()), lw);
         if (!ObjectUtils.isEmpty(page.getRecords())) {
             page.setRecords(page.getRecords().stream().map(dto -> {
+                // 采购单位名称
                 Map<String, Object> stringObjectMap = iSysDeptService.selectDeptById(dto.getPurchaseDeptId());
                 if (!ObjectUtils.isEmpty(stringObjectMap)) {
                     SysDeptResponseVo sysDept = (SysDeptResponseVo) stringObjectMap.get("sysDept");
                     dto.setPurchaseDeptName(sysDept.getDeptName());
                 }
+                // 采购服务站名称
+                List<SysDictData> data = dictTypeService.selectDictDataByType("purchase_services");
+                if (!ObjectUtils.isEmpty(data)) {
+                    List<SysDictData> collect = data.stream()
+                            .filter(d -> d.getDictValue().equals(dto.getPurchaseServices())).collect(Collectors.toList());
+                    if(!ObjectUtils.isEmpty(collect)){
+                        dto.setPurchaseServicesName(collect.get(0).getDictLabel());
+                    }
+                }
                 return dto;
             }).collect(Collectors.toList()));
         }

purchase-system/src/main/java/com/ozs/plan/doman/MonthlyReconciliation.java

@@ -71,9 +71,14 @@ public class MonthlyReconciliation extends BaseEntity
     private Integer isExcess;
 
     /** 采购服务站 */
-    @Excel(name = "采购服务站")
+    @Excel(name = "采购服务站编码")
     private String purchaseServices;
 
+    /** 采购服务站 */
+    @Excel(name = "采购服务站")
+    @TableField(exist = false)
+    private String purchaseServicesName;
+
     /** 采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价) */
     @Excel(name = "采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
     private String purchaseMode;