From 11c36872fa70ea7af756ea609528c6d4b34d04c3 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 9 Aug 2023 10:31:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E6=96=B9=E7=A8=8E=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BC=96=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseInvoiceController.java | 69 ++++--------------- .../BaseInvoiceManualCheckServiceImpl.java | 6 +- .../resources/mapper/BaseSggxcxMapper.xml | 52 ++------------ 3 files changed, 22 insertions(+), 105 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index b042f158..443263fc 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -506,17 +506,18 @@ public class BaseInvoiceController extends AbstractController { @SysLog("调用手工勾选查询接口") @ResponseBody public Object sggxcx(@RequestBody Map map) { -// List orgCodes = getUserInfo().getOrgCodes(); -// log.info("user信息========>{}",getUserInfo()); -// if (orgCodes != null && orgCodes.size() > 0){ -// for (int i = 0; i < orgCodes.size(); i++) { -// log.info("orgcode=======>{}",orgCodes.get(i)); -// } -// }else { -// log.info("未能获得机构代码"); -// } - String gfsh = (String)map.get("gfsh"); + if(map.get("gfsh") == null || "".equals(map.get("gfsh"))){ + return ResponseEntity.ok(R.error("购方税号不能为空")); + } + + if (map.get("companyCode") == null || "".equals(map.get("companyCode"))){ + return ResponseEntity.ok(R.error("组织编码不能为空")); + } + + + String gfsh = (String) map.get("gfsh"); + String companyCode = (String) map.get("companyCode"); String invoiceType = (String)map.get("invoiceType"); String invoiceSource = (String)map.get("invoiceSource"); String kpksrq = (String)map.get("kpksrq"); @@ -541,7 +542,6 @@ public class BaseInvoiceController extends AbstractController { String menuId = (String)map.get("menuId"); String bzdh = (String) map.get("bzdh"); String inAccountStatus = (String) map.get("inAccountStatus"); - String companyCode = (String) map.get("companyCode"); String suspendStatus = (String) map.get("suspendStastus"); String suspendDate = (String) map.get("suspendDate"); String bzr = (String) map.get("bzr"); @@ -550,22 +550,13 @@ public class BaseInvoiceController extends AbstractController { suspendDate = suspendDate.substring(0,7); } -// //所属机构列表 -// List orgCodes = null; -// if (map.get("orgCodes") !=null){ -// orgCodes = (List) map.get("orgCodes"); -// }else { -// List taxOrgCodes = getUserInfo().getOrgCodes(); -// if (taxOrgCodes != null && taxOrgCodes.size() > 0){ -// for (TaxOrgCode taxOrgCode : taxOrgCodes) { -// orgCodes.add(taxOrgCode.getOrgCode()); -// } -// } -// } + Map pramsMap = new HashMap<>(32); -// pramsMap.put("orgCodes",orgCodes); + + pramsMap.put("companyCode",companyCode); + pramsMap.put("gfsh", gfsh); pramsMap.put("bzdh", bzdh); pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); @@ -606,8 +597,6 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("accountPeriod", accountPeriod); log.info("accountPeriod:{}",accountPeriod); } -// pramsMap.put("accountPeriod", map.get("accountPeriod")); -// String inAccountStatus = (String)map.get("inAccountStatus"); if (sfkrz != null) { if (!"99".equals(sfkrz)) { @@ -629,34 +618,6 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("taxRate",taxRate); } - //所属组织 -// List companyCodeList = new ArrayList<>(); -// if (StringUtils.isNotBlank(companyCode) && !"99".equals(companyCode)){ -// companyCodeList.add(companyCode); -// }else { -// companyCodeList = getUserInfo().getCompanyCodes(); -// log.info("获取到的组织信息{}",companyCodeList); -// } - List companyCodes = getUserInfo().getCompanyCodes(); - - if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ - pramsMap.put("companyCodes",companyCodes); - log.info("组织机构====>{}",pramsMap.get("companyCodes")); - } - if (StringUtils.isNotBlank(companyCode)){ - pramsMap.put("companyCode",companyCode); - } - - - List gfshList = new ArrayList<>(); - if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) { - gfshList.add(gfsh); - log.info("手工认证有税号"); - } else { - gfshList = getGfshList(gfshList,companyCodes); - log.info("手工认证无税号{}",gfshList); - } - pramsMap.put("gfsh", gfshList); if (!StringUtils.isBlank(invoiceType)) { if (!"99".equals(invoiceType)) { 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 94c1920a..4e008b21 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 @@ -74,11 +74,11 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl voList = new ArrayList<>(); - List gfshList = (List) pramsMap.get("gfsh"); - log.info("购方税号{}", gfshList); + String gfsh = (String) pramsMap.get("gfsh"); + String qsflag = (String) pramsMap.get("qsflag"); List gfshList1 = new ArrayList<>(); - if (gfshList.size() > 0) { + if (StringUtils.isNotBlank(gfsh)) { List curList = super.baseMapper.selectDksh(pramsMap); for (BaseTDxDkCount cur : curList) { String skssq = cur.getSkssq(); diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index cec7e6f9..a26b13e6 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -76,6 +76,8 @@ and t.export_mark = '0' and t.inaccount_status = '1' and t.company = #{company} + and t.gf_tax_no = #{gfsh} + and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) and t.invoice_status in ('0','7') and t.invoice_amount>0 @@ -97,30 +99,7 @@ and t.bzdh is not null - - and t.gf_tax_no in - - #{item} - - - - - - - - and t.comp_code in - - #{companyCode} - - - - - and t.comp_code = #{companyCode} - - - and (t.comp_code = '' or t.comp_code is null) - and t.suspend_status = '1' @@ -428,9 +407,8 @@ and t.inaccount_status = '1' and t.export_mark = '0' and t.company = #{company} - - - + and t.gf_tax_no = #{gfsh} + and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) and t.invoice_status in ('0','7') and t.invoice_amount>0 @@ -446,29 +424,7 @@ c.select_end_date or d.tj_status in ('1','2')) - - and t.gf_tax_no in - - #{item} - - - - - - - - and t.comp_code in - - #{companyCode} - - - - and t.comp_code = #{companyCode} - - - and (t.comp_code = '' or t.comp_code is null) - and t.qs_status = #{qszt}