Merge remote-tracking branch 'origin/master'

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);
     }
 
+}
+

src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java

@@ -11,4 +11,7 @@ public interface OcpTenantIocnMapper extends BaseMapper<OcpTenantIocn> {
 
 
     OcpTenantIocn selectCode(String tenantCode);
+
+    //查询轮播图
+    OcpTenantIocn selectCodes(String tenantCode);
 }

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;
     }

src/main/java/com/pms/ocp/service/OcpTenantIocnService.java

@@ -15,4 +15,11 @@ public interface OcpTenantIocnService extends IService<OcpTenantIocn> {
      * @return
      */
     List<OcpTenantGroupIocnDto> getApplyUserList();
+
+    /**
+     * 我的应用--轮播图
+     * @param tenantCode
+     * @return
+     */
+    byte[] selectPhotosAll(String tenantCode);
 }

src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java

@@ -80,4 +80,17 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
 
     }
 
+    /**
+     * 我的应用--轮播图
+     *
+     * @param tenantCode
+     * @return
+     */
+    @Override
+    public byte[] selectPhotosAll(String tenantCode) {
+        OcpTenantIocn ocpTenantIocn = ocpTenantIocnMapper.selectCodes(tenantCode);
+        byte[] iocn = ocpTenantIocn.getIocn();
+        return ocpTenantIocn.getIocn();
+    }
+
 }

src/main/resources/mapper/OcpTenantBaseMapper.xml

@@ -14,12 +14,7 @@
 
     <select id="selectAlls" resultType="com.pms.ocp.model.dto.OcpTenantGroupIocnDto">
        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;
     </select>
 
-
-
-
-
-
 </mapper>
\ No newline at end of file

src/main/resources/mapper/OcpTenantIocnMapper.xml

@@ -7,4 +7,10 @@
         select *  from  ocp_tenant_iocn  WHERE code_no = #{tenanCode};
     </select>
 
+
+    <select id="selectCodes" resultType="com.pms.ocp.model.entity.OcpTenantIocn">
+        select *  from  ocp_tenant_iocn  WHERE code_no = #{tenanCode} and iocn_kind = 'Tenant_swiper';
+    </select>
+
+
 </mapper>
\ No newline at end of file