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 cb5a618..a019819 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 @@ -24,7 +24,7 @@ public interface ISuppliersApi { SuppliersApplyEntity getSupInfoByOpenId(String openId,String id); - IPage getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId); + IPage getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId); boolean nameDuplicateChecked(SuppliersApplyEntity suppliersApplyEntity); 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 2faeb73..067622e 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.entity.SuppliersApplyEntity; import com.nu.entity.SuppliersOrgAllEntity; import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity; import org.apache.ibatis.annotations.Param; @@ -24,7 +25,7 @@ public interface NuBizSuppliersApplyMapper extends BaseMapper getApplySuppliersOrgInfo(IPage page,@Param("orgCode") String orgCode,@Param("title") String title,@Param("openId") String openId); - IPage getSuppliersAuditLog(IPage page,@Param("openId") String openId); + IPage getSuppliersAuditLog(IPage page, @Param("openId") String openId); IPage listPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 f14fdc1..662c9d9 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 @@ -53,22 +53,11 @@ - select - s.id as id, - d.id as org_id, - d.depart_name, - d.org_code, - concat(d.url,d.context_path) as server_url, - d.org_leader, - d.org_leader_phone, - d.org_address - ,s.`status` as suppliers_status - ,s.audit_content - ,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' and d.`status` ='1' and iz_history = 'N' + s.* + from nu_biz_suppliers_apply s + where 1=1 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/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java index 4aa51ba..78f3ded 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 @@ -234,9 +234,9 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId) { - IPage page = new Page<>(pageNo, pageSize); - IPage list = baseMapper.getSuppliersAuditLog(page, openId); + public IPage 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 c26ee85..bc3ac0f 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 @@ -130,11 +130,11 @@ public class SuppliersApi { @GetMapping(value = "/getSuppliersAuditLog") - public Result> 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); + IPage result = suppliersApi.getSuppliersAuditLog(pageNo, pageSize, openId); return Result.OK(result); }