From d718b52b861be2cfa1e82466f7a521372b5f826f Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 7 Sep 2022 15:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusSalesOrderMakeup.java                  | 20 +++++++++++++++++++
 .../BusSalesOrderMakeupMapper.xml             |  5 ++++-
 .../BusSalesOrderMakeupService.java           | 20 +++++++++++++++++--
 .../BusSalesOrderModelService.java            |  2 +-
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java
index d89dfb8669..bf76ce5b1b 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java
@@ -75,4 +75,24 @@ public class BusSalesOrderMakeup extends BaseEntity {
 	@ApiModelProperty("合同上传")
     private String contractPath;
 
+
+    @ApiModelProperty("上装名称key")
+    private String topNameKey;
+    @ApiModelProperty("板材材质key")
+    private String textureKey;
+    @ApiModelProperty("委改方式key")
+    private String commissionReformTypeKey;
+    @ApiModelProperty("颜色")
+    private String color;
+    @ApiModelProperty("颜色key")
+    private String colorKey;
+    @ApiModelProperty("篷布滑道")
+    private String tarpaulinSlide;
+    @ApiModelProperty("冷藏冷机")
+    private String refirgerator;
+    @ApiModelProperty("自卸液压盖板")
+    private String selfUnHyCoPl;
+    @ApiModelProperty("地板加热")
+    private String floorHeating;
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
index d3a39cdcdc..c8f05f1fb7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
@@ -44,7 +44,10 @@
                bm.tarpaulinSlide,
                bm.refirgerator,
                bm.selfUnHyCoPl,
-               bm.floorHeating
+               bm.floorHeating,
+               bm.topNameKey,
+               bm.commissionReformTypeKey,
+               bm.textureKey
         from bus_sales_order_makeup bm
                  left join bus_sales_order b on bm.salesOrderSid = b.sid
         where salesOrderSid = #{sid}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
index 6aa42e4888..f56780dfda 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
@@ -39,6 +39,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
@@ -46,6 +47,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -71,6 +73,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
     private BusSalesOrderModelService busSalesOrderModelService;
     @Autowired
     private BusSalesOrderPriceService busSalesOrderPriceService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public void saveMake(BusSalesOrderMakeupDto busSalesOrderMakeupDto, String sid) {
         BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
@@ -120,7 +124,13 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
             BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
             BeanUtil.copyProperties(dto, busSalesOrderMakeup, "sid");
             if (!dto.getContractImages().isEmpty()) {
-                busSalesOrderMakeup.setContractPath(Joiner.on(",").join(dto.getContractImages()));
+                List<String> imgList = new ArrayList<>();
+                dto.getContractImages().stream().forEach(i -> {
+                    if (i.contains(fileUploadComponent.getUrlPrefix())) {
+                        imgList.add(i.replace(fileUploadComponent.getUrlPrefix(), ""));
+                    }
+                });
+                busSalesOrderMakeup.setContractPath(Joiner.on(",").join(imgList));
             }
             save(busSalesOrderMakeup);
         }
@@ -192,7 +202,13 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
             if (StringUtils.isNotBlank(appBusSalesOrderMakeUpVo.getContractPath())) {
                 String path = appBusSalesOrderMakeUpVo.getContractPath();
                 List<String> contractImages = Arrays.asList(path.split(","));
-                appBusSalesOrderMakeUpVo.setContractImages(contractImages);
+                List<String> imgList = new ArrayList<>();
+                contractImages.stream().forEach(i -> {
+                    if (!i.contains(fileUploadComponent.getUrlPrefix())) {
+                        imgList.add(fileUploadComponent.getUrlPrefix()+i);
+                    }
+                });
+                appBusSalesOrderMakeUpVo.setContractImages(imgList);
             }
             if (StringUtils.isNotBlank(busSalesOrder.getIsTop())) {
                 if ("1".equals(busSalesOrder.getIsTop())) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
index dc8fbfbc67..cb92caa1fe 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
@@ -202,7 +202,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
         if ("2".equals(state)) {
             type = "3";
             if (StringUtils.isBlank(dto.getArrangeNumber()) || "0".equals(dto.getArrangeNumber())) {
-                return rb.setMsg("排产数量不能为空");
+                return rb.setMsg("采购数量不能为空");
             }
             num = Integer.parseInt(dto.getArrangeNumber());
         }