修改bug
This commit is contained in:
parent
df9cac6bcf
commit
51b68c9bdd
|
|
@ -22,4 +22,6 @@ public interface ISuppliersApi {
|
||||||
SuppliersApplyEntity editSuppliers(SuppliersApplyEntity suppliersApplyEntity);
|
SuppliersApplyEntity editSuppliers(SuppliersApplyEntity suppliersApplyEntity);
|
||||||
|
|
||||||
SuppliersApplyEntity getSupInfoByOpenId(String openId);
|
SuppliersApplyEntity getSupInfoByOpenId(String openId);
|
||||||
|
|
||||||
|
IPage<SuppliersOrgAllEntity> getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,4 +20,6 @@ public interface NuBizSuppliersApplyMapper extends BaseMapper<NuBizSuppliersAppl
|
||||||
IPage<SuppliersOrgAllEntity> getSuppliersOrgInfo(IPage<SuppliersOrgAllEntity> page,@Param("orgCode") String orgCode,@Param("title") String title,@Param("openId") String openId);
|
IPage<SuppliersOrgAllEntity> getSuppliersOrgInfo(IPage<SuppliersOrgAllEntity> page,@Param("orgCode") String orgCode,@Param("title") String title,@Param("openId") String openId);
|
||||||
|
|
||||||
IPage<SuppliersOrgAllEntity> getApplySuppliersOrgInfo(IPage<SuppliersOrgAllEntity> page,@Param("orgCode") String orgCode,@Param("title") String title,@Param("openId") String openId);
|
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);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@
|
||||||
o.org_leader_phone,
|
o.org_leader_phone,
|
||||||
o.org_address,
|
o.org_address,
|
||||||
s.`status` as suppliers_status
|
s.`status` as suppliers_status
|
||||||
|
,s.audit_content
|
||||||
from sys_depart d
|
from sys_depart d
|
||||||
left join nu_org_apply_info o on d.id = o.pk_id
|
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}
|
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_leader_phone,
|
||||||
o.org_address
|
o.org_address
|
||||||
,s.`status` as suppliers_status
|
,s.`status` as suppliers_status
|
||||||
|
,s.audit_content
|
||||||
from sys_depart d
|
from sys_depart d
|
||||||
left join nu_org_apply_info o on d.id = o.pk_id
|
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
|
left join nu_biz_suppliers_org s on d.org_code = s.org_code
|
||||||
|
|
@ -50,4 +52,22 @@
|
||||||
and title like concat('%',#{title},'%')
|
and title like concat('%',#{title},'%')
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getSuppliersAuditLog" resultType="com.nu.entity.SuppliersOrgAllEntity">
|
||||||
|
select
|
||||||
|
d.id as org_id,
|
||||||
|
o.com_name as depart_name,
|
||||||
|
d.org_code,
|
||||||
|
d.server_url,
|
||||||
|
o.org_leader,
|
||||||
|
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
|
||||||
|
where 1=1 and o.status = '2' and d.del_flag = '0' and d.server_url is not null
|
||||||
|
and s.open_id = #{openId}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
@ -190,4 +190,11 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@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);
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -119,4 +119,14 @@ public class SuppliersApi {
|
||||||
return Result.OK(result);
|
return Result.OK(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping(value = "/getSuppliersAuditLog")
|
||||||
|
public Result<IPage<SuppliersOrgAllEntity>> 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);
|
||||||
|
return Result.OK(result);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,4 +35,6 @@ public class SuppliersOrgAllEntity implements Serializable {
|
||||||
|
|
||||||
private String serverUrl;
|
private String serverUrl;
|
||||||
|
|
||||||
|
private String auditContent;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue