From 67c4ad23295ff2d934e8353d763b87df54d4bb63 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 29 Aug 2023 17:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/export/impl/YcfpbbcxServiceImpl.java  |  7 +++----
 .../dxhy/core/thread/YcfpbbcxExportThread.java    | 15 +++++++++------
 .../main/resources/mapper/BbycfpbbcxMapper.xml    |  6 ++----
 .../extend/controller/ExtFpzhcxController.java    |  3 +++
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpbbcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpbbcxServiceImpl.java
index 47764bb0..dfd15f23 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpbbcxServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/YcfpbbcxServiceImpl.java
@@ -6,14 +6,13 @@ import java.util.Map;
 
 import com.dxhy.common.constant.DictConstant;
 import com.dxhy.common.service.DictdetaServcice;
-import com.dxhy.common.vo.DictdetaModel;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.dxhy.common.constant.DbConstant;
 import com.dxhy.common.datasource.config.DynamicContextHolder;
-import com.dxhy.common.enums.FpztEnum;
 import com.dxhy.common.service.impl.MpBaseServiceImpl;
 import com.dxhy.common.util.MathUtil;
 import com.dxhy.core.dao.BbycfpbbcxDao;
@@ -49,10 +48,10 @@ public class YcfpbbcxServiceImpl extends MpBaseServiceImpl<BbycfpbbcxDao, Bbycfp
         JSONObject json = new JSONObject();
         try {
 
-            List<String> gfshList = (List<String>)pramsMap.get("gfsh");
+            String gfsht = (String) pramsMap.get("gfsh");
             pramsMap.put("dxhyAdmin", dxhyAdmin);
             pramsMap.put("dxhyTertiary", dxhyTertiary);
-            if (gfshList.size() == 0) {
+            if (StringUtils.isBlank(gfsht)){
                 // 未从getUserInfo()获取到购方税号信息
                 json.put("hjsl", "0");
                 json.put("hjje", "0");
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/YcfpbbcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/YcfpbbcxExportThread.java
index 7e51d8b4..ae171b37 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/YcfpbbcxExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/YcfpbbcxExportThread.java
@@ -109,6 +109,7 @@ public class YcfpbbcxExportThread 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 yczt = prams.getString("yczt");
@@ -119,18 +120,20 @@ public class YcfpbbcxExportThread extends BaseThread {
                 Map<String, Object> pramsMap = new HashMap<>(16);
                 pramsMap.put("dbName", dbName);
                 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(gfsh)) {
+//                    gfshList = StringHelper.stringToList(gfsh);
+//                    pramsMap.put("gfsh", gfshList);
+//                } else {
+//                    pramsMap.put("gfsh", gfshList);
+//                }
                 if (!StringHelper.isBlank(yczt)) {
                     if (!"99".equals(yczt)) {
                         pramsMap.put("yczt", yczt);
                     }
                 }
 
+                pramsMap.put("companyCode",companyCode);
+                pramsMap.put("gfsh",gfsh);
                 pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(kpksrq)));
                 pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(kpjsrq)));
                 pramsMap.put("company", company);
diff --git a/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml b/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml
index 51e949b1..d7e5954b 100644
--- a/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml
@@ -29,10 +29,8 @@
         where t.invoice_status != '0'
         and t.invoice_type in ('01','03','08','14')
         and DATE_FORMAT(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq}
-        and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        and t.gf_tax_no = #{gfsh}
+        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         <choose>
             <when test="yczt != null and yczt != '' and yczt != 'null' and yczt != '99'">
                 and t.invoice_status = #{yczt}
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
index aa8ba18f..f35edc17 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
@@ -369,6 +369,9 @@ public class ExtFpzhcxController extends AbstractController {
     @SysLog("异常发票报表查询")
     public Object listYcBbFpxx(@RequestBody Map<String, Object> pramsMap) {
 
+        if (StringUtils.isBlank((String) pramsMap.get("gfsh"))){
+            return ResponseEntity.ok(R.error("购方税号不能为空"));
+        }
         Map<String, Object> data = new HashMap<>(16);
         data.put("dbName", getUserInfo().getDbName());