yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2026-03-04 13:12:10 +08:00
parent 5c82611009
commit ecd770cc3d
5 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java
View File

@ -24,7 +24,7 @@ public interface ISuppliersApi {
SuppliersApplyEntity getSupInfoByOpenId(String openId,String id);
IPage<SuppliersOrgAllEntity> getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId);
IPage<SuppliersApplyEntity> getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId);
boolean nameDuplicateChecked(SuppliersApplyEntity suppliersApplyEntity);

3
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersApplyMapper.java
View File

@ -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<NuBizSuppliersAppl
IPage<SuppliersOrgAllEntity> getApplySuppliersOrgInfo(IPage<SuppliersOrgAllEntity> page,@Param("orgCode") String orgCode,@Param("title") String title,@Param("openId") String openId);
IPage<SuppliersOrgAllEntity> getSuppliersAuditLog(IPage<SuppliersOrgAllEntity> page,@Param("openId") String openId);
IPage<SuppliersApplyEntity> getSuppliersAuditLog(IPage<SuppliersApplyEntity> page, @Param("openId") String openId);
IPage<NuBizSuppliersApply> listPage(Page<NuBizSuppliersApply> page, @Param(Constants.WRAPPER) QueryWrapper<NuBizSuppliersApply> queryWrapper);
}

19
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml
View File

@ -53,22 +53,11 @@
</if>
</select>
<select id="getSuppliersAuditLog" resultType="com.nu.entity.SuppliersOrgAllEntity">
<select id="getSuppliersAuditLog" resultType="com.nu.entity.SuppliersApplyEntity">
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
</select>

6
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java
View File

@ -234,9 +234,9 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
}
@Override
public IPage<SuppliersOrgAllEntity> getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId) {
IPage<SuppliersOrgAllEntity> page = new Page<>(pageNo, pageSize);
IPage<SuppliersOrgAllEntity> list = baseMapper.getSuppliersAuditLog(page, openId);
public IPage<SuppliersApplyEntity> getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId) {
IPage<SuppliersApplyEntity> page = new Page<>(pageNo, pageSize);
IPage<SuppliersApplyEntity> list = baseMapper.getSuppliersAuditLog(page, openId);
return list;
}

4
nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java
View File

@ -130,11 +130,11 @@ public class SuppliersApi {
@GetMapping(value = "/getSuppliersAuditLog")
public Result<IPage<SuppliersOrgAllEntity>> getSuppliersAuditLog(
public Result<IPage<SuppliersApplyEntity>> getSuppliersAuditLog(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize,
@RequestParam(value = "openId") String openId) {
IPage<SuppliersOrgAllEntity> result = suppliersApi.getSuppliersAuditLog(pageNo, pageSize, openId);
IPage<SuppliersApplyEntity> result = suppliersApi.getSuppliersAuditLog(pageNo, pageSize, openId);
return Result.OK(result);
}