From 339c2b780d62a46b6293239478a693afa3e24a84 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 18 Sep 2024 10:37:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?20240918=20=E6=8A=A5=E4=BB=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AF=A2=E4=BB=B7=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/quote/entity/QuotationInformationEntity.java   | 4 ++++
 src/main/resources/mapper/quote/QuoteMapper.xml            | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java b/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java
index 2052cc9c..74d569be 100644
--- a/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java
+++ b/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java
@@ -127,6 +127,8 @@ public class QuotationInformationEntity extends QueryPage implements Serializabl
      * 创建时间
      **/
     @TableField(fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createDate;
     /**
      * 创建人
@@ -136,6 +138,8 @@ public class QuotationInformationEntity extends QueryPage implements Serializabl
      * 更新时间
      **/
     @TableField(fill = FieldFill.UPDATE,insertStrategy = FieldStrategy.NEVER)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updateDate;
     /**
      * 更新人
diff --git a/src/main/resources/mapper/quote/QuoteMapper.xml b/src/main/resources/mapper/quote/QuoteMapper.xml
index ec955920..439235d8 100644
--- a/src/main/resources/mapper/quote/QuoteMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteMapper.xml
@@ -46,6 +46,9 @@
             <if test="params.quoteNo != null and params.quoteNo != ''">
                 and q.quote_no = #{params.quoteNo}
             </if>
+            <if test="params.quoteVersionNo != null and params.quoteVersionNo != ''">
+                and q.quote_version_no = #{params.quoteVersionNo}
+            </if>
             <if test="params.buNo != null and params.buNo != ''">
                 and q.bu_no = #{params.buNo}
             </if>
@@ -68,10 +71,10 @@
                 and p.project_desc like #{params.projectDesc}
             </if>
             <if test="params.purchase != null and params.purchase != ''">
-                and q.purchase like #{params.purchase}
+                and dbo.plm_get_user_display(q.site,q.purchase) like #{params.purchase}
             </if>
             <if test="params.quoter != null and params.quoter != ''">
-                and q.quoter like #{params.quoter}
+                and dbo.plm_get_user_display(q.site,q.quoter) like #{params.quoter}
             </if>
             <if test="params.customerInquiryNo != null and params.customerInquiryNo != ''">
                 and q.customer_inquiry_no like #{params.customerInquiryNo}

From b8c579ab98cd712ff01c53553fd2c6e8befc176d Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 18 Sep 2024 10:47:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?20240918=20=E6=8A=A5=E4=BB=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AF=A2=E4=BB=B7=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/quote/service/impl/QuoteServiceImpl.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
index 319604bb..ae537ce3 100644
--- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
@@ -79,9 +79,17 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
         checkCustomerAndProject(quote);
         // 4、校验人员
         checkUser(quote);
+        // 5、校验货币
+        checkCurrency(quote);
         save(quote);
     }
 
+    private void checkCurrency(Quote quote) {
+//        if (StringUtils.isEmpty(quote.getCurrency())){
+//            throw new RuntimeException("币种不能为空");
+//        }
+    }
+
     private void checkUser(Quote quote){
         RoleUser quoter = new RoleUser();
         quoter.setBuId(quote.getBuId());
@@ -132,6 +140,8 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
         checkCustomerAndProject(quote);
         // 校验人员
         checkUser(quote);
+        // 校验货币
+        checkCurrency(quote);
         quote.setUpdateDate(new Date());
         updateById(quote);
     }