From facb52177a329b85f60058da756d0182f6775448 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 25 Jul 2023 19:31:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ariesy=20=E5=88=A4=E6=96=ADreason=E9=9D=9E?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java index 42d7b90d..a2058530 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java @@ -657,8 +657,9 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl query = new QueryWrapper<>(); query.eq("reason_code", record.getOutReason()); BaseTDxOutReason reason = baseTDxOutReasonDao.selectOne(query); - if (StringUtils.isNotEmpty(reason.getOutReason())) + if (reason != null && StringUtils.isNotEmpty(reason.getOutReason())) { vo.setReason(reason.getOutReason()); + } // 认证日期 string类型的长日期转为string类型的短日期 String certDate = record.getCertDate(); Date date = new Date(); From c94ba7df7559d1a94bb011e4d4d053c5f3c9dbac Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 25 Jul 2023 19:32:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?ariesy=20=E5=88=A4=E6=96=ADreason=E9=9D=9E?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java index 42d7b90d..a2058530 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java @@ -657,8 +657,9 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl query = new QueryWrapper<>(); query.eq("reason_code", record.getOutReason()); BaseTDxOutReason reason = baseTDxOutReasonDao.selectOne(query); - if (StringUtils.isNotEmpty(reason.getOutReason())) + if (reason != null && StringUtils.isNotEmpty(reason.getOutReason())) { vo.setReason(reason.getOutReason()); + } // 认证日期 string类型的长日期转为string类型的短日期 String certDate = record.getCertDate(); Date date = new Date(); From 92838820c9e49d4ccba368c192ce9567a550387e Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 25 Jul 2023 20:03:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0gfsh=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtInvoicePoolController.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 74208fa1..75033660 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 @@ -57,15 +57,15 @@ public class ExtInvoicePoolController extends AbstractController { pramsMap.put("dbName", getUserInfo().getDbName()); List gfshList = new ArrayList<>(); -// if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { -// gfshList.add(pramsMap.get("gfsh").toString()); -// } else { -// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); -// if (gfshList.size() == 0) { -// return ResponseEntity.ok(R.ok().put("data", "")); -// } -// } - gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { + gfshList.add(pramsMap.get("gfsh").toString()); + } else { + gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + if (gfshList.size() == 0) { + return ResponseEntity.ok(R.ok().put("data", "")); + } + } +// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); boolean flag = checkList(gfshList); if (flag){ pramsMap.put("sign","88"); @@ -230,16 +230,16 @@ public class ExtInvoicePoolController extends AbstractController { pramsMap.put("dbName", getUserInfo().getDbName()); List gfshList = new ArrayList<>(); -// if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { -// gfshList.add(pramsMap.get("gfsh").toString()); -// } else { -// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); -// if (gfshList.size() == 0) { -// return ResponseEntity.ok(R.ok().put("data", "")); -// } -// } + if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { + gfshList.add(pramsMap.get("gfsh").toString()); + } else { + gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + if (gfshList.size() == 0) { + return ResponseEntity.ok(R.ok().put("data", "")); + } + } - gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); +// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); boolean flag = checkList(gfshList); if (flag){ pramsMap.put("sign","88"); From 7d7c1ef6859a0c5eb1d986e29b6f7b91e6ef3560 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 25 Jul 2023 20:33:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?ariesy=20=E5=8E=BB=E6=8E=89=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEcompanycode=20=E6=9F=A5=E8=AF=A2gfsh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/extend/controller/ExtInvoicePoolController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 75033660..f3a37054 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 @@ -113,13 +113,13 @@ public class ExtInvoicePoolController extends AbstractController { if(StringUtils.isNotEmpty(companyCode) && !"99".equals(companyCode) && !"88".equals(companyCode)) { pramsMap.put("companyCode", companyCode); companyCodes.add(companyCode); - gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes); +// 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); +// gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes); pramsMap.put("gfsh", gfshList); log.info("组织机构====>{}", companyCodes); }else if(StringUtils.isNotEmpty(companyCode) && "88".equals(companyCode)){