From 51b68c9bdd5b5c851dc40a529aeaf6af403b41b5 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 24 Dec 2025 15:35:26 +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 ++ .../mapper/NuBizSuppliersApplyMapper.java | 2 ++ .../mapper/xml/NuBizSuppliersApplyMapper.xml | 20 +++++++++++++++++++ .../impl/NuBizSuppliersApplyServiceImpl.java | 7 +++++++ .../wechat/suppliers/SuppliersApi.java | 10 ++++++++++ .../com/nu/entity/SuppliersOrgAllEntity.java | 2 ++ 6 files changed, 43 insertions(+) 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 f49ab8f..c3f5a79 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 @@ -22,4 +22,6 @@ public interface ISuppliersApi { SuppliersApplyEntity editSuppliers(SuppliersApplyEntity suppliersApplyEntity); SuppliersApplyEntity getSupInfoByOpenId(String openId); + + 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/NuBizSuppliersApplyMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersApplyMapper.java index f07bf57..2d75b85 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersApplyMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersApplyMapper.java @@ -20,4 +20,6 @@ public interface NuBizSuppliersApplyMapper extends BaseMapper getSuppliersOrgInfo(IPage page,@Param("orgCode") String orgCode,@Param("title") String title,@Param("openId") String openId); IPage getApplySuppliersOrgInfo(IPage page,@Param("orgCode") String orgCode,@Param("title") String title,@Param("openId") String openId); + + IPage getSuppliersAuditLog(IPage page,@Param("openId") 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 897e22e..c9f498c 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 @@ -11,6 +11,7 @@ o.org_leader_phone, o.org_address, s.`status` as suppliers_status + ,s.audit_content 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} @@ -35,6 +36,7 @@ o.org_leader_phone, o.org_address ,s.`status` as suppliers_status + ,s.audit_content 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 @@ -50,4 +52,22 @@ and title like concat('%',#{title},'%') + + \ No newline at end of file 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 1d06678..5c83799 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 @@ -190,4 +190,11 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId) { + IPage page = new Page<>(pageNo, pageSize); + IPage list = baseMapper.getSuppliersAuditLog(page, openId); + return list; + } + } 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 71eeb79..a253a73 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 @@ -119,4 +119,14 @@ public class SuppliersApi { return Result.OK(result); } + + @GetMapping(value = "/getSuppliersAuditLog") + public Result> getSuppliersAuditLog( + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize, + @RequestParam(value = "openId") String openId) { + IPage result = suppliersApi.getSuppliersAuditLog(pageNo, pageSize, openId); + 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 9d8e82a..91b0a44 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 @@ -35,4 +35,6 @@ public class SuppliersOrgAllEntity implements Serializable { private String serverUrl; + private String auditContent; + }