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 9579fb7..7f0b67c 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 @@ -68,7 +68,7 @@ ,s.create_time from sys_depart d left join nu_biz_suppliers_org s on d.org_code = s.org_code - where d.del_flag = '0' + where d.del_flag = '0' and d.`status` ='1' and iz_history = 'N' and s.open_id = #{openId} order by s.create_time desc 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 35b31f8..efef2cd 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 @@ -144,7 +144,11 @@ public class WxNoticeServiceImpl extends ServiceImpl i data.put("thing2", wxNotice.getThing2()); // 对应模板中的字段 data.put("phrase1", wxNotice.getPhrase1()); data.put("date3", DateUtils.now()); - + System.out.println("模板消息发送数据:" + data); + System.out.println("accessToken:" + accessToken); + System.out.println("openId:" + openId); + System.out.println("templateId:" + templateId); + System.out.println("page:" + page); // 3. 发送模板消息 String resInfo = TemplateMessageSender.sendTemplateMessage(accessToken, openId, templateId, page, data); if (com.alibaba.cloud.commons.lang.StringUtils.equals(resInfo, "error")) { 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 8a92207..d9d66f5 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 @@ -141,6 +141,8 @@ public class SuppliersMQListener { } nuBizSuppliersOrg.setAuditContent(suppliersInfoMQDto.getApplyContent()); nuBizSuppliersOrgService.update(nuBizSuppliersOrg, orgUW); + orgUW.last("limit 1"); + NuBizSuppliersOrg nuBizSuppliersOrg2 = nuBizSuppliersOrgService.getOne(orgUW); if (StringUtils.equals("modifyPass", suppliersInfoMQDto.getStatus())) { NuBizSuppliersApply apply = new NuBizSuppliersApply(); @@ -178,13 +180,13 @@ public class SuppliersMQListener { //审核通过 if (StringUtils.equals("modifyPass", suppliersInfoMQDto.getStatus())) { content1 = "您好,您提交的信息变更已通过"; - content2 = "信息变更审核通过"; + content2 = "审核通过"; } else if (StringUtils.equals("modifyFail", suppliersInfoMQDto.getStatus())) { content1 = "您好,您提交的信息变更未通过,驳回原因:"+suppliersInfoMQDto.getApplyContent(); - content2 = "信息变更审核未通过"; + content2 = "审核未通过"; } NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity(); - nuWxNotice.setOpenId(nuBizSuppliersOrg.getOpenId()); + nuWxNotice.setOpenId(nuBizSuppliersOrg2.getOpenId()); nuWxNotice.setIzRead("N"); nuWxNotice.setOrgCode(nuBizSuppliersOrg.getOrgCode()); nuWxNotice.setTitle("供应商信息变更审核"); @@ -198,9 +200,9 @@ public class SuppliersMQListener { wxNoticeApi.addNotice(nuWxNotice); WxNoticeEntity wxNotice = new WxNoticeEntity(); wxNotice.setPageRoute("pages/supplierindex/index"); - wxNotice.setThing2("供应商信息变更审核"); + wxNotice.setThing2("供应商变更审核"); wxNotice.setPhrase1(content2); - wxNotice.setLogMainInfo("供应商信息变更审核"); + wxNotice.setLogMainInfo("供应商变更审核"); wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice); } catch (Exception e) { e.printStackTrace();