Merge branch 'style' into gagamel_onetoone

src/main/java/com/style24/admin/biz/dao/TsaMorebetterDao.java

@@ -267,24 +267,6 @@ public interface TsaMorebetterDao {
      * @since 2021. 3. 22
      */
     void insertMorebetterApplyGoods(MoreBetterGoods moreBetterGoods);
-    
-    /**
-     * 기본상품등록 (다다익선적용상품테이블) 기본상품존재
-     * @param moreBetter
-     * @return
-     * @author jsh77b
-     * @since 2021. 11. 09
-     */
-    void insertMorebetterDefaultGoods(MoreBetterGoods moreBetterGoods);
-    
-    /**
-     * 기본상품등록 (다다익선적용상품테이블) 기본상품없음 적용상품
-     * @param moreBetter
-     * @return
-     * @author jsh77b
-     * @since 2021. 11. 09
-     */
-    void insertMorebetterDefaultGoodsApply(MoreBetterGoods moreBetterGoods);
 
     /**
      * 다다익선 적용상품 temp

src/main/java/com/style24/admin/biz/service/TsaMorebetterService.java

@@ -141,8 +141,12 @@ public class TsaMorebetterService {
      */
     @Transactional("shopTxnManager")
     public void saveMoreBetterDetail(MoreBetter moreBetter) {
+        // <,> replace 처리
         moreBetter.setRegNo(TsaSession.getInfo().getUserNo());
         moreBetter.setUpdNo(TsaSession.getInfo().getUserNo());
+        
+        Gson gson = new Gson();
+        String jsonData = gson.toJson(moreBetter);
 
         if ("U".equals(moreBetter.getMode())){
             morebetterDao.deleteTmtbGoods(moreBetter);      // TB_TMTB_GOODS DEL_YN 'Y' UPDATE
@@ -155,7 +159,7 @@ public class TsaMorebetterService {
         // TMTB 마스터(TB_TMTB) 저장
         morebetterDao.saveMorebetterMst(moreBetter);
 
-        // 1. 공급업체
+        // 공급업체
         for (MoreBetterGoods regSupplyComp : moreBetter.getSupplyCompList()) {
             regSupplyComp.setTmtbSq(moreBetter.getTmtbSq());
             regSupplyComp.setGoodsGb("G800_20");
@@ -165,8 +169,8 @@ public class TsaMorebetterService {
             morebetterDao.saveMorebetterGoods(regSupplyComp);
         }
 
-        // 2. 브랜드
-        for (MoreBetterGoods regBrand : moreBetter.getBrandList()) {
+        // 브랜드
+        for(MoreBetterGoods regBrand : moreBetter.getBrandList()){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
             regBrand.setTmtbSq(moreBetter.getTmtbSq());
             regBrand.setGoodsGb("G800_20");
@@ -176,8 +180,8 @@ public class TsaMorebetterService {
             morebetterDao.saveMorebetterGoods(regBrand);
         }
 
-        // 3. 기준상품
-        for (MoreBetterGoods regDefaultGoods : moreBetter.getDefaultGoodsList()) {
+        // 기준상품
+        for(MoreBetterGoods regDefaultGoods : moreBetter.getDefaultGoodsList()){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
             regDefaultGoods.setTmtbSq(moreBetter.getTmtbSq());
             regDefaultGoods.setTargetVal(regDefaultGoods.getGoodsCd());
@@ -186,9 +190,33 @@ public class TsaMorebetterService {
             regDefaultGoods.setMultiDuplicateGoods(moreBetter.getMultiDuplicateGoods());
             morebetterDao.saveMorebetterGoods(regDefaultGoods);
         }
+
+        // 기준상품 + 적용상품 중복제거
+        List<MoreBetterGoods> dgList = moreBetter.getDefaultGoodsList();		// 기준상품
+        List<MoreBetterGoods> agList = moreBetter.getGridApplyGoodsList();		// 적용상품
+        List<MoreBetterGoods> applyList = new ArrayList<>();
+        
+        int dupCnt = 0;
         
-        // 4. 적용상품
-        for (MoreBetterGoods regApplyGoods : moreBetter.getGridApplyGoodsList()) {
+        if (agList.size() > 0){
+            applyList = dgList;
+            
+            for (int i=0 ; i<agList.size() ; i++) {
+                for (int j=0; j<dgList.size(); j++) {
+                    if (agList.get(i).getGoodsCd().equals(dgList.get(j).getGoodsCd())) {
+                        dupCnt++;
+                    }
+                }
+                if (dupCnt == 0) {                	
+                    applyList.add(agList.get(i));
+                }
+            }
+        } else {
+            applyList = dgList;
+        }
+
+        for(MoreBetterGoods regApplyGoods : applyList){
+            // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
             regApplyGoods.setTmtbSq(moreBetter.getTmtbSq());
             regApplyGoods.setTargetVal(regApplyGoods.getGoodsCd());
             regApplyGoods.setRegNo(moreBetter.getRegNo());
@@ -196,9 +224,11 @@ public class TsaMorebetterService {
             regApplyGoods.setMultiDuplicateGoods(moreBetter.getMultiDuplicateGoods());
             morebetterDao.saveMorebetterGoods(regApplyGoods);
         }
-        
-        // 5. 제외상품
+
+        // 제외상품
         for(MoreBetterGoods regExceptGoods : moreBetter.getExceptGoodsList()){
+            // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
+            log.info("exception::{}",moreBetter.getExceptGoodsList());
             regExceptGoods.setTmtbSq(moreBetter.getTmtbSq());
             regExceptGoods.setTargetVal(regExceptGoods.getGoodsCd());
             regExceptGoods.setRegNo(moreBetter.getRegNo());
@@ -207,8 +237,8 @@ public class TsaMorebetterService {
             morebetterDao.saveMorebetterGoods(regExceptGoods);
             morebetterDao.saveMorebetterApplyGoods(regExceptGoods);
         }
-        
-        // 6. 다다익선 할인구간 저장
+
+        // 다다익선 할인구간 저장
         for(MoreBetterSection regSection : moreBetter.getSectionGbList()){
             // 다다익선 할인구간설정 2차조건(TB_TMTB_SECTION) 저장
             regSection.setTmtbSq(moreBetter.getTmtbSq());
@@ -219,7 +249,7 @@ public class TsaMorebetterService {
             morebetterDao.saveMorebetterVal(regSection);
         }
 
-        // 7. 다다익선 업체분담율(TB_TMTB_BURDEN) 저장
+        // 다다익선 업체분담율(TB_TMTB_BURDEN) 저장
         for (MoreBetterBurden regBurden : moreBetter.getBurdenList()) {
             regBurden.setTmtbSq(moreBetter.getTmtbSq());
             regBurden.setRegNo(moreBetter.getRegNo());
@@ -227,53 +257,27 @@ public class TsaMorebetterService {
 
             morebetterDao.saveMorebetterBurden(regBurden);
         }
-        
-        // 기준상품 + 적용상품 중복제거
-        List<MoreBetterGoods> dgList = moreBetter.getDefaultGoodsList();		// 기준상품
-        List<MoreBetterGoods> agList = moreBetter.getGridApplyGoodsList();		// 적용상품
-
-        // 적용상품존재여부체크
-        //int dupCnt = 0;
-        /*
-        if (agList.size() > 0) {
-            applyList = dgList;
-            
-            // 적용상품 반복문
-            for (int i=0 ; i<agList.size() ; i++) {
-            	// 기준상품 반복문
-                for (int j=0; j<dgList.size(); j++) {
-                    if (agList.get(i).getGoodsCd().equals(dgList.get(j).getGoodsCd())) {
-                        dupCnt++;
-                    }
-                }
-                if (dupCnt == 0) {
-                    applyList.add(agList.get(i));
-                }
-            }
-        } else {
-            applyList = dgList;
-        }
-        */
-
-        
 
-        // 업체 & 브랜드 상품
+        // 업체&브랜드 상품
         MoreBetterGoods moreBetterGoods = new MoreBetterGoods();
         StringBuilder sb = new StringBuilder();
         StringBuilder sb3 = new StringBuilder();
-        
-        // 2021.11.09 적용상품등록
-        if (agList.size() > 0) {
-            for (int i=0; i<agList.size(); i++) {
-                sb.append("SELECT   '").append(agList.get(i).getGoodsCd()).append("' AS GOODS_CD ");
+        //int i = 1;
+
+        if (applyList.size() > 0) {
+            for (int i=0; i<applyList.size(); i++) {
+            	log.info("goodCd >>> {}", applyList.get(i).getGoodsCd());
+            	log.info("goodGb >>> {}", applyList.get(i).getGoodsGb());
+            	
+                sb.append("SELECT   '").append(applyList.get(i).getGoodsCd()).append("' AS GOODS_CD ");
                 
-                if (i < agList.size()-1) {
+                if (i < applyList.size()-1) {
                     sb.append("\n UNION ALL \n");
                 }
 
-                sb3.append("SELECT   '").append(agList.get(i).getGoodsCd()).append("' AS GOODS_CD ");
-                sb3.append(" , '").append(agList.get(i).getGoodsGb()).append("' AS GOODS_GB ");
-                if (i < agList.size()-1) {
+                sb3.append("SELECT   '").append(applyList.get(i).getGoodsCd()).append("' AS GOODS_CD ");
+                sb3.append(" , '").append(applyList.get(i).getGoodsGb()).append("' AS GOODS_GB ");
+                if(i<applyList.size()-1){
                     sb3.append("\n UNION ALL \n");
                 }
             }
@@ -281,17 +285,16 @@ public class TsaMorebetterService {
 
         moreBetterGoods.setApplySql(sb.toString());
         moreBetterGoods.setApplyGbSql(sb3.toString());
-        
+
         StringBuilder sb2 = new StringBuilder();
-        if (moreBetter.getExceptGoodsList().size() > 0) {
-            for (int i=0; i<moreBetter.getExceptGoodsList().size(); i++) {
+        if(moreBetter.getExceptGoodsList().size()>0){
+            for(int i=0; i<moreBetter.getExceptGoodsList().size(); i++){
                 sb2.append("SELECT   '").append(moreBetter.getExceptGoodsList().get(i).getGoodsCd()).append("' AS GOODS_CD ");
-                if (i < moreBetter.getExceptGoodsList().size()-1) {
+                if(i<moreBetter.getExceptGoodsList().size()-1){
                     sb2.append("\n UNION ALL \n");
                 }
             }
         }
-        
         moreBetterGoods.setExceptSql(sb2.toString());
         moreBetterGoods.setTmtbSq(moreBetter.getTmtbSq());
         moreBetterGoods.setRegNo(TsaSession.getInfo().getUserNo());
@@ -303,31 +306,6 @@ public class TsaMorebetterService {
         moreBetterGoods.setMultiExceptGoods(moreBetter.getMultiExceptGoods());
         moreBetterGoods.setSectionGb(moreBetter.getSectionGb());
         morebetterDao.insertMorebetterApplyGoods(moreBetterGoods);
-        
-        // 2021.11.09 기본상품 있으면 기본상품 등록, 없으면 적용상품 등록
-        // 2021.11.09 기본상품등록
-        if (dgList.size() > 0) {
-            for (int i=0; i<dgList.size(); i++) {
-                sb3.append("SELECT   '").append(dgList.get(i).getGoodsCd()).append("' AS GOODS_CD ");
-                sb3.append(" , '").append(dgList.get(i).getGoodsGb()).append("' AS GOODS_GB ");
-                if (i < agList.size()-1) {
-                    sb3.append("\n UNION ALL \n");
-                }
-            }
-
-            moreBetterGoods.setTmtbSq(moreBetter.getTmtbSq());
-            moreBetterGoods.setRegNo(TsaSession.getInfo().getUserNo());
-            moreBetterGoods.setUpdNo(TsaSession.getInfo().getUserNo());
-            moreBetterGoods.setMultiDefaultGoods(moreBetter.getMultiDefaultGoods());
-            morebetterDao.insertMorebetterDefaultGoods(moreBetterGoods);
-        } 
-        else {
-        	moreBetterGoods.setTmtbSq(moreBetter.getTmtbSq());
-            moreBetterGoods.setRegNo(TsaSession.getInfo().getUserNo());
-            moreBetterGoods.setUpdNo(TsaSession.getInfo().getUserNo());
-            moreBetterGoods.setMultiDefaultGoods(moreBetter.getMultiDefaultGoods());
-            morebetterDao.insertMorebetterDefaultGoodsApply(moreBetterGoods);
-        }
 
         log.info("newBurdenSq = {}, newTmtbSq = {}, newSupplyCd = {}, newBurdenRate = {} , newUseYn = {}");
     }
@@ -485,7 +463,7 @@ public class TsaMorebetterService {
 
         moreBetter.setMultiDefaultGoods(applyArr);
 
-        if (moreBetter.getMultiDefaultGoods().length > 0) {
+        if(moreBetter.getMultiDefaultGoods().length > 0){
             morebetterDao.deleteMorebetterApplyGoodsTemp(moreBetter);
             morebetterDao.insertMorebetterApplyGoodsTemp(moreBetter);
         }

src/main/java/com/style24/admin/biz/web/TsaMarketingController.java

@@ -1302,19 +1302,14 @@ public class TsaMarketingController extends TsaBaseController {
 
 		try {
 			MoreBetterGoods moreBetterGoods = new MoreBetterGoods();
-			
 			// 적용상품 으로 tb_goods 조회해서 temp 테이블 insert
 			morebetterService.insertMorebetterApplyGoodsTemp(moreBetter);
-			
-			// 다다익선 상품 등록
 			morebetterService.saveMoreBetterDetail(moreBetter);
 
 			moreBetterGoods.setTmtbSq(moreBetter.getTmtbSq());
 			moreBetterGoods.setRegNo(TsaSession.getInfo().getUserNo());
-			
 			// 다른 다다에서 사용중인 상품 조회
 			Collection<MoreBetterGoods> duplicateGoodsList = morebetterService.getMorebetterDuplicateList(moreBetterGoods);
-			
 			// SELECT -> 지금 내가 선택한 업체&브랜드 + 적용상품에 해당하는 상품 조회 MINUS TMTB_GOODS_TEMP 상품
 			// 조회 건수 있으면 -> 해당 상품코드 엑셀로 던져주기
 			if (duplicateGoodsList.size() > 0) {
@@ -1324,7 +1319,6 @@ public class TsaMarketingController extends TsaBaseController {
 				// 조회 건수 없으면 -> 저장으로 넘어감
 				map.set("duplicateYn", "N");
 			}
-			
 			map.set("message", message.getMessage("SUCC_0001"));
 		} catch (Exception e) {
 			e.printStackTrace();

src/main/java/com/style24/persistence/mybatis/shop/TsaMorebetter.xml

@@ -543,21 +543,20 @@
 	<!-- 진행중인 다다익선 상품과 중복 체크 -->
 	<select id="getMorebetterDuplicateList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMorebetter.getMorebetterDuplicateList */
-		SELECT TG.GOODS_CD
-		     , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = TG.GOODS_CD) AS GOODS_NM
-		FROM   TB_TMTB T
-		     , TB_TMTB_APPLY_GOODS TG
-		WHERE  T.TMTB_SQ = TG.TMTB_SQ
-		  AND  T.TMTB_STAT = 'G232_11'
-		  AND  NOW() BETWEEN T.TMTB_ST_DT AND T.TMTB_ED_DT
-		  AND  T.TMTB_SQ NOT IN (#{tmtbSq})
-		  AND  EXISTS (
-		    SELECT TMP.GOODS_CD
-		    FROM   TB_TMTB_APPLY_GOODS_TEMP TMP
-		    WHERE  1=1
-		    AND    TMP.REG_NO = #{regNo}
-		    AND    TMP.GOODS_CD = TG.GOODS_CD
-		)
+		SELECT  TG.GOODS_CD
+		      , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = TG.GOODS_CD) AS GOODS_NM
+		FROM    TB_TMTB T, TB_TMTB_APPLY_GOODS TG
+		WHERE   T.TMTB_SQ = TG.TMTB_SQ
+		  AND   T.TMTB_STAT = 'G232_11'
+		  AND   NOW() BETWEEN T.TMTB_ST_DT AND T.TMTB_ED_DT
+		  AND   T.TMTB_SQ NOT IN (#{tmtbSq})
+		  AND   EXISTS (
+		            SELECT  TMP.GOODS_CD
+		            FROM    TB_TMTB_APPLY_GOODS_TEMP TMP
+		            WHERE   1=1
+		              AND   TMP.REG_NO = #{regNo}
+		              AND   TMP.GOODS_CD = TG.GOODS_CD
+			)
 	</select>
 
 	<update id="updateMorebetterStat" parameterType="MoreBetter">
@@ -574,22 +573,22 @@
 
 	<update id="deleteTmtbGoods" parameterType="MoreBetter">
 		/* TsaMorebetter.deleteTmtbGoods */
-		UPDATE TB_TMTB_GOODS 
-		   SET DEL_YN = 'Y'
-			 , UPD_NO = #{updNo}
-			 , UPD_DT = CURRENT_TIMESTAMP
-		 WHERE TMTB_SQ = #{tmtbSq}
-		   AND DEL_YN = 'N'
+		UPDATE TB_TMTB_GOODS SET
+			DEL_YN = 'Y'
+			, UPD_NO = #{updNo}
+			, UPD_DT = CURRENT_TIMESTAMP
+		WHERE TMTB_SQ = #{tmtbSq}
+		  AND DEL_YN = 'N'
 	</update>
 
 	<update id="deleteTmtbBurden" parameterType="MoreBetter">
 		/* TsaMorebetter.deleteTmtbBurden */
-		UPDATE TB_TMTB_BURDEN 
-		   SET USE_YN = 'N'
-		     , UPD_NO = #{updNo}
-			 , UPD_DT = CURRENT_TIMESTAMP
-		 WHERE TMTB_SQ = #{tmtbSq}
-		   AND USE_YN = 'Y'
+		UPDATE TB_TMTB_BURDEN SET
+			USE_YN = 'N'
+			, UPD_NO = #{updNo}
+			, UPD_DT = CURRENT_TIMESTAMP
+		WHERE TMTB_SQ = #{tmtbSq}
+		  AND USE_YN = 'Y'
 	</update>
 
 	<update id="deleteTmtbSection" parameterType="MoreBetter">
@@ -611,50 +610,43 @@
 		WHERE TMTB_SQ = #{tmtbSq}
 		  AND DEL_YN = 'N'
 	</update>
-	
-	<!-- 다다익선적용상품삭제 -->
+
 	<delete id="deleteTmtbApplyGoods" parameterType="MoreBetter">
 		/* TsaMarketing.deleteTmtbApplyGoods */
 		DELETE FROM TB_TMTB_APPLY_GOODS
 		WHERE	TMTB_SQ = #{tmtbSq}
 	</delete>
-	
-	<!-- 적용상품등록 (다다익선적용상품테이블) -->
+
 	<insert id="insertMorebetterApplyGoods" parameterType="MoreBetterGoods">
 		/* TsaMarketing.insertMorebetterApplyGoods */
 		<selectKey keyProperty="tmtbApplyGoodsSq" resultType="int" order="AFTER">
 			SELECT LAST_INSERT_ID()
 		</selectKey>
 		INSERT INTO TB_TMTB_APPLY_GOODS(
-		      TMTB_SQ
-		    , GOODS_GB
-		    , GOODS_CD
-		    , DEL_YN
-		    , REG_NO
-		    , REG_DT
-		    , UPD_NO
-		    , UPD_DT
+			  TMTB_SQ
+			, GOODS_GB
+			, GOODS_CD
+			, DEL_YN
+			, REG_NO
+			, REG_DT
+			, UPD_NO
+			, UPD_DT
 		)
-		SELECT #{tmtbSq}      AS TMTB_SQ
-		     , Z.GOODS_GB     AS GOODS_GB
-		     , Z.GOODS_CD     AS GOODS_CD
-		     , 'N'            AS DEL_YN
-		     , #{regNo}       AS REG_NO
-		     , NOW()          AS REG_DT
-		     , #{updNo}       AS UPD_NO
-		     , NOW()          AS UPD_DT
-		FROM (
-		    SELECT T.GOODS_CD
-		         , T.GOODS_GB
+		SELECT #{tmtbSq} AS TMTB_SQ
+				, Z.GOODS_GB AS GOODS_GB
+				, Z.GOODS_CD AS GOODS_CD
+				, 'N' AS DEL_YN
+				, #{regNo} AS REG_NO
+				, NOW() AS REG_DT
+				, #{updNo} AS UPD_NO
+				, NOW() AS UPD_DT
+		FROM	(
+			SELECT T.GOODS_CD
+			     , T.GOODS_GB
 			FROM (
-		        SELECT 99999 AS GOODS_CD
-				     , 'G800_99' AS GOODS_GB
-				FROM   TB_GOODS
-				WHERE  1=2
-				<if test="multiSupplyCompCd != null and multiSupplyCompCd.length > 0">
-				    UNION  ALL
+				<if test="multiSupplyCompCd!= null and multiSupplyCompCd.length>0">
 					SELECT GOODS_CD
-					     , 'G800_20' AS GOODS_GB
+					     , 'G800_10' AS GOODS_GB
 					FROM TB_GOODS
 					WHERE SUPPLY_COMP_CD IN
 					<foreach collection="multiSupplyCompCd" item="item" open="(" separator="," close=")">
@@ -664,14 +656,12 @@
 					<foreach collection="multiBrand" item="item" open="(" separator="," close=")">
 						#{item}
 					</foreach>
-					<if test="multiDefaultGoods != null and multiDefaultGoods.length > 0">
+					<if test="multiDefaultGoods != null and multiDefaultGoods.length>0">
 						AND GOODS_CD NOT IN ( ${applySql} )
 					</if>
-				</if>
-				<if test="multiApplyGoods != null and multiApplyGoods.length > 0">
 					UNION ALL
-					${applyGbSql}
 				</if>
+				${applyGbSql}
 			) T
 			WHERE	1=1
 			<if test="multiExceptGoods != null and multiExceptGoods.length >0">
@@ -689,68 +679,13 @@
 									WHERE	A.TMTB_ST_DT <![CDATA[<=]]> NOW()
 									AND 	A.TMTB_ED_DT <![CDATA[>=]]> NOW()
 									AND 	A.TMTB_STAT = 'G232_11'
-									<if test="tmtbSq != null and tmtbSq != ''">
+		                            <if test="tmtbSq != null and tmtbSq != ''">
 									AND     A.TMTB_SQ <![CDATA[<>]]> #{tmtbSq}
 									</if>
 									AND 	B.GOODS_GB <![CDATA[<>]]> 'G800_30'
-									AND     TS.SECTION_GB = #{sectionGb}
+		                            AND     TS.SECTION_GB = #{sectionGb}
 								)
 	</insert>
-	
-	<!-- 기본상품등록 (다다익선적용상품테이블) 기본상품존재 -->
-	<insert id="insertMorebetterDefaultGoods" parameterType="MoreBetterGoods">
-		/* TsaMarketing.insertMorebetterDefaultGoods */
-		INSERT INTO TB_TMTB_APPLY_GOODS(
-		      TMTB_SQ
-		    , GOODS_GB
-		    , GOODS_CD
-		    , DEL_YN
-		    , REG_NO
-		    , REG_DT
-		    , UPD_NO
-		    , UPD_DT
-		)
-		SELECT TMTB_SQ
-		     , 'G800_10'      AS GOODS_GB
-		     , TARGET_VAL
-		     , DEL_YN
-		     , REG_NO
-		     , NOW()
-		     , UPD_NO
-		     , NOW()
-		FROM   TB_TMTB_GOODS
-		WHERE  1=1
-		AND    TMTB_SQ = #{tmtbSq}
-		AND    GOODS_GB = 'G800_10'
-		AND    DEL_YN = 'N'
-	</insert>
-	
-	<!-- 기본상품등록 (다다익선적용상품테이블) 기본상품없음 적용상품 -->
-	<insert id="insertMorebetterDefaultGoodsApply" parameterType="MoreBetterGoods">
-		/* TsaMarketing.insertMorebetterDefaultGoodsApply */
-		INSERT INTO TB_TMTB_APPLY_GOODS(
-		      TMTB_SQ
-		    , GOODS_GB
-		    , GOODS_CD
-		    , DEL_YN
-		    , REG_NO
-		    , REG_DT
-		    , UPD_NO
-		    , UPD_DT
-		)
-		SELECT TMTB_SQ
-		     , 'G800_10'      AS GOODS_GB
-		     , GOODS_CD
-		     , DEL_YN
-		     , REG_NO
-		     , NOW()
-		     , UPD_NO
-		     , NOW()
-		FROM   TB_TMTB_APPLY_GOODS 
-		WHERE  1=1
-		AND    TMTB_SQ = #{tmtbSq}
-		AND    GOODS_GB = 'G800_20'
-	</insert>
 
 	<delete id="deleteMorebetterApplyGoodsTemp" parameterType="MoreBetter">
 		/* TsaMorebetter.deleteMorebetterApplyGoodsTemp */

src/main/webapp/WEB-INF/views/customer/CustomerActiveListForm.html

@@ -258,6 +258,7 @@
 		const $searchTxt = $('#custActiveForm input[name=searchTxt]');	// 검색내용
 		const $stDate = $('#custActiveForm input[name=stDate]');
 		const $edDate = $('#custActiveForm input[name=edDate]');
+		const $cellPhnno = $('#custActiveForm input[name=cellPhnno]');
 
 		let isSearchVaild = true;
 		let validationMessage;
@@ -279,8 +280,9 @@
 		}
 
 		if (gagajf.isNull($stDate.val()) && gagajf.isNull($edDate.val())) {
-			if (gagajf.isNull($searchTxt.val()) && gagajf.isNull($searchGb.val())) {
-				validationMessage = '일자 없이 조회시 <br> 검색구분 선택 및 내용을 입력해주세요';
+			// 2021.11.12 card007 휴대폰번호 추가
+			if (gagajf.isNull($searchTxt.val()) && gagajf.isNull($searchGb.val()) && gagajf.isNull($cellPhnno.val())) {
+				validationMessage = '일자 없이 조회시 <br> 검색구분 선택 및 내용, 휴대폰번호를 입력해주세요';
 				isSearchVaild = false;
 			}
 		}

src/main/webapp/WEB-INF/views/customer/CustomerDormantListForm.html

@@ -201,6 +201,7 @@
 		const $searchTxt = $('#custDormantForm input[name=searchTxt]');	// 검색내용
 		const $stDate = $('#custDormantForm input[name=stDate]');
 		const $edDate = $('#custDormantForm input[name=edDate]');
+		const $cellPhnno = $('#custDormantForm input[name=cellPhnno]');
 		let isSearchVaild = true;
 		let validationMessage;
 
@@ -222,8 +223,9 @@
 		}
 		
 		if (gagajf.isNull($stDate.val()) && gagajf.isNull($edDate.val())) {
-			if (gagajf.isNull($searchTxt.val()) && gagajf.isNull($searchGb.val())) {
-				validationMessage = '일자 없이 조회시 <br> 검색구분 선택 및 내용을 입력해주세요';
+			// 2021.11.12 card007 휴대폰번호 추가
+			if (gagajf.isNull($searchTxt.val()) && gagajf.isNull($searchGb.val()) && gagajf.isNull($cellPhnno.val())) {
+				validationMessage = '일자 없이 조회시 <br> 검색구분 선택 및 내용, 휴대폰번호를 입력해주세요';
 				isSearchVaild = false;
 			}
 		}

src/main/webapp/WEB-INF/views/customer/CustomerSecedeListForm.html

@@ -184,6 +184,7 @@
 		const $searchTxt = $('#custSecedeForm input[name=searchTxt]');	// 검색내용
 		const $stDate = $('#custSecedeForm input[name=stDate]');
 		const $edDate = $('#custSecedeForm input[name=edDate]');
+		const $cellPhnno = $('#custSecedeForm input[name=cellPhnno]');
 		let isSearchVaild = true;
 		let validationMessage;
 
@@ -205,8 +206,9 @@
 		}
 		
 		if (gagajf.isNull($stDate.val()) && gagajf.isNull($edDate.val())) {
-			if (gagajf.isNull($searchTxt.val()) && gagajf.isNull($searchGb.val())) {
-				validationMessage = '일자 없이 조회시 <br> 검색구분 선택 및 내용을 입력해주세요';
+			// 2021.11.12 card007 휴대폰번호 추가
+			if (gagajf.isNull($searchTxt.val()) && gagajf.isNull($searchGb.val()) && gagajf.isNull($cellPhnno.val())) {
+				validationMessage = '일자 없이 조회시 <br> 검색구분 선택 및 내용, 휴대폰번호를 입력해주세요';
 				isSearchVaild = false;
 			}
 		}

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -797,6 +797,12 @@
 				return false;
 			}
 		}
+		
+		// 2021.11.10 적용대상정보를설정
+		if (allSupplyCompData.length < 1 && allBrandData.length < 1 && allApplyGoodsData < 1) {
+			mcxDialog.alert("적용대상 정보를 설정해주세요.");
+			return false;
+		}
 
 		// 공급업체+브랜드 상품조회
 		var multiSupplyCompCd = [];
@@ -873,7 +879,7 @@
 			fnMorebetterFormClose();
 			$('#btnInit').trigger('click');
 			$('#btnSearch').trigger('click');
-		}else{
+		} else {
 			//mcxDialog.alert(result.message);
 			fnMorebetterFormClose();
 			$('#btnInit').trigger('click');
@@ -887,7 +893,7 @@
 		var supplyCompCdArr = [];
 		
 		// 기존 리스트 데이터 for
-		for(let i = 0 ; i < result.length ; i++) {
+		for (let i = 0 ; i < result.length ; i++) {
 			let addChk = true, gridListValue = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);		// 받아온 모든 데이터
 
 			// 받아온 data for
@@ -897,7 +903,7 @@
 			}
 
 			// 중복되지 않은 데이터 리스트에 추가
-			if(addChk) {
+			if (addChk) {
 				gagaAgGrid.addRowData(gridOptionsFGCompanyList, {"supplyCompCd" : result[i].supplyCompCd, "supplyCompNm" : result[i].supplyCompNm, "targetGb" : "G260_13"});
 				
 				// 2021.08.23 업체로정보로 브랜드정보 조회
@@ -1303,13 +1309,13 @@
 	$("#btnChangeStatIng").on("click", function() {
 		// fnCheckData();
 		// 각 ag-grid list 수량
-		let allSupplyCompData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
-		let allBrandData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
-		let allDefaultGoodsData = gagaAgGrid.getAllRowData(gridOptionsDefaultGoodsList);
-		let allApplyGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
-		let allExceptGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
-		let allApplyBurdenData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
-		let allSectionGbData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
+		let allSupplyCompData 		= gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
+		let allBrandData 			= gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
+		let allDefaultGoodsData 	= gagaAgGrid.getAllRowData(gridOptionsDefaultGoodsList);
+		let allApplyGoodsData 		= gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
+		let allExceptGoodsData 		= gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
+		let allApplyBurdenData 		= gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
+		let allSectionGbData 		= gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
 
 		if(allSectionGbData.length < 1){
 			mcxDialog.alert("할인구간을 설정해주세요.");
@@ -1322,7 +1328,13 @@
 		}
 
 		// 기본상품 1개이상 있는지 체크
-		if(!fnGoodsGbCheck()) {
+		//if (!fnGoodsGbCheck()) {
+			//return false;
+		//}
+		
+		// 2021.11.10 적용대상정보를설정
+		if (allSupplyCompData.length < 1 && allBrandData.length < 1 && allApplyGoodsData < 1) {
+			mcxDialog.alert("적용대상 정보를 설정해주세요.");
 			return false;
 		}