From 9a579886226ee0a6ff710b5d4b209e2301173972 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Sun, 28 May 2023 19:39:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseInvoiceController.java | 24 ++++++- .../BaseInvoiceManualCheckServiceImpl.java | 66 ++++++------------- 2 files changed, 44 insertions(+), 46 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 de0f926d..9ee90083 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 @@ -23,6 +23,7 @@ import com.dxhy.common.vo.Tax; import com.dxhy.common.vo.TaxOrgCode; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -30,6 +31,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -821,6 +823,20 @@ public class BaseInvoiceController extends AbstractController { String menuId = (String)map.get("menuId"); String company = (String)map.get("company"); + if (StringUtils.isNotBlank(inAccountStatus)){ + return ResponseEntity.ok(R.error("入账状态不能为空")); + } + + if (StringUtils.isNotBlank(maxTax)){ + return ResponseEntity.ok(R.error("税额上限不能为空")); + } + + try { + BigDecimal tax = new BigDecimal(maxTax); + } catch (NumberFormatException e) { + return ResponseEntity.ok(R.error("输入税额上线格式不对，请重新输入")); + } + Map pramsMap = new HashMap<>(16); @@ -868,7 +884,12 @@ public class BaseInvoiceController extends AbstractController { } else { gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); } - pramsMap.put("gfsh", gfshList); + if (ObjectUtils.isNotEmpty(gfshList)){ + pramsMap.put("gfsh", gfshList); + }else { + return ResponseEntity.ok(R.error("购方税号不能为空")); + } + if (StringUtils.isNotBlank(companyCode)){ pramsMap.put("companyCode",companyCode); @@ -954,6 +975,7 @@ public class BaseInvoiceController extends AbstractController { // pramsMap.put("qsr", qsr); // } + try { return ResponseEntity .ok(R.ok().put("data", baseInvoiceManualCheckService.inTellingCheck(pramsMap))); 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 a23b4667..e7722fcd 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 @@ -524,28 +524,28 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl"+hjje); //发票状态不能认证 - String invoiceStatus="07"; - if ( pageList.get(i).getInvoiceStatus() != null && !invoiceStatus.contains(pageList.get(i).getInvoiceStatus()) - || pageList.get(i).getInvoiceAmount() != null && pageList.get(i).getInvoiceAmount().compareTo(new BigDecimal(0)) < 0 - || pageList.get(i).getTaxAmount() != null && pageList.get(i).getTaxAmount().compareTo(new BigDecimal(0)) < 0) { - - currentTax = currentTax.subtract(pageList.get(i).getTaxAmount()); - hjje = hjje.subtract(pageList.get(i).getInvoiceAmount()); - count--; - log.info("count--{}"+count+",currentTax==》"+currentTax+",hjje===>"+hjje); - continue; - } +// String invoiceStatus="07"; +// if ( pageList.get(i).getInvoiceStatus() != null && !invoiceStatus.contains(pageList.get(i).getInvoiceStatus()) +// || pageList.get(i).getInvoiceAmount() != null && pageList.get(i).getInvoiceAmount().compareTo(new BigDecimal(0)) < 0 +// || pageList.get(i).getTaxAmount() != null && pageList.get(i).getTaxAmount().compareTo(new BigDecimal(0)) < 0) { +// +// currentTax = currentTax.subtract(pageList.get(i).getTaxAmount()); +// hjje = hjje.subtract(pageList.get(i).getInvoiceAmount()); +// count--; +// log.info("count--{}"+count+",currentTax==》"+currentTax+",hjje===>"+hjje); +// continue; +// } //发票税号一申请抵扣统计 - if (!gfshList1.contains(pageList.get(i).getGfTaxNo())) { - //该发票税号已申请抵扣统计 - log.info("申请统计的购方税号为{}",pageList.get(i).getGfTaxNo()); - currentTax = currentTax.subtract(pageList.get(i).getTaxAmount()); - hjje = hjje.subtract(pageList.get(i).getInvoiceAmount()); - count--; - log.info("已申请抵扣统计 count-- ==={}"+count+",currentTax==》"+currentTax+",hjje===>"+hjje); - - continue; - } +// if (!gfshList1.contains(pageList.get(i).getGfTaxNo())) { +// //该发票税号已申请抵扣统计 +// log.info("申请统计的购方税号为{}",pageList.get(i).getGfTaxNo()); +// currentTax = currentTax.subtract(pageList.get(i).getTaxAmount()); +// hjje = hjje.subtract(pageList.get(i).getInvoiceAmount()); +// count--; +// log.info("已申请抵扣统计 count-- ==={}"+count+",currentTax==》"+currentTax+",hjje===>"+hjje); +// +// continue; +// } BaseSggxCxRespVO vo = getBaseSggxCxRespVO(pageList.get(i), count, taxnoList, businessList); // log.info("智能勾选查询返回对象VO {}",vo); @@ -573,30 +573,6 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl"+hjje); - //发票状态不能认证 - String invoiceStatus="07"; - if ( collect.get(j).getInvoiceStatus() != null && !invoiceStatus.contains(collect.get(j).getInvoiceStatus()) - || collect.get(j).getInvoiceAmount() != null && collect.get(j).getInvoiceAmount().compareTo(new BigDecimal(0)) < 0 - || collect.get(j).getTaxAmount() != null && collect.get(j).getTaxAmount().compareTo(new BigDecimal(0)) < 0) { - - currentTax = currentTax.subtract(collect.get(j).getTaxAmount()); - hjje = hjje.subtract(collect.get(j).getInvoiceAmount()); - count--; - log.info("最小排序count--{}"+count+",currentTax==》"+currentTax+",hjje===>"+hjje); - continue; - } - //发票税号一申请抵扣统计 - if (!gfshList1.contains(collect.get(j).getGfTaxNo())) { - //该发票税号已申请抵扣统计 - currentTax = currentTax.subtract(collect.get(j).getTaxAmount()); - hjje = hjje.subtract(collect.get(j).getInvoiceAmount()); - count--; - log.info("申请统计的购方税号为{}",collect.get(j).getGfTaxNo()); - log.info("最小排序已申请抵扣统计 count-- ==={}"+count+",currentTax==》"+currentTax+",hjje===>"+hjje); - - continue; - } - BaseSggxCxRespVO vo = getBaseSggxCxRespVO(collect.get(j), count, taxnoList, businessList); log.info("returnList添加vo"); returnList.add(vo);