From b9aca287316145d4d6a49532c6823a12fc7399d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?= <10549902+zhuangruibo@user.noreply.gitee.com> Date: Tue, 2 Jun 2026 20:27:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enforcementcode/helper/QrCodeHelper.java | 2 +- .../helper/ZdxtFileHelper.java | 8 +++++--- .../IQrCodeGenerateHistoryService.java | 9 +++++++++ .../EnterpriseInformationServiceImpl.java | 4 ++-- .../impl/EnterprisePubQrcodeServiceImpl.java | 19 ++++++++++++++++--- .../QrCodeGenerateHistoryServiceImpl.java | 14 ++++++++++++++ 6 files changed, 47 insertions(+), 9 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/QrCodeHelper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/QrCodeHelper.java index cc47dde1..6d1bf91e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/QrCodeHelper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/QrCodeHelper.java @@ -80,7 +80,7 @@ public class QrCodeHelper { String enterpriseNumber, String formModule, Date createDate, String refExId,String reasonsChange) { - int defaultSize = 400; + int defaultSize = 460; // 1. 自动生成 codeId、salt String codeId = IdUtil.fastSimpleUUID(); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/ZdxtFileHelper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/ZdxtFileHelper.java index cd3b4a75..d5936470 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/ZdxtFileHelper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/ZdxtFileHelper.java @@ -169,7 +169,8 @@ public class ZdxtFileHelper { try { LoginUser loginUser = LoginHelper.getLoginUser(); if (loginUser != null) { - bo.setOrgCode(LoginHelper.getDeptId()); + String deptId = LoginHelper.getDeptId(); + bo.setOrgCode(StringUtils.substring(deptId, 0, 100)); bo.setOrgName(LoginHelper.getDeptName()); bo.setSassId(LoginHelper.getTenantId()); } @@ -242,8 +243,9 @@ public class ZdxtFileHelper { LoginUser loginUser = LoginHelper.getLoginUser(); if (loginUser != null) { bo.setUploadPersonId(LoginHelper.getUserIdStr()); - bo.setUploadPersonName(loginUser.getNickname()); - bo.setOrgCode(LoginHelper.getDeptId()); + bo.setUploadPersonName(StringUtils.substring(loginUser.getNickname(), 0, 20)); + String deptId = LoginHelper.getDeptId(); + bo.setOrgCode(StringUtils.substring(deptId, 0, 100)); bo.setOrgName(LoginHelper.getDeptName()); bo.setSassId(LoginHelper.getTenantId()); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IQrCodeGenerateHistoryService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IQrCodeGenerateHistoryService.java index 12d0f104..8279ea68 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IQrCodeGenerateHistoryService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IQrCodeGenerateHistoryService.java @@ -73,4 +73,13 @@ public interface IQrCodeGenerateHistoryService { * @return 最新有效的二维码记录，不存在返回 null */ QrCodeGenerateHistoryVo queryLatestByEnterpriseNumber(String enterpriseNumber); + + /** + * 根据企业纳税识别号和变更原因查询最新有效的二维码记录 + * + * @param enterpriseNumber 企业纳税识别号 + * @param reasonsChange 变更原因 + * @return 最新有效的二维码记录，不存在返回 null + */ + QrCodeGenerateHistoryVo queryLatestByEnterpriseNumberAndReason(String enterpriseNumber, String reasonsChange); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseInformationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseInformationServiceImpl.java index 1b261ad6..1104c3a9 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseInformationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseInformationServiceImpl.java @@ -221,8 +221,8 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS throw new ServiceException("企业纳税识别号[" + enterpriseNumber + "]对应的企业不存在"); } - // 2. 检查是否已存在有效二维码 - QrCodeGenerateHistoryVo existingQrCode = qrCodeGenerateHistoryService.queryLatestByEnterpriseNumber(enterpriseNumber); + // 2. 检查是否已存在有效二维码（同时匹配企业编号和变更原因） + QrCodeGenerateHistoryVo existingQrCode = qrCodeGenerateHistoryService.queryLatestByEnterpriseNumberAndReason(enterpriseNumber, reasonsChange); if (existingQrCode != null) { log.info("企业[{}]已存在有效二维码，跳过生成，qrCodeId={}", enterpriseNumber, existingQrCode.getId()); return existingQrCode; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterprisePubQrcodeServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterprisePubQrcodeServiceImpl.java index bef8fc65..55efc675 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterprisePubQrcodeServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterprisePubQrcodeServiceImpl.java @@ -21,6 +21,7 @@ import com.zdxt.enforcementcode.common.util.DataFilterUtil; import com.zdxt.enforcementcode.domain.EnterprisePubQrcode; import com.zdxt.enforcementcode.domain.EnterpriseInformation; import com.zdxt.enforcementcode.domain.bo.EnterprisePubQrcodeBo; +import com.zdxt.enforcementcode.domain.bo.EnterpriseInformationBo; import com.zdxt.enforcementcode.domain.vo.EnterprisePubQrcodeVo; import com.zdxt.enforcementcode.domain.vo.EnterpriseInformationVo; import com.zdxt.enforcementcode.domain.vo.QrCodeGenerateHistoryVo; @@ -361,10 +362,22 @@ public class EnterprisePubQrcodeServiceImpl implements IEnterprisePubQrcodeServi } record.setMatchingStatus("已匹配"); - // 使用searchEnterpriseByNumber从市监写入本地enterprise_information表 + // 从市监获取企业信息并写入本地enterprise_information表 EnterpriseInformation newInfo = enterpriseInformationService.searchEnterpriseByNumber(enterpriseNumber); - String targetId = (newInfo != null) ? newInfo.getId() : null; - insertedCount++; + String targetId = null; + if (newInfo != null) { + EnterpriseInformationBo insertBo = new EnterpriseInformationBo(); + insertBo.setId(newInfo.getId()); + insertBo.setEnterpriseName(newInfo.getEnterpriseName()); + insertBo.setEnterpriseNumber(newInfo.getEnterpriseNumber()); + insertBo.setSalt(newInfo.getSalt()); + insertBo.setEnterpriseType("送码入企"); + insertBo.setIsUnsubscribe(0L); + insertBo.setIsDelete(0L); + enterpriseInformationService.insertByBo(insertBo); + targetId = insertBo.getId(); + insertedCount++; + } // 生成二维码 try { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/QrCodeGenerateHistoryServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/QrCodeGenerateHistoryServiceImpl.java index 1b85a7ec..bf244740 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/QrCodeGenerateHistoryServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/QrCodeGenerateHistoryServiceImpl.java @@ -152,4 +152,18 @@ public class QrCodeGenerateHistoryServiceImpl implements IQrCodeGenerateHistoryS lqw.last("LIMIT 1"); return baseMapper.selectVoOne(lqw); } + + @Override + public QrCodeGenerateHistoryVo queryLatestByEnterpriseNumberAndReason(String enterpriseNumber, String reasonsChange) { + if (StringUtils.isBlank(enterpriseNumber)) { + return null; + } + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(QrCodeGenerateHistory::getEnterpriseNumber, enterpriseNumber); + lqw.eq(QrCodeGenerateHistory::getStatus, 0L); // 0=有效 + lqw.eq(StringUtils.isNotBlank(reasonsChange), QrCodeGenerateHistory::getReasonsChange, reasonsChange); + lqw.orderByDesc(QrCodeGenerateHistory::getGenerateTime); + lqw.last("LIMIT 1"); + return baseMapper.selectVoOne(lqw); + } }