공지사항 수정 및 가맹점등록 기능 mapper ,xml 작업

src/main/java/com/oqpo/api/entity/stinfo/AfflSaleInfoEntity.java

@@ -0,0 +1,27 @@
+package com.oqpo.api.entity.stinfo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class AfflSaleInfoEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String afflShopId ;
+    private String afflShopNm ;
+    private String saleMgrId ;
+    private String saleMgrNm ;
+    private String delYn ;
+    private String sysRregDttm ;
+    private String sysRegId ;
+    private String sysChgDttm ;
+    private String sysChgId ;
+
+    private SaleMgrMgntEntity saleMgrInfo ;
+
+}

src/main/java/com/oqpo/api/entity/stinfo/AfflShopBaseInfoEntity.java

@@ -0,0 +1,55 @@
+package com.oqpo.api.entity.stinfo;
+
+import com.oqpo.api.entity.CodeEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+public class AfflShopBaseInfoEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String afflShopId ;
+    private String afflShopNm ;
+    private String stCd ;
+    private String stNm ;
+    private String afflAbbr ;
+    private String bsnsRegNo ;
+    private String corpRegNo ;
+    private String authType ;
+    private String authTypeNm;
+    private String bsnsCndt ;
+    private String ctgrBsns ;
+    private String ownerNm ;
+    private String ownerTelNo ;
+    private String rprstFaxNo ;
+    private String rprstEmail ;
+    private String zipNo ;
+    private String addr1 ;
+    private String addr2 ;
+    private String rprstTelNo ;
+    private String latX ;
+    private String longY ;
+    private String regDt ;
+    private String regTm ;
+    private String regId ;
+    private String joinSttDt ;
+    private String joinEndDt ;
+    private String cmpnyLogoFileNo ;
+    private String delYn ;
+    private String corpType ;
+    private String corpTypeNm;
+    private String sysRregDttm ;
+    private String sysRegId ;
+    private String sysChgDttm ;
+    private String sysChgId ;
+    private String joinDt;
+
+    private List<AfflSaleInfoEntity> afflSaleInfo;
+
+}

src/main/java/com/oqpo/api/entity/stinfo/SaleMgrMgntEntity.java

@@ -0,0 +1,36 @@
+package com.oqpo.api.entity.stinfo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class SaleMgrMgntEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String saleMgrId  ;
+    private String saleMgrNm  ;
+    private String stCd  ;
+    private String stNm  ;
+    private String saleType  ;
+    private String saleTypeNm  ;
+    private String pswd  ;
+    private String rprstTelNo  ;
+    private String rprstFaxNo  ;
+    private String rprstEmal  ;
+    private String zipNo  ;
+    private String addr1  ;
+    private String addr2  ;
+    private String regDt  ;
+    private String regId  ;
+    private String reg_tm  ;
+    private String sysRegDttm  ;
+    private String sysRegId  ;
+    private String sysChgDttm  ;
+    private String sysChgId  ;
+
+}

src/main/java/com/oqpo/api/mapper/stinfo/AfflShopBaseInfoMapper.java

