From e475a3a17765ac78836d5d188d7f78ce93827ce6 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 24 Feb 2026 10:47:02 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/mq/workorder/listener/WorkOrderMQListener.java | 3 +++ .../src/main/java/com/nu/dto/WorkOrderMQDto.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java index ad92863..c1471ed 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java @@ -56,6 +56,9 @@ public class WorkOrderMQListener { data.setNetUrl(workOrderMQDto.getNetUrl()); data.setAccountNo(workOrderMQDto.getAccountNo()); data.setPasswordText(workOrderMQDto.getPasswordText()); + data.setUrl(workOrderMQDto.getUrl()); + data.setContextPath(workOrderMQDto.getContextPath()); + data.setMediaUrl(workOrderMQDto.getMediaUrl()); sysBaseAPI.updateById(data); // var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id, orgId: record.pkId } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java index c998ff9..30539da 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java @@ -56,4 +56,7 @@ public class WorkOrderMQDto implements Serializable { private java.lang.String netUrl; private java.lang.String accountNo; private java.lang.String passwordText; + private java.lang.String url; + private java.lang.String mediaUrl; + private java.lang.String contextPath; } From 0bf3993ba42344176004c7caf13a54d5e7e9b3cd Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 24 Feb 2026 10:59:08 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=85=A5=E9=A9=BB=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/NuBizSuppliersApplyMapper.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 f4ecfbe..4890b4a 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 @@ -23,7 +23,7 @@ - and o.com_name like concat('%',#{title},'%') + and d.depart_name like concat('%',#{title},'%') @@ -57,12 +57,12 @@ select s.id as id, d.id as org_id, - o.com_name as depart_name, + d.depart_name as depart_name, d.org_code, concat(d.url,d.context_path) as server_url, - o.org_leader, - o.org_leader_phone, - o.org_address + d.org_leader, + d.org_leader_phone, + d.org_address ,s.`status` as suppliers_status ,s.audit_content ,s.create_time From a90f689a4f6255eb8ae05b5ff960c7dc1b88e8d9 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 24 Feb 2026 13:53:22 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nu/modules/IssueInfo/entity/IssueInfo.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/IssueInfo/entity/IssueInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/IssueInfo/entity/IssueInfo.java index e321077..16c171f 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/IssueInfo/entity/IssueInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/IssueInfo/entity/IssueInfo.java @@ -71,5 +71,6 @@ public class IssueInfo implements Serializable { /**发版机构*/ @Excel(name = "发版机构", width = 15) @ApiModelProperty(value = "发版机构") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") private String orgName; } From aa9c072a581133cd8017230c2e03541dfcd90633 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 24 Feb 2026 14:35:18 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml | 4 ++-- .../nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 4890b4a..4d91f01 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 @@ -15,7 +15,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 and s.iz_history = 'N' and s.open_id = #{openId} - where 1=1 and o.status = '2' and d.del_flag = '0' + where 1=1 and d.status = '1' and d.del_flag = '0' and d.org_code IN @@ -69,7 +69,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 = '2' and d.del_flag = '0' + where 1=1 and d.status = '1' and d.del_flag = '0' 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/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml index 64bd495..975cb05 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml @@ -99,7 +99,7 @@ inner join nu_org_apply_info o on d.id = o.pk_id inner join nu_biz_employees_org eo on d.org_code = eo.org_code - o.status = '2' + d.status = '1' and d.del_flag = '0' AND eo.open_id = #{openId} From e4d23359aa1326e7b2aba432084d26a69b1cd447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 24 Feb 2026 15:21:48 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=85=A5=E9=A9=BB?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E8=AF=AD=E5=8F=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java | 3 +++ .../nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml | 1 + 2 files changed, 4 insertions(+) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java index e18fe8d..c487d2a 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java @@ -19,6 +19,9 @@ import java.util.Date; public class OrgAllInfo implements Serializable { private static final long serialVersionUID = 1L; + /**id*/ + private String id; + /**机构id*/ private String orgId; diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml index 975cb05..25a5d73 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml @@ -100,6 +100,7 @@ inner join nu_biz_employees_org eo on d.org_code = eo.org_code d.status = '1' + and o.status = '2' and d.del_flag = '0' AND eo.open_id = #{openId} From e40c095c1eeea819a3edfd34f0f32f78baaad3a3 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 24 Feb 2026 15:22:39 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4d91f01..9990c46 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 @@ -15,7 +15,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 and s.iz_history = 'N' and s.open_id = #{openId} - where 1=1 and d.status = '1' and d.del_flag = '0' + where 1=1 and d.status = '1' and o.`status` = '2' and d.del_flag = '0' and d.org_code IN From e591c48308a6f7d9cd1db9c9892303453ebbbc8f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 24 Feb 2026 15:34:17 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml | 2 +- .../nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9990c46..a0f5488 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 @@ -69,7 +69,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 d.status = '1' and d.del_flag = '0' + where 1=1 and d.status = '1' and o.`status` = '2' and d.del_flag = '0' 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/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml index 25a5d73..1854d97 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml @@ -45,7 +45,7 @@ d.contract_note, d.franchise_time from sys_depart d - d.del_flag = '0' and d.status = '1' + d.del_flag = '0' and d.status = '1' and o.`status` = '2' AND d.org_code IN From a43118f76fc332907cad4c8452dae3faf5fce70e Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 24 Feb 2026 15:48:13 +0800 Subject: [PATCH 08/10] =?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/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml index 1854d97..25a5d73 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml @@ -45,7 +45,7 @@ d.contract_note, d.franchise_time from sys_depart d - d.del_flag = '0' and d.status = '1' and o.`status` = '2' + d.del_flag = '0' and d.status = '1' AND d.org_code IN From 670b84eb14ca634432e90d6e19b008338977647b Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 24 Feb 2026 15:57:55 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=9C=A8=E5=BE=AE=E4=BF=A1=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/mq/suppliers/listener/SuppliersMQListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a6d80b3..8a92207 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 @@ -180,7 +180,7 @@ public class SuppliersMQListener { content1 = "您好，您提交的信息变更已通过"; content2 = "信息变更审核通过"; } else if (StringUtils.equals("modifyFail", suppliersInfoMQDto.getStatus())) { - content1 = "您好，您提交的信息变更未通过"; + content1 = "您好，您提交的信息变更未通过，驳回原因："+suppliersInfoMQDto.getApplyContent(); content2 = "信息变更审核未通过"; } NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity(); From 473a787cb9c636479c66ae4f22d67953ede20643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 24 Feb 2026 16:29:22 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=85=A5=E9=A9=BB?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=88=97=E8=A1=A8sql=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/OrgApplyInfoMapper.xml | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml index 25a5d73..c340544 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml @@ -81,7 +81,32 @@ d.iz_directive_main, d.iz_elder_tag_main, d.media_url, - o.*, + d.tel, + d.name, + d.sex, + d.national, + d.birth_date, + d.id_card_address, + d.id_card, + d.issuing_authority, + d.start_time, + d.end_time, + d.card_zm_path, + d.card_fm_path, + d.com_business_license, + d.com_name, + d.com_register_address, + d.com_credit_code, + d.com_legal_person, + d.org_address, + d.org_leader, + d.org_leader_phone, + d.org_building_number, + d.org_property_type, + d.org_building_area, + d.org_province, + d.org_city, + d.org_district, eo.open_id, eo.employees_id, eo.org_code, @@ -96,11 +121,9 @@ eo.modify_status AS modify_state, eo.iz_history from sys_depart d - inner join nu_org_apply_info o on d.id = o.pk_id inner join nu_biz_employees_org eo on d.org_code = eo.org_code d.status = '1' - and o.status = '2' and d.del_flag = '0' AND eo.open_id = #{openId}