From abcc252f081501eb12c38ee0fb777a3c2386b17f Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 27 Apr 2023 19:48:59 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=88=A0=E9=99=A4=E5=AE=9E=E5=90=8D=E5=AE=A2?= =?UTF-8?q?=E7=A5=A8=E5=AF=B9=E5=BA=94=E4=BF=A1=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 38 +++++++++++++++---- .../com/dxhy/erp/dao/MixedSignatureDao.java | 17 +++++++++ .../dxhy/erp/entity/TDxInvoiceReimburse.java | 2 +- .../erp/service/SNPushCheckRecordService.java | 10 +++-- 4 files changed, 55 insertions(+), 12 deletions(-) create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/dao/MixedSignatureDao.java 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 799d86aa..8980f911 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 @@ -87,6 +87,9 @@ public class SDNYMainProcessController extends AbstractController { @Resource private RecordInvoiceDao recordInvoiceDao; + @Resource + private MixedSignatureDao mixedSignatureDao; + /** * 查验发票 */ @@ -484,14 +487,35 @@ public class SDNYMainProcessController extends AbstractController { //删除对应的影像号 QueryWrapper recordWrapper = new QueryWrapper<>(); recordWrapper.eq("image_id", imageId); - BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); - recordInvoice.setImageId(""); - recordInvoice.setCompCode(""); - baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper); + BaseTDxRecordInvoice baseTDxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(recordWrapper); + if(baseTDxRecordInvoice != null){ + log.info("TDxRecordInvoice表中匹配到数据"); + BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); + recordInvoice.setImageId(""); + recordInvoice.setCompCode(""); + baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper); - R data = new R(1000, "default success"); - data.put("data", result); - return ResponseEntity.ok(JSONObject.toJSONString(data)); + R data = new R(1000, "default success"); + data.put("data", ""); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + }else{ + //删除对应的影像号 + QueryWrapper reimburseWrapper = new QueryWrapper<>(); + reimburseWrapper.eq("image_id", imageId); + + TDxInvoiceReimburse reimburse1 = mixedSignatureDao.selectOne(reimburseWrapper); + if(reimburse1 != null){ + log.info("TDxInvoiceReimburse表中匹配到数据"); + TDxInvoiceReimburse tDxInvoiceReimburse = new TDxInvoiceReimburse(); + tDxInvoiceReimburse.setImageId(""); + tDxInvoiceReimburse.setCompCode(""); + mixedSignatureDao.update(tDxInvoiceReimburse, reimburseWrapper); + } + R data = new R(1000, "default success"); + data.put("data", ""); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + + } } } catch (Exception exception) { exception.printStackTrace(); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/MixedSignatureDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/MixedSignatureDao.java new file mode 100644 index 00000000..0774d577 --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/MixedSignatureDao.java @@ -0,0 +1,17 @@ +package com.dxhy.erp.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dxhy.erp.entity.TDxInvoiceReimburse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @author user + */ +@Mapper +public interface MixedSignatureDao extends BaseMapper { + +} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxInvoiceReimburse.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxInvoiceReimburse.java index a66b8531..18d44ac8 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxInvoiceReimburse.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxInvoiceReimburse.java @@ -80,7 +80,7 @@ public class TDxInvoiceReimburse { private String currency; private String snVoucherNumber; - private String postingTime = ""; + private String postingTime; private String imageId; private String accountPeriod; private String compCode; diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index e106a7a5..2496eca8 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -596,10 +596,12 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode); log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); - reimburse.setGfTaxNo(orgByCompCode.getTaxno()); - reimburse.setGfName(orgByCompCode.getTaxname()); - reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone()); - reimburse.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount()); + if(orgByCompCode != null) { + reimburse.setGfTaxNo(orgByCompCode.getTaxno()); + reimburse.setGfName(orgByCompCode.getTaxname()); + reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone()); + reimburse.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount()); + } reimburse = convertToReimburse(invoice, reimburse, fplxdm, company);