Merge branch 'sowon' into develop

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

@@ -459,6 +459,7 @@ public class TsaPlanService {
 		param.setRegNo(userNo);
 		param.setUpdNo(userNo);
 		planDao.createPlanCopy(param);
+		Integer prePlanSq = param.getPlanSq();
 		
 		plan.setRegNo(userNo);
 		plan.setUpdNo(userNo);
@@ -526,7 +527,8 @@ public class TsaPlanService {
 			plan.setBasDays(attendInfo.getBasDays());
 			planDao.createPlanAttendBenefitCopy(plan);
 		}
-
+		// 복사한 기획전 번호 셋팅
+		plan.setPlanSq(prePlanSq);
 		return plan;
 	}
 	

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

@@ -344,7 +344,7 @@
 	</select>
 
 	<!-- 기획전 복사 -->
-	<insert id="createPlanCopy" parameterType="Plan">
+	<insert id="createPlanCopy" parameterType="Plan" useGeneratedKeys="true" keyProperty="planSq">
 		/* TsaPlan.createPlanCopy */
 		<selectKey keyProperty="planSq" resultType="Integer" order="AFTER">
 			SELECT LAST_INSERT_ID()	/* 기획전 일련번호  */