diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 3c92c5aa..2709a509 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -418,6 +418,7 @@ public class SDNYMainProcessController extends AbstractController { } else { //其他类发票,直接入库 log.info("其他类发票,不做查验,直接入库"); + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); TDxInvoiceReimburse reimburse = new TDxInvoiceReimburse(); int insert = tDxInvoiceReimburseService.getBaseMapper().insert(reimburse); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java index 50de9d91..74208fa1 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java @@ -108,15 +108,25 @@ public class ExtInvoicePoolController extends AbstractController { } int curr = (int)pramsMap.get("curr"); int size = (int)pramsMap.get("size"); + List companyCodes = new ArrayList<>(); String companyCode = (String) pramsMap.get("companyCode"); - List companyCodes = getUserInfo().getCompanyCodes(); - if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ - pramsMap.put("companyCodes",companyCodes); - log.info("组织机构====>{}",companyCodes); + if(StringUtils.isNotEmpty(companyCode) && !"99".equals(companyCode) && !"88".equals(companyCode)) { + pramsMap.put("companyCode", companyCode); + companyCodes.add(companyCode); + gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes); + pramsMap.put("gfsh", gfshList); + }else if(StringUtils.isNotEmpty(companyCode) && "99".equals(companyCode)){ + pramsMap.put("companyCode", companyCode); + companyCodes = getUserInfo().getCompanyCodes(); + pramsMap.put("companyCodes", companyCodes); + gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes); + pramsMap.put("gfsh", gfshList); + log.info("组织机构====>{}", companyCodes); + }else if(StringUtils.isNotEmpty(companyCode) && "88".equals(companyCode)){ + pramsMap.put("companyCode", companyCode); + log.info("组织机构====>{}", companyCodes); } - gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes); - pramsMap.put("gfsh", gfshList); try { return ResponseEntity.ok(R.ok().put("data", extInvoicePoolService.listAddTax(pramsMap, curr, size))); } catch (Exception e) { diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 002d10cb..6588312c 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -69,7 +69,7 @@ like CONCAT('%',#{keyWord},'%') - + and t.gf_tax_no in #{item} @@ -220,7 +220,7 @@ like CONCAT('%',#{keyWord},'%') - + and t.gf_tax_no in #{item} @@ -310,7 +310,6 @@ and (t.comp_code = '' or t.comp_code is null) - and t.invoice_type not in ('91','95','97','99','101','00')