Merge branch 'style' into jmh

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

@@ -52,6 +52,15 @@ public interface TsaCounselDao {
 	 */
 	Counsel getOneToOneQna(Counsel counsel);
 
+	/**
+	 * 1:1문의 삭제여부 조회
+	 * @param counselSq - 상담일련번호
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 11. 22
+	 */
+	String getOneToOneQnaDelYn(Integer counselSq);
+
 	/**
 	 * 문의 답변 임시 저장
 	 * @param counsel - 상담정보

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

@@ -98,6 +98,17 @@ public class TsaCounselService {
 		return counselDao.updateQnaAnswerTemp(counsel);
 	}
 
+	/**
+	 * 1:1문의 삭제여부 조회
+	 * @param counselSq - 상담일련번호
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 11. 22
+	 */
+	public String getOneToOneQnaDelYn(Integer counselSq) {
+		return counselDao.getOneToOneQnaDelYn(counselSq);
+	}
+
 	/**
 	 * 문의 답변 저장
 	 * @param counsel - 상담정보

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

@@ -204,6 +204,12 @@ public class TsaCustomerController extends TsaBaseController {
 	@PostMapping("/onetoone/qna/assign")
 	@ResponseBody
 	public GagaResponse assignOneToOneQna(@RequestBody Counsel counsel) {
+		// 삭제여부 체크
+		String delYn = counselService.getOneToOneQnaDelYn(counsel.getCounselSq());
+		if ("Y".equals(delYn)) {
+			throw new IllegalStateException("이미 삭제된 건입니다. 다시 확인해 주세요.");
+		}
+
 		counselService.updateOneToOneQnaCounselor(counsel);
 		return super.ok(message.getMessage("SUCC_0004"));
 	}
@@ -218,6 +224,12 @@ public class TsaCustomerController extends TsaBaseController {
 	@PostMapping("/qna/answer/temp/save")
 	@ResponseBody
 	public GagaResponse saveQnaAnswerTemp(@RequestBody Counsel counsel) {
+		// 삭제여부 체크
+		String delYn = counselService.getOneToOneQnaDelYn(counsel.getCounselSq());
+		if ("Y".equals(delYn)) {
+			throw new IllegalStateException("이미 삭제된 건입니다. 다시 확인해 주세요.");
+		}
+
 		counsel.setAnsNo(TsaSession.getInfo().getUserNo());
 		counsel.setUpdNo(TsaSession.getInfo().getUserNo());
 
@@ -239,6 +251,12 @@ public class TsaCustomerController extends TsaBaseController {
 	@PostMapping("/qna/answer/save")
 	@ResponseBody
 	public GagaResponse saveQnaAnswer(@RequestBody Counsel counsel) {
+		// 삭제여부 체크
+		String delYn = counselService.getOneToOneQnaDelYn(counsel.getCounselSq());
+		if ("Y".equals(delYn)) {
+			throw new IllegalStateException("이미 삭제된 건입니다. 다시 확인해 주세요.");
+		}
+
 		counsel.setAnsNo(TsaSession.getInfo().getUserNo());
 		counsel.setUpdNo(TsaSession.getInfo().getUserNo());
 

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

@@ -63,9 +63,14 @@
 		                <if test="ansNo != null and ansNo != ''">
 		                AND    A.ANS_NO = #{ansNo}
 		                </if>
-		                <if test="delYn != null and delYn != ''">
+		                <choose>
+		                    <when test="delYn != null and delYn != ''">
 		                AND    A.DEL_YN = #{delYn}
-		                </if>
+		                    </when>
+		                    <otherwise>
+		                AND    A.DEL_YN = 'N'
+		                    </otherwise>
+		                </choose>
 		                <if test="condition != null and condition != ''">
 		                    <if test="custGb == 'custId'">
 		                AND    B.CUST_ID LIKE #{condition}||'%'
@@ -112,9 +117,14 @@
 		<if test="ansNo != null and ansNo != ''">
 		AND    A.ANS_NO = #{ansNo}
 		</if>
-		<if test="delYn != null and delYn != ''">
+		<choose>
+		    <when test="delYn != null and delYn != ''">
 		AND    A.DEL_YN = #{delYn}
-		</if>
+		    </when>
+		    <otherwise>
+		AND    A.DEL_YN = 'N'
+		    </otherwise>
+		</choose>
 		<if test="condition != null and condition != ''">
 		    <if test="custGb == 'custId'">
 		AND    B.CUST_ID LIKE #{condition}||'%'
@@ -194,6 +204,15 @@
 		AND    A.COUNSEL_TYPE = 'C' /*상담유형(1:1문의)*/
 	</select>
 	
+	<!-- 1:1문의 삭제여부 조회 -->
+	<select id="getOneToOneQnaDelYn" parameterType="Integer" resultType="String">
+		/* TsaCounsel.getOneToOneQnaDelYn */
+		SELECT DEL_YN
+		FROM   TB_COUNSEL
+		WHERE  COUNSEL_SQ = #{counselSq}
+		AND    COUNSEL_TYPE = 'C' /*상담유형(1:1문의)*/
+	</select>
+	
 	<!--문의 답변 임시 저장 -->
 	<update id="updateQnaAnswerTemp" parameterType="Counsel">
 		/* TsaCounsel.updateQnaAnswerTemp */