From cf954a0a43706097db0b3419ddeee3469c7bc5d3 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Thu, 22 May 2025 10:15:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=BD=8D=E6=95=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/controller/PricePublishController.java      | 12 +++++++++++-
 .../java/mjkf/xinke/main/model/db/PricePublish.java  |  4 ++++
 .../mjkf/xinke/main/service/MaterialService.java     |  9 +++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java
index 079765b..3fded61 100644
--- a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java
+++ b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java
@@ -1,5 +1,6 @@
 package mjkf.xinke.main.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.jgy.xxs.core.http.exp.NcHttpException;
 import com.jgy.xxs.core.http.resp.HttpResponse;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +13,7 @@ import mjkf.xinke.main.constant.HttpErrorResponseEnum;
 import mjkf.xinke.main.constant.PricePublishStatus;
 import mjkf.xinke.main.model.db.PricePublish;
 import mjkf.xinke.main.model.vo.PricePublishEditRequest;
+import mjkf.xinke.main.service.MaterialService;
 import mjkf.xinke.main.service.PricePublishService;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,6 +34,8 @@ public class PricePublishController {
 
     @Resource
     PricePublishService pricePublishService;
+    @Resource
+    MaterialService materialService;
 
     @ApiOperation("获取发布价格数据列表")
     @GetMapping("/")
@@ -52,9 +56,15 @@ public class PricePublishController {
             year = date.getYear();
             month = date.getMonthValue();
         }
-
         var query = pricePublishService.getQuery(year, month, materialId, name, spec, type);
+        var materialMap = materialService.mapCode();
         var result = pricePublishService.list(query);
+        for (var item: result) {
+           var meterial = materialMap.get(item.getMaterialId());
+           if (ObjectUtil.isNotEmpty(meterial)) {
+               item.setRoundBit(meterial.getRoundBit());
+           }
+        }
 
         return FuHttpResponse.Builder().dataResponse(result).build();
     }
diff --git a/src/main/java/mjkf/xinke/main/model/db/PricePublish.java b/src/main/java/mjkf/xinke/main/model/db/PricePublish.java
index 0f582ea..11e0417 100644
--- a/src/main/java/mjkf/xinke/main/model/db/PricePublish.java
+++ b/src/main/java/mjkf/xinke/main/model/db/PricePublish.java
@@ -196,6 +196,10 @@ public class PricePublish extends Model<PricePublish> {
     @TableField("DISPLAY_DIGIT")
     private Integer displayDigit;
 
+    @ApiModelProperty("计算小数位数")
+    @TableField(exist = false)
+    private Integer roundBit;
+
     @Override
     public Serializable pkVal() {
         return this.id;
diff --git a/src/main/java/mjkf/xinke/main/service/MaterialService.java b/src/main/java/mjkf/xinke/main/service/MaterialService.java
index 727e9a7..32aad2b 100644
--- a/src/main/java/mjkf/xinke/main/service/MaterialService.java
+++ b/src/main/java/mjkf/xinke/main/service/MaterialService.java
@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @Service
 public class MaterialService extends ServiceImpl<BaseMapper<Material>, Material> {
     @Deprecated
@@ -49,5 +52,11 @@ public class MaterialService extends ServiceImpl<BaseMapper<Material>, Material>
         query.eq(Material::getCode, code);
         return this.getOne(query, false);
     }
+
+    public Map<String, Material> mapCode() {
+        var list = this.list();
+        var result = list.stream().collect(Collectors.toMap(i->i.getCode(), i->i));
+        return result;
+    }
 }