From 4abfd0466dff7d355980ef34e651c9ffd9eb688c Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 10 May 2023 10:25:56 +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

---
 .../controller/ExtTicketController.java       |  1 +
 .../com/dxhy/extend/entity/JkszhcxRespVO.java |  1 +
 .../companypool/TicketServiceImpl.java        |  4 +--
 .../service/customs/CustomsServiceImpl.java   |  5 ++--
 .../main/resources/mapper/CustomsMapper.xml   |  3 +-
 .../main/resources/mapper/TicketMapper.xml    | 28 +++++++++++++------
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java
index 8fa2d27e..f79b1142 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java
@@ -60,6 +60,7 @@ public class ExtTicketController extends AbstractController {
                 return ResponseEntity.ok(R.ok().put("data", ""));
             }
         }
+        paramsMap.put("gfsh",gfshList);
         if (paramsMap.get("invoiceType") != null && !"".equals(paramsMap.get("invoiceType"))
             && !"99".equals(paramsMap.get("invoiceType"))) {
             String[] invoiceTypeArr = paramsMap.get("invoiceType").toString().split(",");
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java
index 3323651f..08c888c9 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java
@@ -195,4 +195,5 @@ public class JkszhcxRespVO {
     private String entryUser;
     private String filePath;
     private String businessName;
+    private String compCode;
 }
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
index dd25bcf2..6626fe6b 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
@@ -45,12 +45,12 @@ public class TicketServiceImpl extends MpBaseServiceImpl<ExtTicketDao, ExtTicket
         try {
             String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "销方名称", "乘坐人", "证件号", "班次/车次", "金额",
                 "签收状态", "签收日期", "签收方式", "签收人", "抵扣状态", "业务单号", "入池时间","凭证号", "过账时间", "影像号",
-                    "账期","报账单号","入账状态"};
+                    "账期","报账单号","入账状态","所属组织"};
 
             String[] titleprop = {"xh", "invoiceTypeString", "invoiceCode", "invoiceNo", "invoiceDate", "xfName",
                 "passenger", "passengerSfzh", "trainNumber", "invoiceAmount", "qsStatus",
                 "qsDate", "qsType", "qsName", "isDeduction", "businessDocumentNumber", "createDate","snVoucherNumber",
-                    "postingTime","imageId","accountPeriod","bzdh","inAccountStatus"};
+                    "postingTime","imageId","accountPeriod","bzdh","inAccountStatus","compCode"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java
index 137e53d9..9c1882b4 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java
@@ -44,11 +44,12 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, CustomsRec
         // 表头
         String[] titlelist = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对",
             "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-            "入账月份", "入账状态", "凭证号", "业务单元", "入池时间", "过账时间", "影像号", "账期"};
+            "入账月份", "入账状态", "凭证号", "业务单元", "入池时间", "过账时间", "影像号", "账期","所属组织"};
         String[] titleprop = {"xh", "customsCode", "glzt", "fillInDate", "gfName", "gfTaxNo", "taxAmount",
             "yxTaxAmount", "auditStatus", "applyCheck", "checkStatus", "rzhYesorno", "bdkStatus", "rzhDate", "rzhType",
             "confirmUser", "cjzt", "createDate", "dataSources", "qsType", "qsStatus", "qsDate", "qsUser",
-            "inAccountDate", "inAccountStatus", "voucherNumber", "businessName", "createDate", "postingTime","imageId","accountPeriod"};
+            "inAccountDate", "inAccountStatus", "voucherNumber", "businessName", "createDate", "postingTime","imageId",
+                "accountPeriod","compCode"};
         // 需要设置返回列表标题时调用
         JSONObject json = super.setTitleList(titlelist, titleprop);
         try {
diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
index d350495b..df5aad7f 100644
--- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
@@ -5,6 +5,7 @@
     <resultMap id="BaseResultMap"
                type="com.dxhy.extend.entity.JkszhcxRespVO">
         <result column="customs_code" property="customsCode"/>
+        <result column="comp_code" property="compCode"/>
         <result column="fill_in_date" property="fillInDate"/>
         <result column="gf_tax_no" property="gfTaxNo"/>
         <result column="gf_name" property="gfName"/>
@@ -49,7 +50,7 @@
         DATE_FORMAT(t.qs_date,'%Y-%m-%d') qs_date,t.qs_type,t.qs_user,DATE_FORMAT(t.rzh_date,'%Y-%m-%d')
         rzh_date, t.rzh_yesorno,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt,
         t.customs_scan_id,t.dept_name businessName,t.in_account_status,t.voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date,
-        data_sources,t.image_id,t.posting_time,t.account_period
+        data_sources,t.image_id,t.posting_time,t.account_period,t.comp_code
         from t_dx_customs_record t
         where export_mark = '0'
 <!--        and t.gf_tax_no in-->
diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml
index 6323d1c1..0c6878e1 100644
--- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml
@@ -26,10 +26,10 @@
             and CONCAT(IFNULL(t.passenger,''),IFNULL(t.passenger_s_f_z_h,'')) like
             CONCAT('%',#{keyWord},'%')
         </if>
-        and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+<!--        and t.gf_tax_no in-->
+<!--        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">-->
+<!--            #{item}-->
+<!--        </foreach>-->
         <if test="list != null and list != '' and list != 'null' ">
             and t.invoice_type in
             <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
@@ -72,6 +72,12 @@
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
+            and (t.comp_code is null or t.comp_code = '')
+        </if>
     </select>
 
 
@@ -90,10 +96,10 @@
             and CONCAT(IFNULL(t.passenger,''),IFNULL(t.passenger_s_f_z_h,'')) like
             CONCAT('%',#{keyWord},'%')
         </if>
-        and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+<!--        and t.gf_tax_no in-->
+<!--        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">-->
+<!--            #{item}-->
+<!--        </foreach>-->
         <if test="list != null and list != '' and list != 'null' ">
             and t.invoice_type in
             <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
@@ -136,5 +142,11 @@
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
+            and (t.comp_code is null or t.comp_code = '')
+        </if>
     </select>
 </mapper>