From d919b95590ace5512ba57105fd390d6622920f4e Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 5 Feb 2026 16:29:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/suppliers/ISuppliersApi.java | 2 +- .../entity/NuBizSuppliersOrg.java | 33 +++++++++++++++ .../mapper/xml/NuBizSuppliersApplyMapper.xml | 3 ++ .../impl/NuBizSuppliersApplyServiceImpl.java | 41 +++++++++++++++++-- .../wechat/suppliers/SuppliersApi.java | 4 +- .../com/nu/entity/SuppliersOrgAllEntity.java | 2 + 6 files changed, 78 insertions(+), 7 deletions(-) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java index 10ade50..ceb2ee1 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java @@ -21,7 +21,7 @@ public interface ISuppliersApi { SuppliersApplyEntity editSuppliers(SuppliersApplyEntity suppliersApplyEntity); - SuppliersApplyEntity getSupInfoByOpenId(String openId, String orgCode); + SuppliersApplyEntity getSupInfoByOpenId(String openId, String orgCode,String id); IPage getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java index 04cb040..5ae47c5 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java @@ -86,4 +86,37 @@ public class NuBizSuppliersOrg implements Serializable { @Excel(name = "审核机构", width = 15) @ApiModelProperty(value = "审核机构") private String applyOrg; + + /**供应商名称*/ + @Excel(name = "供应商名称", width = 15) + @ApiModelProperty(value = "供应商名称") + private java.lang.String suppliersName; + /**供应商性质 1代理商 2批发商 3制造商*/ + @Excel(name = "供应商性质 1代理商 2批发商 3制造商", width = 15) + @ApiModelProperty(value = "供应商性质 1代理商 2批发商 3制造商") + private java.lang.String suppliersNature; + /**供应商地址*/ + @Excel(name = "供应商地址", width = 15) + @ApiModelProperty(value = "供应商地址") + private java.lang.String suppliersAddress; + /**负责人*/ + @Excel(name = "负责人", width = 15) + @ApiModelProperty(value = "负责人") + private java.lang.String personInCharge; + /**联系电话*/ + @Excel(name = "联系电话", width = 15) + @ApiModelProperty(value = "联系电话") + private java.lang.String contactNumber; + /**开户行*/ + @Excel(name = "开户行", width = 15) + @ApiModelProperty(value = "开户行") + private java.lang.String openingBank; + /**开户行账号*/ + @Excel(name = "开户行账号", width = 15) + @ApiModelProperty(value = "开户行账号") + private java.lang.String openingBankNo; + /**资质照片*/ + @Excel(name = "资质照片", width = 15) + @ApiModelProperty(value = "资质照片") + private java.lang.String imgPath; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml index 7022f0c..43696ec 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml @@ -55,6 +55,7 @@ diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java index 9dbb7c5..bd500d3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java @@ -120,12 +120,20 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl 0) { nuBizSuppliersOrg.setSuppliersId(list.get(0).getId()); } + NuBizSuppliersApply nuBizSuppliersApply = list.get(0); nuBizSuppliersOrg.setStatus("1"); nuBizSuppliersOrg.setIzHistory("N"); nuBizSuppliersOrg.setApplyOrg(suppliersOrgEntity.getOrgCode());//审核机构 + nuBizSuppliersOrg.setSuppliersName(nuBizSuppliersApply.getSuppliersName()); + nuBizSuppliersOrg.setSuppliersNature(nuBizSuppliersApply.getSuppliersNature()); + nuBizSuppliersOrg.setSuppliersAddress(nuBizSuppliersApply.getSuppliersAddress()); + nuBizSuppliersOrg.setPersonInCharge(nuBizSuppliersApply.getPersonInCharge()); + nuBizSuppliersOrg.setContactNumber(nuBizSuppliersApply.getContactNumber()); + nuBizSuppliersOrg.setOpeningBank(nuBizSuppliersApply.getOpeningBank()); + nuBizSuppliersOrg.setOpeningBankNo(nuBizSuppliersApply.getOpeningBankNo()); + nuBizSuppliersOrg.setImgPath(nuBizSuppliersApply.getImgPath()); nuBizSuppliersOrgMapper.insert(nuBizSuppliersOrg); - NuBizSuppliersApply nuBizSuppliersApply = list.get(0); SuppliersInfoMQDto suppliersInfoMQDto = new SuppliersInfoMQDto(); suppliersInfoMQDto.setSuppliersName(nuBizSuppliersApply.getSuppliersName()); suppliersInfoMQDto.setSuppliersNature(nuBizSuppliersApply.getSuppliersNature()); @@ -172,7 +180,14 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("open_id", openId); queryWrapper.orderByDesc("create_time"); @@ -238,7 +253,24 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl soList = suppliersOrgService.list(qw); - if (!CollectionUtils.isEmpty(soList)) { + System.out.println("id-------------------------------------------------------"+id); + if(StringUtils.isNotEmpty(id) && !StringUtils.equals("undefined",id)){ + NuBizSuppliersOrg NuBizSuppliersOrgA = suppliersOrgService.getById(id); + suppliersApplyEntity = new SuppliersApplyEntity(); + suppliersApplyEntity.setSuppliersName(NuBizSuppliersOrgA.getSuppliersName()); + suppliersApplyEntity.setSuppliersNature(NuBizSuppliersOrgA.getSuppliersNature()); + suppliersApplyEntity.setSuppliersAddress(NuBizSuppliersOrgA.getSuppliersAddress()); + suppliersApplyEntity.setPersonInCharge(NuBizSuppliersOrgA.getPersonInCharge()); + suppliersApplyEntity.setContactNumber(NuBizSuppliersOrgA.getContactNumber()); + suppliersApplyEntity.setOpeningBank(NuBizSuppliersOrgA.getOpeningBank()); + suppliersApplyEntity.setOpeningBankNo(NuBizSuppliersOrgA.getOpeningBankNo()); + suppliersApplyEntity.setImgPath(NuBizSuppliersOrgA.getImgPath()); + suppliersApplyEntity.setSuppliersStatus(NuBizSuppliersOrgA.getStatus()); + suppliersApplyEntity.setAuditContent(NuBizSuppliersOrgA.getAuditContent()); + if("4".equals(NuBizSuppliersOrgA.getStatus())){ + suppliersApplyEntity.setIzModify(true); + } + }else if (!CollectionUtils.isEmpty(soList)) { for (int i = 0; i < soList.size(); i++) { NuBizSuppliersOrg so = soList.get(i); if (so.getOrgCode().equals(orgCode)) { @@ -251,6 +283,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl getSupInfoByOpenId( - @RequestParam(value = "openId") String openId, @RequestParam(value = "orgCode") String orgCode) { - SuppliersApplyEntity result = suppliersApi.getSupInfoByOpenId(openId, orgCode); + @RequestParam(value = "openId") String openId, @RequestParam(value = "orgCode") String orgCode, @RequestParam(value = "id",required = false) String id) { + SuppliersApplyEntity result = suppliersApi.getSupInfoByOpenId(openId, orgCode,id); return Result.OK(result); } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgAllEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgAllEntity.java index 91b0a44..fba7c77 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgAllEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgAllEntity.java @@ -36,5 +36,7 @@ public class SuppliersOrgAllEntity implements Serializable { private String serverUrl; private String auditContent; + private String id; + private String createTime; }