@@ -0,0 +1,32 @@
+package com.oqpo.api.mapper.stinfo;
+
+import com.oqpo.api.entity.CodeEntity;
+import com.oqpo.api.entity.stinfo.AfflSaleInfoEntity;
+import com.oqpo.api.entity.stinfo.AfflShopBaseInfoEntity;
+import com.oqpo.api.web.dto.request.GridRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AfflShopBaseInfoMapper {
+
+    int selectAfflShopGridList(@Param("userId") String userId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sAfflShopNm") String sAfflShopNm )throws Exception;
+
+    List<AfflShopBaseInfoEntity> selectAfflShopGridList(@Param("userId") String userId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sAfflShopNm") String sAfflShopNm , GridRequest gridRequest)throws Exception;
+
+    String selectAfflShopBaseIdDupYn(@Param("afflShopId") String afflShopId)   throws Exception;
+
+    int insertAfflShopBaseInfo(@Param("userId") String userId, AfflShopBaseInfoEntity entity) throws Exception;
+    int updateAfflShopBaseInfo(@Param("userId") String userId, AfflShopBaseInfoEntity entity) throws Exception;
+
+    int insertAfflSaleInfo(@Param("userId") String userId, List<AfflSaleInfoEntity> gridInsertData) throws Exception;
+
+    int deleteUserAuth(@Param("userId") String userId, List<AfflSaleInfoEntity> gridUpdateData) throws Exception;
+
+    AfflShopBaseInfoEntity selectAfflShopBaseInfo(@Param("afflShopId") String afflShopId)   throws Exception;
+
+    List<AfflSaleInfoEntity> selectAfflSaleTargetList(@Param("afflShopId") String afflShopId , GridRequest gridRequest)throws Exception;
+    int selectAfflSaleTargetCnt(@Param("afflShopId") String afflShopId)throws Exception;
+}

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

@@ -37,10 +37,7 @@
             and    A.brand_id = #{sBrandId}
         </if>
         <if test="fromDt != null and fromDt != '' and  toDt != null and toDt != ''  ">
-            <![CDATA[
-            and A.noti_st_day >= #{fromDt}
-            and A.noti_ed_day <= #{toDt}
-            ]]>
+            and A.noti_st_day between #{fromDt} and #{toDt}
         </if>
         <if test="sNticeTitl != null and sNticeTitl != '' ">
         and A.ntice_titl like concat('%', #{sNticeTitl}, '%')
@@ -93,10 +90,7 @@
             and    A.brand_id = #{sBrandId}
         </if>
         <if test="fromDt != null and fromDt != '' and  toDt != null and toDt != ''  ">
-            <![CDATA[
-            and A.noti_st_day >= #{fromDt}
-            and A.noti_ed_day <= #{toDt}
-            ]]>
+            and A.noti_st_day between #{fromDt} and #{toDt}
         </if>
         <if test="sNticeTitl != null and sNticeTitl != '' ">
             and A.ntice_titl like concat('%', #{sNticeTitl}, '%')

src/main/resources/mybatis/sqlmaps/stinfo/AfflShopBaseInfo.xml

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oqpo.api.mapper.stinfo.AfflShopBaseInfoMapper">
+    <select id="selectAfflShopGridList" resultType="com.oqpo.api.entity.stinfo.AfflShopBaseInfoEntity">
+        select  /* selectAfflShopGridList */
+              affl_shop_id, affl_shop_nm, corp_type, st_cd, fn_code_nm('ST_CD', st_cd) as st_nm,  owner_nm
+              , concat(date_format(reg_dt,'%Y-%m-%d'), ' ~ ', date_format(reg_dt,'%Y-%m-%d')) as join_dt
+        from affl_shop_base_info
+        where 1=1
+        and   st_cd = 'S000'
+        <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
+        and   join_stt_dt between  #{fromDt} and #{toDt}
+        </if>
+        <if test="sAfflShopNm != null and sAfflShopNm != ''">
+        and   affl_shop_nm like concat('%',#{sAfflShopNm},'%')
+        </if>
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by affl_shop_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by affl_shop_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by affl_shop_nm asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+
+    <select id="selectAfflShopGridCnt" resultType="int">
+        select  /* selectAfflShopGridCnt */
+                count(*) as cnt
+        from affl_shop_base_info
+        where 1=1
+        and   st_cd = 'S000'
+        <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
+            and   join_stt_dt between  #{fromDt} and #{toDt}
+        </if>
+        <if test="sAfflShopNm != null and sAfflShopNm != ''">
+            and   affl_shop_nm like concat('%',#{sAfflShopNm},'%')
+        </if>
+    </select>
+
+
+    <select id="selectAfflShopBaseIdDupYn" resultType="String">
+        select  /* selectAfflShopBaseIdDupYn */
+                case when count(*) <![CDATA[ > ]]> 0 then 'Y' else 'N' end as dup_yn
+        from affl_shop_base_info
+        where affl_shop_id = #{afflShopId}
+    </select>
+
+    <insert id="insertAfflShopBaseInfo" >
+        insert into affl_shop_base_info  /* insertAfflShopBaseInfo */
+            ( affl_shop_id , affl_shop_nm, st_cd, affl_abbr, bsns_reg_no, corp_reg_no, auth_type, bsns_cndt, ctgr_bsns, owner_nm,
+             owner_tel_no, rprst_fax_no, rprst_email, zip_no, addr1, addr2, rprst_tel_no, lat_x, long_y, reg_dt, reg_tm, reg_id, join_stt_dt, join_end_dt,
+             cmpny_logo_file_no, del_yn, corp_type, sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id )
+        values
+           (#{entity.afflShopId}, #{entity.afflShopNm}, #{entity.stCd}, #{entity.afflAbbr},  #{entity.bsnsRegNo}, #{entity.corpRegNo}, #{entity.authType}, #{entity.bsnsCndt}, #{entity.ctgrBsns}, #{entity.ownerNm},
+            #{entity.ownerTelNo}, #{entity.rprstFaxNo}, #{entity.rprstEmail}, #{entity.zipNo}, #{entity.addr1}, #{entity.addr2}, #{entity.rprstTelNo}, #{entity.latX}, #{entity.longY}, #{entity.regDt}, '000000', #{userId}, #{entity.joinSttDt}, #{entity.joinEndDt},
+            #{entity.cmpnyLogoFileNo}, 'N', #{entity.corpType}, now(), #{userId}, now(), #{userId} )
+    </insert>
+
+    <update id="updateAfflShopBaseInfo">
+        update affl_shop_base_info  /* updateAfflShopBaseInfo */
+        set
+           affl_shop_nm = #{entity.afflShopNm  }
+           ,st_cd = #{entity.stCd }
+           ,bsns_reg_no = #{entity.bsnsRegNo }
+           ,corp_reg_no = #{entity.corpRegNo }
+           ,auth_type = #{entity.authType }
+           ,bsns_cndt = #{entity.bsnsCndt }
+           ,ctgr_bsns = #{entity.ctgrBsns }
+           ,owner_nm = #{entity.ownerNm }
+           ,owner_tel_no = #{entity.ownerTelNo }
+           ,rprst_fax_no = #{entity.rprstFaxNo }
+           ,rprst_email = #{entity.rprstEmail }
+           ,zip_no = #{entity.zipNo }
+           ,addr1 = #{entity.addr1 }
+           ,addr2 = #{entity.addr2 }
+           ,rprst_tel_no = #{entity.rprstTelNo }
+           ,lat_x = #{entity.latX }
+           ,long_y = #{entity.longY }
+           ,join_stt_dt = #{entity.joinSttDt }
+           ,join_end_dt = #{entity.joinEndDt }
+           ,cmpny_logo_file_no = #{entity.cmpnyLogoFileNo }
+           ,corp_type = #{entity.corpType }
+           ,sys_chg_dttm = now()
+           ,sys_chg_id = #{userId }
+        where affl_shop_id  = #{entity.afflShopId }
+    </update>
+
+    <insert id="insertAfflSaleInfo" >
+        insert into /** insertAfflSaleInfo */ affl_sale_info
+        (affl_shop_id, sale_mgr_id, sys_reg_dtm, sys_reg_id, sys_chg_dtm, sys_chg_id)
+        values
+        <foreach collection="gridInsertData" item="item" separator=",">
+            ( #{item.afflShopId},#{item.saleMgrId}, now(), #{userId}, now(), #{userId})
+        </foreach>
+    </insert>
+
+    <update id="deleteUserAuth">
+        update affl_sale_info
+        set    del_yn = 'Y'
+        where  affl_shop_id = #{afflShopId}
+        and    saleMgrId   in
+        <foreach collection="gridDeleteData" item="item" separator="," open="(" close=")">
+            #{item.saleMgrId}
+        </foreach>
+    </update>
+
+    <select id="selectAfflShopBaseInfo" resultType="com.oqpo.api.entity.stinfo.AfflShopBaseInfoEntity">
+        select
+               affl_shop_id , affl_shop_nm, fn_code_nm('ST_CD',st_cd) as st_cd_nm
+                 , affl_abbr, bsns_reg_no, corp_reg_no
+               , auth_type, fn_code_nm('AUTH_TYPE',auth_type) as auth_type_nm, bsns_cndt, ctgr_bsns, owner_nm
+               , fn_get_telno(owner_tel_no) as owner_tel_no, fn_get_telno(rprst_fax_no) as rprst_fax_no, rprst_email, zip_no, addr1, addr2, rprst_tel_no, lat_x, long_y
+                , date_format(reg_dt,'%Y-%m-%d') as reg_dt, reg_id, concat(date_format(reg_dt,'%Y-%m-%d'), ' ~ ', date_format(reg_dt,'%Y-%m-%d')) as join_dt
+               , cmpny_logo_file_no, del_yn, fn_code_nm('CORP_TYPE',corp_type) as corp_type, sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id
+         from affl_shop_base_info
+         where affl_shop_id  = #{afflShopId}
+    </select>
+
+    <select id="selectAfflSaleTargetList" resultType="com.oqpo.api.entity.stinfo.AfflSaleInfoEntity">
+        select sinfo.affl_shop_id , sinfo.sale_mgr_id, mgrm.sale_mgr_nm  as 'saleMgrInfo.sale_mget_nm', mgrm.rprst_emal as 'saleMgrInfo.rprst_emal'
+                ,fn_get_telno(mgrm.rprst_tel_no)   as 'saleMgrInfo.rprst_tel_no'
+                , mgrm.st_cd as 'saleMgrInfo.st_cd', fn_code_nm('ST_CD',mgrm.st_cd) as 'saleMgrInfo.st_nm'
+        from affl_sale_info  sinfo
+        join sale_mgr_mgnt mgrm on sinfo.sale_mgr_id = mgrm.sale_mgr_id and mgrm.st_cd <![CDATA[ <> ]]> 'S001'
+        where sinfo.del_yn = 'N'
+        and   sinfo.affl_shop_id = #{affl_shop_id}
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by mgrm.sale_mgr_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by mgrm.sale_mgr_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by mgrm.sale_mgr_nm asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectAfflSaleTargetCnt" resultType="int">
+        select count(*)
+        from affl_sale_info
+        where affl_shop_id = #{affl_shop_id}
+        and   del_yn = 'N'
+    </select>
+
+
+</mapper>