From d8fb32525befafef589dc945dbe4ba9d56059bf7 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 27 Jan 2026 14:56:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=95=B4=E4=BD=93=E6=B5=81=E7=A8=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/suppliers/ISuppliersApi.java | 2 +- .../mapper/xml/NuBizSuppliersApplyMapper.xml | 2 +- .../impl/NuBizSuppliersApplyServiceImpl.java | 32 +++++++++++++------ .../service/impl/WxNoticeServiceImpl.java | 2 +- .../listener/SuppliersMQListener.java | 30 +++++++++++++---- .../wechat/suppliers/SuppliersApi.java | 18 +++++++---- .../com/nu/entity/SuppliersApplyEntity.java | 4 +++ 7 files changed, 65 insertions(+), 25 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 0eec834..10ade50 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); + SuppliersApplyEntity getSupInfoByOpenId(String openId, String orgCode); IPage getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId); 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 350fd64..3638d11 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 @@ -40,7 +40,7 @@ from sys_depart d left join nu_org_apply_info o on d.id = o.pk_id left join nu_biz_suppliers_org s on d.org_code = s.org_code - where 1=1 and o.status in ('2','4','5') and d.del_flag = '0' and d.server_url is not null and s.iz_history = 'N' + where 1=1 and o.status = '2' and d.del_flag = '0' and d.server_url is not null and s.iz_history = 'N' and s.open_id = #{openId} and d.org_code IN 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 9ace16a..e831370 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 @@ -159,10 +159,11 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl uw = new UpdateWrapper<>(); - uw.eq("suppliers_id",suppliersApplyEntity.getId()); + uw.eq("suppliers_id", suppliersApplyEntity.getId()); + uw.eq("org_code", suppliersApplyEntity.getOrgCode()); NuBizSuppliersOrg soDto = new NuBizSuppliersOrg(); soDto.setIzHistory("Y"); - suppliersOrgService.update(soDto,uw); + suppliersOrgService.update(soDto, uw); //插入新的数据 NuBizSuppliersOrg addDto = new NuBizSuppliersOrg(); @@ -189,8 +190,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("open_id", openId); List list = baseMapper.selectList(queryWrapper); @@ -233,11 +233,23 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); - qw.eq("suppliers_id",list.get(0).getId()); - qw.eq("iz_history","N"); - NuBizSuppliersOrg so = suppliersOrgService.getOne(qw); - suppliersApplyEntity.setSuppliersStatus(so.getStatus()); - suppliersApplyEntity.setAuditContent(so.getAuditContent()); + qw.eq("suppliers_id", list.get(0).getId()); + qw.eq("iz_history", "N"); +// qw.eq("org_code", orgCode); + List soList = suppliersOrgService.list(qw); + if (!CollectionUtils.isEmpty(soList)) { + for (int i = 0; i < soList.size(); i++) { + NuBizSuppliersOrg so = soList.get(i); + if (so.getOrgCode().equals(orgCode)) { + suppliersApplyEntity.setSuppliersStatus(so.getStatus()); + suppliersApplyEntity.setAuditContent(so.getAuditContent()); + suppliersApplyEntity.setOrgCode(orgCode); + } + if("4".equals(so.getStatus())){ + suppliersApplyEntity.setIzModify(true); + } + } + } return suppliersApplyEntity; } return null; diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wxnotice/service/impl/WxNoticeServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wxnotice/service/impl/WxNoticeServiceImpl.java index f6da51c..9892edd 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wxnotice/service/impl/WxNoticeServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wxnotice/service/impl/WxNoticeServiceImpl.java @@ -58,7 +58,7 @@ public class WxNoticeServiceImpl extends ServiceImpl i QueryWrapper qw = new QueryWrapper<>(); qw.eq("open_id", openId); qw.eq("client_type", clientType);//哪个端(机构?员工？家属？) - qw.orderByDesc("iz_read");//未读在前 + qw.orderByAsc("CASE WHEN iz_read = 'N' THEN 1 WHEN iz_read = 'Y' THEN 2 ELSE 3 END");//未读在前 qw.orderByDesc("create_time");//按照时间倒序 List wxNotices = baseMapper.selectList(page, qw); List result = BeanUtil.copyToList(wxNotices, NuWxNoticeEntity.class); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java index ffe85ce..690b863 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java @@ -14,6 +14,7 @@ import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg; import com.nu.modules.bizSuppliers.service.INuBizSuppliersApplyService; import com.nu.modules.bizSuppliers.service.INuBizSuppliersOrgService; import com.nu.modules.wxnotice.IWxNoticeApi; +import com.nu.utils.RabbitMQUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.common.aspect.annotation.AutoLog; @@ -25,6 +26,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.List; import java.util.Map; @Slf4j @@ -37,6 +39,8 @@ public class SuppliersMQListener { private INuBizSuppliersApplyService applyService; @Autowired private IWxNoticeApi wxNoticeApi; + @Autowired + private RabbitMQUtil rabbitMQUtil; /** * 工单回执 @@ -122,20 +126,20 @@ public class SuppliersMQListener { errorHandler = "suppliersMQExceptionHandler" ) public void updateAuditResult(SuppliersInfoMQDto suppliersInfoMQDto) { - try{ + try { log.info("变更审核结果: {}", suppliersInfoMQDto); UpdateWrapper orgUW = new UpdateWrapper<>(); - orgUW.eq("suppliers_id",suppliersInfoMQDto.getSuppliersId()); - orgUW.eq("iz_history","N"); + orgUW.eq("suppliers_id", suppliersInfoMQDto.getSuppliersId()); + orgUW.eq("iz_history", "N"); NuBizSuppliersOrg nuBizSuppliersOrg = new NuBizSuppliersOrg(); if (StringUtils.equals("modifyPass", suppliersInfoMQDto.getStatus())) { nuBizSuppliersOrg.setStatus("2"); } else { - nuBizSuppliersOrg.setStatus("4"); + nuBizSuppliersOrg.setStatus("5"); } nuBizSuppliersOrg.setAuditContent(suppliersInfoMQDto.getApplyContent()); - nuBizSuppliersOrgService.update(nuBizSuppliersOrg,orgUW); + nuBizSuppliersOrgService.update(nuBizSuppliersOrg, orgUW); if (StringUtils.equals("modifyPass", suppliersInfoMQDto.getStatus())) { NuBizSuppliersApply apply = new NuBizSuppliersApply(); @@ -151,6 +155,20 @@ public class SuppliersMQListener { applyService.updateById(apply); } + if (StringUtils.equals("modifyPass", suppliersInfoMQDto.getStatus())) { + //给此供应商已入住机构发通知修改信息 + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("suppliers_id",suppliersInfoMQDto.getSuppliersId()); + qw.groupBy("org_code"); + qw.select("org_code"); + List orgList = nuBizSuppliersOrgService.list(qw); + orgList.stream().forEach(item -> { + if(!suppliersInfoMQDto.getSysOrgCode().equals(item.getOrgCode())){ + rabbitMQUtil.sendToExchange("nu.suppliers.upSuppliersInfo", item.getOrgCode() + ".suppliers.upSuppliersInfo", suppliersInfoMQDto); + } + }); + } + String content1 = ""; String content2 = ""; // QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -183,7 +201,7 @@ public class SuppliersMQListener { wxNotice.setPhrase1(content2); wxNotice.setLogMainInfo("供应商信息变更审核"); wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice); - }catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java index a27a07d..3eae9a4 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java @@ -26,12 +26,13 @@ public class SuppliersApi { /** * 入驻供应商 + * * @param suppliersApplyEntity * @return */ @PostMapping(value = "/addSuppliers") public Result addSuppliers(@RequestBody SuppliersApplyEntity suppliersApplyEntity) { - if(suppliersApi.nameDuplicateChecked(suppliersApplyEntity)){ + if (suppliersApi.nameDuplicateChecked(suppliersApplyEntity)) { return Result.error("供应商名称重复"); } SuppliersApplyEntity suppliersApplyEntity1 = suppliersApi.addSuppliers(suppliersApplyEntity); @@ -41,12 +42,13 @@ public class SuppliersApi { /** * 修改供应商信息 + * * @param suppliersApplyEntity * @return */ @PostMapping(value = "/editSuppliers") public Result editSuppliers(@RequestBody SuppliersApplyEntity suppliersApplyEntity) { - if(suppliersApi.nameDuplicateChecked(suppliersApplyEntity)){ + if (suppliersApi.nameDuplicateChecked(suppliersApplyEntity)) { return Result.error("供应商名称重复"); } SuppliersApplyEntity suppliersApplyEntity1 = suppliersApi.editSuppliers(suppliersApplyEntity); @@ -55,6 +57,7 @@ public class SuppliersApi { /** * 获取供应商已经入驻机构的信息 + * * @param pageNo * @param pageSize * @param orgCode @@ -69,7 +72,7 @@ public class SuppliersApi { @RequestParam(value = "orgCode", defaultValue = "", required = false) String orgCode, @RequestParam(value = "title", defaultValue = "", required = false) String title, @RequestParam(value = "openId") String openId) { - IPage result = suppliersApi.getSuppliersOrgInfo(pageNo, pageSize, orgCode, title,openId); + IPage result = suppliersApi.getSuppliersOrgInfo(pageNo, pageSize, orgCode, title, openId); List sourceRecords = result.getRecords(); if (sourceRecords == null || sourceRecords.size() <= 0) { return Result.OK(result); @@ -79,6 +82,7 @@ public class SuppliersApi { /** * 供应商入驻机构 + * * @param suppliersOrgEntity * @return */ @@ -91,6 +95,7 @@ public class SuppliersApi { /** * 获取供应商可入驻机构信息 + * * @param pageNo * @param pageSize * @param orgCode @@ -105,7 +110,7 @@ public class SuppliersApi { @RequestParam(value = "orgCode", defaultValue = "", required = false) String orgCode, @RequestParam(value = "title", defaultValue = "", required = false) String title, @RequestParam(value = "openId") String openId) { - IPage result = suppliersApi.getApplySuppliersOrgInfo(pageNo, pageSize, orgCode, title,openId); + IPage result = suppliersApi.getApplySuppliersOrgInfo(pageNo, pageSize, orgCode, title, openId); List sourceRecords = result.getRecords(); if (sourceRecords == null || sourceRecords.size() <= 0) { return Result.OK(result); @@ -115,13 +120,14 @@ public class SuppliersApi { /** * 根据openId获取供应商信息 + * * @param openId * @return */ @GetMapping(value = "/getSupInfoByOpenId") public Result getSupInfoByOpenId( - @RequestParam(value = "openId") String openId) { - SuppliersApplyEntity result = suppliersApi.getSupInfoByOpenId(openId); + @RequestParam(value = "openId") String openId, @RequestParam(value = "orgCode") String orgCode) { + SuppliersApplyEntity result = suppliersApi.getSupInfoByOpenId(openId, orgCode); return Result.OK(result); } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/SuppliersApplyEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersApplyEntity.java index e4f131e..a8dc6f6 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/SuppliersApplyEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersApplyEntity.java @@ -71,4 +71,8 @@ public class SuppliersApplyEntity implements Serializable { private String suppliersStatus; /**审核备注*/ private java.lang.String auditContent; + + private String orgCode; + + public Boolean izModify; }