moon 5 лет назад
Родитель
Сommit
41c8c27128

+ 8 - 8
style24.admin/src/main/java/com/style24/admin/biz/dao/TsaRendererDao.java

@@ -152,14 +152,14 @@ public interface TsaRendererDao {
 	 * @since 2020. 10. 19
 	 */
 	Collection<CommonCode> getBrandMdList();
-//
-//	/**
-//	 * 택배사명 목록 조회
-//	 * @return CommonCode
-//	 * @author DaeHyoung
-//	 * @since 2020. 02. 04
-//	 */
-//	Collection<CommonCode> getShipCompanyList();
+
+	/**
+	 * 택배사명 목록 조회
+	 * @return CommonCode
+	 * @author moon
+	 * @since 2020. 11. 05
+	 */
+	Collection<CommonCode> getShipCompanyList();
 //
 //	/**
 //	 * MD별 브랜드 목록 조회

+ 10 - 10
style24.admin/src/main/java/com/style24/admin/biz/service/TsaRendererService.java

@@ -432,16 +432,16 @@ public class TsaRendererService {
 	public Collection<CommonCode> getBrandMdList() {
 		return rendererDao.getBrandMdList();
 	}
-//
-//	/**
-//	 * 택배사명 목록 조회
-//	 * @return CommonCode
-//	 * @author Daehyoung
-//	 * @since 2020. 02. 04
-//	 */
-//	public Collection<CommonCode> getShipCompanyList() {
-//		return rendererDao.getShipCompanyList();
-//	}
+
+	/**
+	 * 택배사명 목록 조회
+	 * @return CommonCode
+	 * @author moon
+	 * @since 2020. 11. 05
+	 */
+	public Collection<CommonCode> getShipCompanyList() {
+		return rendererDao.getShipCompanyList();
+	}
 //
 //	/**
 //	 * MD 별 브랜드 목록 조회

+ 58 - 0
style24.admin/src/main/java/com/style24/admin/support/util/TsitUtil.java

@@ -0,0 +1,58 @@
+package com.style24.admin.support.util;
+
+public class TsitUtil {
+	public String replaceMultiSelectParams(String param) {
+		String[] multiParams = param.replaceAll("\r", "").split("\n");
+		StringBuilder multiParam = new StringBuilder();
+		multiParam.append("(");
+		for (int i = 0; i < multiParams.length; i++) {
+			if (!multiParams[i].trim().equals("")) {
+				if (i > 0) {
+					multiParam.append("|");
+				}
+				multiParam.append(multiParams[i]);
+			}
+		}
+		multiParam.append(")");
+
+		return multiParam.toString();
+	}
+
+	public String replaceMultiSelectParamsArr(String param) {
+		String[] multiParams = param.replaceAll("\r", "").split("\n");
+		StringBuilder multiParam = new StringBuilder();
+		for (int i = 0; i < multiParams.length; i++) {
+			if (!multiParams[i].trim().equals("")) {
+				if (i > 0) {
+					if (i % 20 == 0) {
+						multiParam.append(",");
+					} else {
+						multiParam.append("|");
+					}
+				}
+				multiParam.append(multiParams[i]);
+			}
+		}
+
+		return multiParam.toString();
+	}
+
+	public String replaceMultiSelectCommaParamsArr(String param) {
+		String[] multiParams = param.replaceAll("\r", "").split(",");
+		StringBuilder multiParam = new StringBuilder();
+		for (int i = 0; i < multiParams.length; i++) {
+			if (!multiParams[i].trim().equals("")) {
+				if (i > 0) {
+					if (i % 20 == 0) {
+						multiParam.append(",");
+					} else {
+						multiParam.append("|");
+					}
+				}
+				multiParam.append(multiParams[i]);
+			}
+		}
+
+		return multiParam.toString();
+	}
+}