From 9607100a284ae522485b7d527c5cf0ddfce2faf0 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sat, 22 Apr 2023 15:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/bb/impl/ExtYcfpcxServiceImpl.java |  7 ++++-
 .../mapper/SignRecordInvoiceMapper.xml        | 28 ++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
index 085cd500..92a103e9 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.alibaba.fastjson.JSONArray;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
@@ -53,7 +54,11 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl<ExtBbycfpcxDao, ExtB
             String company = (String)pramsMap.get("company");
             String menuId = (String)pramsMap.get("menuId");
             json = tabulateRedisService.getTabulateMenu(company, menuId);
-
+            //修改列表宽度
+//            JSONArray titlewidth = (JSONArray) json.get("titlewidth");
+//            titlewidth.remove(2);
+//            titlewidth.add(2,"180");
+//            json.put("titlewidth",titlewidth);
             // 合计信息,仅第一页时需要统计，减少数据库压力
             if (curr == 1) {
                 String hjsl = "0";
diff --git a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
index 35822891..99ec4424 100644
--- a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
+++ b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
@@ -42,7 +42,7 @@
         <if test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
             and t.invoice_no = #{invoiceNo}
         </if>
-        <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
+        <if test="invoiceSource!=null and invoiceSource !='' and invoiceSource!='99'">
             and t.invoice_source = #{invoiceSource}
         </if>
         <if test="ids != null and ids.size()>0">
@@ -58,18 +58,38 @@
     </select>
 
 
+<!--    <select id="selectWqsfpByQsyx" parameterType="java.util.Map"-->
+<!--            resultMap="BaseResultMap" databaseId="mysql">-->
+<!--        select-->
+<!--        t.id,t.invoice_type,t.invoice_code,t.invoice_no,t.invoice_date,t.gf_name,t.xf_name,t.invoice_amount,t.tax_amount,t.dept_id,t.qs_status-->
+<!--        from t_dx_record_invoice t-->
+<!--        where t.company = #{company}-->
+<!--        <if test="ids != null and ids.size()>0">-->
+<!--            and t.id in-->
+<!--            <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">-->
+<!--                #{item}-->
+<!--            </foreach>-->
+<!--        </if>-->
+<!--        and t.qs_status = '0'-->
+<!--        and t.source_system='0'-->
+<!--    </select>-->
+
+
     <select id="selectWqsfpByQsyx" parameterType="java.util.Map"
             resultMap="BaseResultMap" databaseId="mysql">
         select
         t.id,t.invoice_type,t.invoice_code,t.invoice_no,t.invoice_date,t.gf_name,t.xf_name,t.invoice_amount,t.tax_amount,t.dept_id,t.qs_status
-        from t_dx_record_invoice t
-        where t.company = #{company}
+        from t_dx_record_invoice t left join t_dx_invoice r on t.uuid = r.uuid
+        where
         <if test="ids != null and ids.size()>0">
-            and t.id in
+            and r.id in
             <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
+        <if test="company !=null and company != ''">
+            t.company = #{company}
+        </if>
         and t.qs_status = '0'
         and t.source_system='0'
     </select>