From fa70870c9d4aac050e3bfc498ce311395900ffd2 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Wed, 17 Jul 2024 08:11:00 +0800
Subject: [PATCH] '1111'

---
 ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml      | 2 +-
 ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml    | 4 ++--
 .../src/views/priceVerification/priceVerification/hjInfo.vue  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml
index 003b2c1..dd828eb 100644
--- a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml
@@ -110,7 +110,7 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
-        order by a.bidCode desc
+        order by a.bid_code desc
     </select>
 
     <select id="selectBidByBidId" parameterType="String" resultMap="BidResult">
diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
index c180f02..f4ec429 100644
--- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
@@ -553,7 +553,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                 and datediff(d, a.quot_quotation_date, #{params.endTime}) <![CDATA[>=]]> 0
             </if>
-            and a.quot_approval_status = '2'
+            and (a.quot_approval_status = '2' or (a.quot_approval_status = '3' and a.quot_oa_approval_status = '3'))
         </where>
         order by a.quot_quotation_date desc
     </select>
@@ -573,7 +573,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             and quot_distinguish is not null
             and quot_distinguish in ('1','2')
-            and quot_approval_status = '2'
+            and (quot_approval_status = '2' or (quot_approval_status = '3' and quot_oa_approval_status = '3'))
         </where>
          group by quot_distinguish) a
     </select>
diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
index 3b5a695..efc24b7 100644
--- a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
+++ b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
@@ -548,11 +548,11 @@ export default {
 
     /** 提交报价按钮 */
     commitHj() {
-      var quotHjFileNum = this.quotHjFileList.length;
+      /*const quotHjFileNum = this.quotHjFileList.length;
       if(quotHjFileNum==0){
         this.$modal.msgError("核价附件必须上传");
         return;
-      }
+      }*/
       //报价单-核价协助状态 设置为 已协助
       commitHj(this.form).then(response => {
         this.open = false;