From 82d3516fee2feb839f66ae610808f6c0be47d98d Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Thu, 18 Apr 2024 17:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=AE=8C=E5=96=84=E9=99=84=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/as/api/asbusrepairbill/AitemVo.java |  4 ++--
 .../AsBusrepairBillService.java               | 23 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java
index 1150988699..e6e24c9f96 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java
@@ -14,9 +14,9 @@ import java.math.BigDecimal;
 public class AitemVo {
 
     @ApiModelProperty("附加项目sid")
-    private String attachItemSid;
+    private String aitemsid;
     @ApiModelProperty("附加项目名称")
-    private String attachItem;
+    private String aitemName;
     @ApiModelProperty("销售价")
     private String price;
 
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index a89627dc8d..df46fb2920 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -42,6 +42,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -248,7 +249,15 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 List<AitemVo> aitemVos = dto.getAitemVos();
                 for (AitemVo aitemVo : aitemVos) {
                     AsBusrepairBillAitem aitem = new AsBusrepairBillAitem();
-                    BeanUtil.copyProperties(aitemVo, aitem, "id", "sid");
+                    if (StringUtils.isNotBlank(aitemVo.getAitemsid())) {
+                        aitem.setAttachItemSid(aitemVo.getAitemsid());
+                    }
+                    if (StringUtils.isNotBlank(aitemVo.getAitemName())) {
+                        aitem.setAttachItem(aitemVo.getAitemName());
+                    }
+                    if (StringUtils.isNotBlank(aitemVo.getPrice())) {
+                        aitem.setPrice(new BigDecimal(aitemVo.getPrice()));
+                    }
                     aitem.setBillSid(sid);
                     asBusrepairBillAitemService.insert(aitem);
                 }
@@ -355,7 +364,15 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             if (!sitems.isEmpty()) {
                 for (AsBusrepairBillAitem aitem : aitems) {
                     AitemVo aitemVo = new AitemVo();
-                    BeanUtil.copyProperties(aitem, aitemVo);
+                    if (StringUtils.isNotBlank(aitem.getAttachItemSid())) {
+                        aitemVo.setAitemsid(aitem.getAttachItemSid());
+                    }
+                    if (StringUtils.isNotBlank(aitem.getAttachItem())) {
+                        aitemVo.setAitemName(aitem.getAttachItem());
+                    }
+                    if (null != aitem.getPrice()) {
+                        aitemVo.setPrice(aitem.getPrice().toString());
+                    }
                     aitemVos.add(aitemVo);
                 }
                 vo.setAitemVos(aitemVos);
@@ -416,7 +433,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         if (StringUtils.isNotBlank(dto.getSid())) {
             AsBusrepairBill asBusrepairBill = fetchBySid(dto.getSid());
             if (asBusrepairBill.getNodeCode() > 4) {
-                    return rb.setMsg("当前已完成竣工环节，无需提交");
+                return rb.setMsg("当前已完成竣工环节，无需提交");
             }
         }
         ResultBean<String> resultBean = saveBill(dto);