diff --git a/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java b/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java index fa2b4cce..fb72d47b 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java +++ b/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java @@ -125,6 +125,15 @@ public interface BaseTDxRecordInvoiceDao extends BaseMapper selectDksh(Map pramsMap); + /** + * 获取已经抵扣统计的税号 + * + * @param pramsMap + * 请求参数 + * @return 返回结果 + */ + List selectDksh2(Map pramsMap); + /** * 查询勾选未确认,发送认证的发票 * diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index a0c340c1..b42f899d 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -107,8 +107,8 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl gfshList1 = new ArrayList<>(); Map map = new HashMap<>(); - map.put("gfsh",new ArrayList<>().add(gfsh)); - List curList = baseTDxRecordInvoiceDao.selectDksh(map); + map.put("gfsh",gfsh); + List curList = baseTDxRecordInvoiceDao.selectDksh2(map); log.info("认证查询列表-返回的所属期列表为:{}",curList); for (BaseTDxDkCount cur : curList) { String skssq = cur.getSkssq(); diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index c54542e6..b029fcea 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -81,8 +81,8 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl gfshList1 = new ArrayList<>(); if (StringUtils.isNotBlank(gfsh)) { Map map = new HashMap<>(); - map.put("gfsh",new ArrayList<>().add(gfsh)); - List curList = super.baseMapper.selectDksh(map); + map.put("gfsh",gfsh); + List curList = super.baseMapper.selectDksh2(map); for (BaseTDxDkCount cur : curList) { String skssq = cur.getSkssq(); String year = skssq.substring(0, 4); diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 0d1e7829..08816b38 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -79,12 +79,7 @@ and t.export_mark = '0' and t.auth_status in ('2','3','4') and t.company = #{company} - - and t.gf_tax_no in - - #{item} - - + and t.gf_tax_no = #{gfsh} and (t.comp_code in diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 9ce89b82..a8ec9d0c 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -60,6 +60,17 @@ #{item} + + +