공지사항 리스트 출력

src/main/java/com/oqpo/api/entity/oper/NticeEntity.java

@@ -1,5 +1,6 @@
 package com.oqpo.api.entity.oper;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -12,6 +13,10 @@ import java.io.Serializable;
 public class NticeEntity implements Serializable {
     private static final long serialVersionUID = -3590936033715917450L;
 
+    private String afflShopId;
+    private String afflShopNm;
+    private String brandId;
+    private String brandNm;
     private String nticeNo;
     private String targetCd;
     private String targetNm;

src/main/java/com/oqpo/api/mapper/oper/NticeMapper.java

@@ -11,10 +11,13 @@ import java.util.List;
 
 @Mapper
 public interface NticeMapper {
-    List<NticeEntity> selectNticeGridList(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("schDt") String schDt,
-                                          @Param("userId") String userId, @Param("sNticeTitl") String sNticeTitl, GridRequest gridRequest)throws Exception;
-    int selectNticeGridCnt(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("schDt") String schDt,
-                           @Param("userId") String userId, @Param("sNticeTitl") String sNticeTitl) throws Exception;
+    List<NticeEntity> selectNticeGridList(@Param("afflShopId") String afflShopId, @Param("brandId") String brandId, @Param("authTpCd") String authTpCd,
+                                          @Param("sAfflShopId") String sAfflShopId, @Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt,
+                                          @Param("sNticeTitl") String sNticeTitl, GridRequest gridRequest)throws Exception;
+
+    int selectNticeGridCnt(@Param("afflShopId") String afflShopId, @Param("brandId") String brandId, @Param("authTpCd") String authTpCd,
+                           @Param("sAfflShopId") String sAfflShopId, @Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt,
+                           @Param("sNticeTitl") String sNticeTitl) throws Exception;
 
     List<NticeTargetEntity> selectNticeTargetGridList(@Param("nticeNo") String nticeNo, GridRequest gridRequest)throws Exception;
     int selectNticeTargetGridCnt(@Param("nticeNo") String nticeNo) throws Exception;

src/main/java/com/oqpo/api/service/oper/NticeService.java

@@ -29,29 +29,35 @@ public class NticeService extends CommonService {
     /*
       공지 검색 리스트 조회
      */
-    public GridResponse selectNticeGridList(String fromDt, String toDt, String schDt, String userId, String sNticeTitl, GridRequest gridRequest) throws Exception {
+
+    public GridResponse selectNticeGridList(String afflShopId, String brandId, String authTpCd, String sAfflShopId, String sBrandId, String fromDt, String toDt, String sNticeTitl, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
         fromDt = fromDt == null ? null : fromDt.replace(".", "");
         toDt = toDt == null ? null : toDt.replace(".", "");
-        schDt = schDt == null ? null : schDt.replace(".", "");
 
-        int gridRecords = nticeMapper.selectNticeGridCnt(fromDt, toDt, schDt, userId, sNticeTitl);
+        int gridRecords = nticeMapper.selectNticeGridCnt(afflShopId, brandId, authTpCd, sAfflShopId, sBrandId, fromDt, toDt, sNticeTitl);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<NticeEntity> entities = nticeMapper.selectNticeGridList(fromDt, toDt, schDt, userId, sNticeTitl, gridRequest);
+        List<NticeEntity> entities = nticeMapper.selectNticeGridList(afflShopId, brandId, authTpCd, sAfflShopId, sBrandId, fromDt, toDt, sNticeTitl, gridRequest);
+
         List<Object> gridRows = entities.stream()
                 .map(m -> NticeSearchResponse.builder()
                         .viewCd("R")
+                        .afflShopId(m.getAfflShopId()  == null ? "" : m.getAfflShopId() )
+                        .afflShopNm(m.getAfflShopNm()  == null ? "" : m.getAfflShopNm() )
+                        .brandId(m.getBrandId()  == null ? "" : m.getBrandId())
+                        .brandNm(m.getBrandNm()  == null ? "" : m.getBrandNm())
                         .nticeNo(m.getNticeNo())
                         .nticeTitl(m.getNticeTitl() == null ? "" : m.getNticeTitl())
-                        .targetCd(m.getTargetCd())
-                        .targetNm(m.getTargetNm())
+                        .targetCd(m.getTargetCd() == null ? "" : m.getTargetCd())
+                        .targetNm(m.getTargetNm() == null ? "" : m.getTargetNm())
                         .nticeStatNm(m.getNticeStatNm())
                         .notiStDay(m.getNotiStDay())
                         .addDt(m.getAddDt())
                         .build())
                 .collect(Collectors.toList());
+
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 

src/main/java/com/oqpo/api/web/controller/oper/NticeController.java

@@ -37,14 +37,14 @@ public class NticeController {
      * @return
      * @throws Exception
      */
+
     @ApiImplicitParams({
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
     })
     @ApiOperation(value = " 공지 그리드 리스트")
     @PostMapping("/detail-grid-list")
-    public ResponseEntity<GridResponse> detailGridList(@RequestBody @Valid NticeGridRequest nticeGridRequest) throws Exception {
-        return ResponseEntity.ok(nticeService.selectNticeGridList(nticeGridRequest.getFromDt(), nticeGridRequest.getToDt(), nticeGridRequest.getSchDt(),
-                nticeGridRequest.getUserId(), nticeGridRequest.getSNticeTitl(), nticeGridRequest.toDTO(nticeGridRequest)));
+    public ResponseEntity<GridResponse> detailGridList(@ApiIgnore String afflShopId,@ApiIgnore String brandId,@ApiIgnore String authTpCd,@RequestBody @Valid NticeGridRequest nticeGridRequest) throws Exception {
+        return ResponseEntity.ok(nticeService.selectNticeGridList( afflShopId, brandId, authTpCd, nticeGridRequest.getSAfflShopId(), nticeGridRequest.getSBrandId(), nticeGridRequest.getFromDt(), nticeGridRequest.getToDt(), nticeGridRequest.getSNticeTitl(),  nticeGridRequest.toDTO(nticeGridRequest)));
     }
 
     /**

src/main/java/com/oqpo/api/web/dto/request/oper/ntice/NticeGridRequest.java

@@ -10,23 +10,21 @@ import lombok.Setter;
 @Setter
 public class NticeGridRequest extends GridRequest {
 
+    @ApiModelProperty(value = "가맹점아이디")
+    private String sAfflShopId;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
     @ApiModelProperty(value = "시작일")
     private String fromDt;
 
     @ApiModelProperty(value = "종료일")
     private String toDt;
 
-    @ApiModelProperty(value = "조회일자")
-    private String schDt;
-
     @ApiModelProperty(value = "타이틀")
     private String sNticeTitl;
 
-    @ApiModelProperty(value = "상태")
-    private String sNticeStatNm;
-
-    @ApiModelProperty(value = "사용자ID")
-    private String userId;
 
     protected NticeGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
         super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);

src/main/java/com/oqpo/api/web/dto/response/oper/ntice/NticeSearchResponse.java

@@ -14,6 +14,18 @@ public class NticeSearchResponse {
     @ApiModelProperty(value = "CRUD")
     private String viewCd;
 
+    @ApiModelProperty(value = "가맹점아이디")
+    private String afflShopId;
+
+    @ApiModelProperty(value = "가맹점명")
+    private String afflShopNm;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+
     @ApiModelProperty(value = "공지번호")
     private String nticeNo;
 

src/main/resources/mybatis/sqlmaps/oper/Ntice.xml

@@ -4,30 +4,46 @@
 <mapper namespace="com.oqpo.api.mapper.oper.NticeMapper">
     <select id="selectNticeGridList" resultType="com.oqpo.api.entity.oper.NticeEntity">
         select /* Ntice.selectNticeGridList*/
+                A.affl_shop_id, A.brand_id, fn_affl_nm(A.affl_shop_id) as affl_shop_nm, fn_brand_nm(A.brand_id) as brand_nm,
                 A.ntice_no, A.ntice_titl, A.target_cd, fn_code_nm('TARGET_CD', A.target_cd) as target_nm
                 , case when  date_format(now(),'%Y%m%d') <![CDATA[ >= ]]> A.noti_st_day and date_format(now(),'%Y%m%d') <![CDATA[ <= ]]> A.noti_ed_day then '공지중'
                 when  date_format(now(),'%Y%m%d') <![CDATA[ < ]]> A.noti_st_day then '대기'
                 when  date_format(now(),'%Y%m%d') <![CDATA[ > ]]> A.noti_ed_day then '공지종료' end as ntice_stat_nm
                 ,date_format(A.noti_st_day ,'%Y.%m.%d') as noti_st_day, date_format(A.add_dt ,'%Y.%m.%d') as add_dt
         from np_ntice A
-        <if test="schDt != null and schDt != '' ">
-        left join np_ntice_target B on A.ntice_no = B.ntice_no and B.user_id = #{userId}
-        </if>
         where 1=1
-        <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
-            and A.noti_st_day  between #{fromDt} and #{toDt}
+        and A.brand_id in (select B.brand_id from np_ntice_target B where B.ntice_no = A.ntice_no )
+        <if test="authTpCd == '30'">
+         and A.affl_shop_id = #{afflShopId}
+        </if>
+        <if test="authTpCd == '40' ">
+            and A.brand_id = #{brandId}
+            and A.brand_chk = 'Y'
+        </if>
+        <if test="authTpCd == '50' ">
+            and A.brand_id = #{brandId}
+            and A.shop_chk = 'Y'
+        </if>
+        <if test="authTpCd == '60' ">
+            and A.brand_id = #{brandId}
+            and A.supply_chk = 'Y'
+        </if>
+        <if test="sAfflShopId != null and sAfflShopId != ''">
+            and    affl_shop_id = #{sAfflShopId}
+        </if>
+        <if test="sBrandId != null and sBrandId != ''">
+            and    brand_id = #{sBrandId}
         </if>
-        <if test="schDt != null and schDt != '' ">
+        <if test="fromDt != null and fromDt != '' and  toDt != null and toDt != ''  ">
             <![CDATA[
-            and A.noti_st_day <= #{schDt}
-            and A.noti_ed_day >= #{schDt}
-            and A.del_yn = 'N'
-            and (A.target_cd = 'A' or (A.target_cd = 'T' and B.user_id is not null))
+            and A.noti_st_day >= #{fromDt}
+            and A.noti_ed_day <= #{toDt}
             ]]>
         </if>
         <if test="sNticeTitl != null and sNticeTitl != '' ">
         and A.ntice_titl like concat('%', #{sNticeTitl}, '%')
         </if>
+        and A.del_yn = 'N'
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
@@ -51,24 +67,39 @@
     <select id="selectNticeGridCnt" resultType="int">
         select count(*) as cnt  /* Ntice.selectNticeGridCnt*/
         from np_ntice A
-        <if test="schDt != null and schDt != '' ">
-            left join np_ntice_target B on A.ntice_no = B.ntice_no and B.user_id = #{userId}
-        </if>
         where 1=1
-        <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
-            and A.noti_st_day  between #{fromDt} and #{toDt}
+        and A.brand_id in (select B.brand_id from np_ntice_target B where B.ntice_no = A.ntice_no )
+        <if test="authTpCd == '30'">
+            and A.affl_shop_id = #{afflShopId}
+        </if>
+        <if test="authTpCd == '40' ">
+            and A.brand_id = #{brandId}
+            and A.brand_chk = 'Y'
+        </if>
+        <if test="authTpCd == '50' ">
+            and A.brand_id = #{brandId}
+            and A.shop_chk = 'Y'
+        </if>
+        <if test="authTpCd == '60' ">
+            and A.brand_id = #{brandId}
+            and A.supply_chk = 'Y'
+        </if>
+        <if test="afflShopId != null and afflShopId != ''">
+            and    affl_shop_id = #{afflShopId}
+        </if>
+        <if test="brandId != null and brandId != ''">
+            and    brand_id = #{brandId}
         </if>
-        <if test="schDt != null and schDt != '' ">
+        <if test="fromDt != null and fromDt != '' and  toDt != null and toDt != ''  ">
             <![CDATA[
-            and A.noti_st_day <= #{schDt}
-            and A.noti_ed_day >= #{schDt}
-            and A.del_yn = 'N'
-            and (A.target_cd = 'A' or (A.target_cd = 'T' and B.user_id is not null))
+            and A.noti_st_day >= #{fromDt}
+            and A.noti_ed_day <= #{toDt}
             ]]>
         </if>
         <if test="sNticeTitl != null and sNticeTitl != '' ">
             and A.ntice_titl like concat('%', #{sNticeTitl}, '%')
         </if>
+        and A.del_yn = 'N'
     </select>
 
     <select id="selectNticeInfo" resultType="com.oqpo.api.entity.oper.NticeEntity">