ariesy 统计查询导出 v2

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

@@ -114,6 +114,7 @@ public class JkszhcxExportThread extends BaseThread {
                 // 应该保存的参数
                 JSONObject prams = JSONObject.parseObject(condition);
                 String gfsh = prams.getString("gfsh");
+                String companyCode = prams.getString("companyCode");
                 String customsCode = prams.getString("customsCode");
                 String fillInStartDate = prams.getString("fillInStartDate");
                 String fillInEndDate = prams.getString("fillInEndDate");
@@ -141,13 +142,8 @@ public class JkszhcxExportThread extends BaseThread {
                 pramsMap.put("dbName", dbName);
                 pramsMap.put("business", businesses);
 
-                List<String> gfshList = new ArrayList<>();
-                if (!StringHelper.isBlank(gfsh)) {
-                    gfshList = StringHelper.stringToList(gfsh);
-                    pramsMap.put("gfsh", gfshList);
-                } else {
-                    pramsMap.put("gfsh", gfshList);
-                }
+                pramsMap.put("gfsh", gfsh);
+                pramsMap.put("companyCode", companyCode);
                 if (!StringHelper.isBlank(customsCode)) {
                     pramsMap.put("customsCode", customsCode);
                 }

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

@@ -115,6 +115,7 @@ public class YcfpcxExportThread extends BaseThread {
                 // 应该保存的参数
                 JSONObject prams = JSONObject.parseObject(condition);
                 String gfsh = prams.getString("gfsh");
+                String companyCode = prams.getString("companyCode");
                 String kpksrq = prams.getString("kpksrq");
                 String kpjsrq = prams.getString("kpjsrq");
                 String qszt = prams.getString("qszt");
@@ -157,6 +158,7 @@ public class YcfpcxExportThread extends BaseThread {
                 } else {
                     pramsMap.put("gfsh", gfshList);
                 }
+                pramsMap.put("companyCode", companyCode);
                 pramsMap.put("businessCode", "99");
                 if (!StringHelper.isBlank(qszt)) {
                     if (!"99".equals(qszt)) {

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

@@ -55,6 +55,9 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null'">
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+        </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>

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

@@ -36,10 +36,10 @@
         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.dept_name
         from t_dx_customs_record t
-        where export_mark = '0' and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        where export_mark = '0' and t.gf_tax_no = #{gfsh}
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null'">
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+        </if>
         <if test="customsCode != null and customsCode != '' and customsCode != 'null'">
             and t.customs_code = #{customsCode}
         </if>

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

@@ -67,7 +67,7 @@
         t.invoice_type , t.dept_name deptName,t.glzt
         glzt,t.uuid,t.bdk_status,t.scan_id,t.in_account_status,t.settle_source,
         t.settlement_no,t.inaccount_status,t.bzdh,
-        t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period
+        t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.comp_code,t.bzdh
         from t_dx_record_invoice t
         WHERE t.company = #{company}
         and t.invoice_date between #{kpksrq} and #{kpjsrq}