diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java index 494f999d3184d694c3ef94dd5cb30ea596ec198e..d5017dfe75b3644d42b23e3741b77ddc52aa9be9 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java @@ -77,5 +77,18 @@ public class OcpTenantGroupIocnController { return ResponseVO.ok(ocpTenantDto); } + + /** + * @author:zhaochengming + * @param + * @return + */ + @GetMapping("/selectphoto") + @ApiModelProperty("我的应用--轮播图") + private ResponseVO selectPhotos(String tenantCode) { + byte[] photos = ocpTenantIocnService.selectPhotosAll(tenantCode); + return ResponseVO.ok(photos); } +} + diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java index 3b5a3b1cc8ee3405dfc588e54499fa9b87e9ebf1..da79f95369eb6c75ba836e812bd51c0e3b8d11c6 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java @@ -11,4 +11,7 @@ public interface OcpTenantIocnMapper extends BaseMapper { OcpTenantIocn selectCode(String tenantCode); + + //查询轮播图 + OcpTenantIocn selectCodes(String tenantCode); } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java index 899de495b86e5fa1dac29b16fa1d4ba2137c258d..45384e546a080d4d699f9a3d83c1c69b15585789 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java @@ -51,14 +51,6 @@ public class OcpTenantIocn implements Serializable { @ApiModelProperty(value = "所属公司可能会根据公司分区") private String companyCode; - - - - - - - - public static long getSerialVersionUID() { return serialVersionUID; } diff --git a/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java b/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java index ebfd9f4c9b76b29c5d28b212176e0a0ea0cce04d..5c62f0734fa863e4a398ff50c0ea92c3708cf104 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java @@ -15,4 +15,11 @@ public interface OcpTenantIocnService extends IService { * @return */ List getApplyUserList(); + + /** + * 我的应用--轮播图 + * @param tenantCode + * @return + */ + byte[] selectPhotosAll(String tenantCode); } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java index 1a8e69544161dd521757da916cb44521ccb8bcd6..02e8be9c5291ab4e0d1e89b6db942769e28140f8 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java @@ -80,4 +80,17 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl SELECT * FROM ocp_tenant_base AS base ,ocp_tenant_extent AS extent,ocp_tenant_iocn as iocn - WHERE base.tenant_code = extent.tenant_code and base.tenant_code = code_no ORDER BY base.tenant_mtime DESC; + WHERE base.tenant_code = extent.tenant_code and base.tenant_code = code_no and iocn.iocn_kind is null ORDER BY base.tenant_mtime DESC; - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantIocnMapper.xml b/src/main/resources/mapper/OcpTenantIocnMapper.xml index c4f02381194c07106f71c66fe572e6a3651b9e74..e2188979fe42e34502b753b9f3b2b2d31ed7bc0c 100644 --- a/src/main/resources/mapper/OcpTenantIocnMapper.xml +++ b/src/main/resources/mapper/OcpTenantIocnMapper.xml @@ -7,4 +7,10 @@ select * from ocp_tenant_iocn WHERE code_no = #{tenanCode}; + + + + \ No newline at end of file