ariesy 票池菜单界面导出条件修改

dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java

@@ -231,18 +231,7 @@ public class ExcelController extends AbstractController {
                     String newCondition = prams.toString();
                     pramsMap.put("conditions", newCondition);
                 } else {
-                    String gfmc = "";
-                    List<Tax> org = getUserInfo().getOrg();
-                    if (org != null && org.size() > 0) {
-                        for (Tax tax : org) {
-                            if (tax.getTaxno().equals(gfsh)) {
-                                gfmc = tax.getTaxname();
-                            }
-                        }
-                    }
-                    prams.put("gfmc", gfmc);
-                    String newCondition = prams.toString();
-                    pramsMap.put("conditions", newCondition);
+                    prams.put("gfsh", gfsh);
                 }
             } else {
                 pramsMap.put("conditions", condition);

dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java

@@ -176,15 +176,8 @@ public class CustomExportThread extends BaseThread {
                 pramsMap.put("imageNumber",imageNumber);
                 pramsMap.put("postingTimeEnd",postingTimeEnd);
                 pramsMap.put("postingTimeStart",postingTimeStart);
+                pramsMap.put("gfsh", gfsh);
 
-
-                List<String> gfshList = new ArrayList<>();
-                if (!StringHelper.isBlank(gfsh)) {
-                    gfshList = StringHelper.stringToList(gfsh);
-                    pramsMap.put("gfsh", gfshList);
-                } else {
-                    pramsMap.put("gfsh", gfshList);
-                }
                 if (!StringHelper.isBlank(customsCode)) {
                     pramsMap.put("customsCode", customsCode);
                 }

dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java

@@ -124,6 +124,7 @@ public class QypcsmkpExportThread extends BaseThread {
                 prams.put("companyCodes",companyCodes);
                 String gfTaxNo = prams.getString("gfTaxNo");
                 String gfsh = prams.getString("gfsh");
+                prams.put("gfsh", gfsh);
                 List<String> gfshList = new ArrayList<>();
                 if (!StringHelper.isBlank(gfsh)) {
                     gfshList = StringHelper.stringToList(gfsh);

dxhy-core/src/main/resources/mapper/CustomsMapper.xml

@@ -50,10 +50,7 @@
         data_sources
         from t_dx_customs_record t
         where export_mark = '0'
-<!--        and t.gf_tax_no in-->
-<!--        <foreach close=")" collection="gfsh" index="index" item="item" open="(" separator=",">-->
-<!--            #{item}-->
-<!--        </foreach>-->
+        and t.gf_tax_no = #{gfsh}
         <if test="keyWord != null and keyWord != '' and keyWord != 'null'">
             and t.customs_code like CONCAT('%',#{keyWord},'%')
         </if>
@@ -149,7 +146,7 @@
             and t.account_period = #{accountPeriod}
         </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null)
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
         order by t.fill_in_date desc
     </select>

dxhy-core/src/main/resources/mapper/TicketMapper.xml

@@ -113,19 +113,8 @@
         <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 (t.comp_code in
-            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
-                #{companyCode}
-            </foreach>
-            or t.comp_code is null or t.comp_code = ''
-            )
-        </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 = '')
+            and (t.comp_code = #{companyCode} or t.comp_code is null or t.comp_code = '')
         </if>
     </select>
 

dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml

@@ -281,7 +281,6 @@
         t_dx_invoice_reimburse
         where invoice_type in
         ('91','94','95','00','97','98','101','102','103','99')
-        and gf_tax_no = #{gfsh}
         and (comp_code = #{companyCode} or comp_code = '' or comp_code is null)
         <if test="cjksyf != null and cjksyf!= '' and cjjsyf != null and cjjsyf != ''">
             AND create_date between #{cjksyf} and #{cjjsyf}
@@ -363,7 +362,6 @@
         t_dx_invoice_reimburse
         where invoice_type in
         ('91','94','95','00','97','98','101','102','103','99')
-        and gf_tax_no = #{gfsh}
         and (comp_code = #{companyCode} or comp_code = '' or comp_code is null)
         <if test="cjksyf != null and cjksyf!= '' and cjjsyf != null and cjjsyf != ''">
             AND create_date between #{cjksyf} and #{cjjsyf}

dxhy-extend/src/main/resources/mapper/TicketMapper.xml

@@ -12,9 +12,8 @@
             resultMap="InvoicePoolHjResultMap" databaseId="mysql">
         select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
         from t_dx_invoice_reimburse t
-        where t.gf_tax_no = #{gfsh}
+        where 1=1
         and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
-
         <if
                 test="kpksrq != null and kpksrq != '' and kpksrq != 'null' and kpjsrq != null and kpjsrq != '' and kpjsrq != 'null'">
             and t.invoice_date between #{kpksrq} and #{kpjsrq}
@@ -82,7 +81,7 @@
             resultType="com.dxhy.extend.entity.ExtTicketInvoiceModel" databaseId="mysql">
         select *
         from t_dx_invoice_reimburse t
-        where t.gf_tax_no = #{gfsh}
+        where 1=1
         and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         <if test="kpksrq != null and kpksrq != '' and kpksrq != 'null' and kpjsrq != null and kpjsrq != '' and kpjsrq != 'null'">
             and t.invoice_date between #{kpksrq} and #{kpjsrq}