Browse Source

Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

JUSEUNG 5 years ago
parent
commit
8288df63f8

+ 57 - 43
src/main/java/com/style24/admin/biz/service/TsaMorebetterService.java

@@ -1,5 +1,7 @@
 package com.style24.admin.biz.service;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.MoreBetter;
@@ -7,6 +9,7 @@ import com.style24.persistence.domain.MoreBetterBurden;
 import com.style24.persistence.domain.MoreBetterGoods;
 import com.style24.persistence.domain.MoreBetterSection;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -118,132 +121,143 @@ public class TsaMorebetterService {
 
     /**
      * 다다익선 저장
-     * @param tmtb
+     * @param moreBetter
      * @return
      * @author bin2107
      * @since 2021. 1. 5
      */
     @Transactional("shopTxnManager")
-    public void saveMoreBetterDetail(MoreBetter tmtb) {
+    public void saveMoreBetterDetail(MoreBetter moreBetter) {
+        Gson gson = new Gson();
+        String jsonData = gson.toJson(moreBetter);
+
         // <,> replace 처리
-        tmtb.setRegNo(TsaSession.getInfo().getUserNo());
-        tmtb.setUdpNo(TsaSession.getInfo().getUserNo());
+        moreBetter.setRegNo(TsaSession.getInfo().getUserNo());
+        moreBetter.setUdpNo(TsaSession.getInfo().getUserNo());
 
         // TMTB 마스터(TB_TMTB) 저장
-        morebetterDao.saveMorebetterMst(tmtb);
+        morebetterDao.saveMorebetterMst(moreBetter);
 
         // 다다익선 적용대상 설정
         // 공급업체
-        Collection<MoreBetterGoods> supplyCompList = tmtb.getSupplyCompListNew();
+        Collection<MoreBetterGoods> supplyCompList = gson.fromJson(moreBetter.getSupplyCompList() , new TypeToken<Collection<MoreBetterGoods>>(){}.getType());
         for(MoreBetterGoods regSupplyComp : supplyCompList){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
             // tmtbGoodsSq 생성
             log.info("regSupplyComp.getTmtbGoodsSq = {}",regSupplyComp.getTmtbGoodsSq());
-            if("".equals(regSupplyComp.getTmtbGoodsSq())){
-                Integer tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
+            Integer tmtbGoodsSq = regSupplyComp.getTmtbGoodsSq();
+            if(tmtbGoodsSq == null){
+                tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
                 regSupplyComp.setTmtbGoodsSq(tmtbGoodsSq);
             }
-            regSupplyComp.setTmtbSq(tmtb.getTmtbSq());
+            regSupplyComp.setTmtbSq(moreBetter.getTmtbSq());
             regSupplyComp.setGoodsGb("G800_20");
             regSupplyComp.setTargetVal(regSupplyComp.getSupplyCompCd());
-            regSupplyComp.setRegNo(tmtb.getRegNo());
-            regSupplyComp.setUdpNo(tmtb.getUdpNo());
+            regSupplyComp.setRegNo(moreBetter.getRegNo());
+            regSupplyComp.setUdpNo(moreBetter.getUdpNo());
 
             morebetterDao.saveMorebetterGoods(regSupplyComp);
         }
 
         // 브랜드
-        Collection<MoreBetterGoods> brandList = tmtb.getBrandListNew();
+        Collection<MoreBetterGoods> brandList = gson.fromJson(moreBetter.getBrandList() , new TypeToken<Collection<MoreBetterGoods>>(){}.getType());
         for(MoreBetterGoods regBrand : brandList){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
             // tmtbGoodsSq 생성
             log.info("regBrand.getTmtbGoodsSq = {}",regBrand.getTmtbGoodsSq());
-            if("".equals(regBrand.getTmtbGoodsSq())){
-                Integer tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
+            Integer tmtbGoodsSq = regBrand.getTmtbGoodsSq();
+            if(tmtbGoodsSq == null){
+                tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
                 regBrand.setTmtbGoodsSq(tmtbGoodsSq);
             }
-            regBrand.setTmtbSq(tmtb.getTmtbSq());
+            regBrand.setTmtbSq(moreBetter.getTmtbSq());
             regBrand.setGoodsGb("G800_20");
             regBrand.setTargetVal(regBrand.getBrandCd());
-            regBrand.setRegNo(tmtb.getRegNo());
-            regBrand.setUdpNo(tmtb.getUdpNo());
+            regBrand.setRegNo(moreBetter.getRegNo());
+            regBrand.setUdpNo(moreBetter.getUdpNo());
 
             morebetterDao.saveMorebetterGoods(regBrand);
         }
 
         // 적용상품
-        Collection<MoreBetterGoods> applyGoodsList = tmtb.getApplyGoodsListNew();
+        Collection<MoreBetterGoods> applyGoodsList = gson.fromJson(moreBetter.getApplyGoodsList() , new TypeToken<Collection<MoreBetterGoods>>(){}.getType());
         for(MoreBetterGoods regApplyGoods : applyGoodsList){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
             // tmtbGoodsSq 생성
             log.info("regApplyGoods.getTmtbGoodsSq = {}",regApplyGoods.getTmtbGoodsSq());
-            if("".equals(regApplyGoods.getTmtbGoodsSq())){
-                Integer tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
+            Integer tmtbGoodsSq = regApplyGoods.getTmtbGoodsSq();
+            if(tmtbGoodsSq == null){
+                tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
                 regApplyGoods.setTmtbGoodsSq(tmtbGoodsSq);
             }
-            regApplyGoods.setTmtbSq(tmtb.getTmtbSq());
+            regApplyGoods.setTmtbSq(moreBetter.getTmtbSq());
             regApplyGoods.setTargetVal(regApplyGoods.getGoodsCd());
-            regApplyGoods.setRegNo(tmtb.getRegNo());
-            regApplyGoods.setUdpNo(tmtb.getUdpNo());
+            regApplyGoods.setRegNo(moreBetter.getRegNo());
+            regApplyGoods.setUdpNo(moreBetter.getUdpNo());
 
             morebetterDao.saveMorebetterGoods(regApplyGoods);
         }
 
         // 제외상품
-        Collection<MoreBetterGoods> exceptGoodsList = tmtb.getExceptGoodsListNew();
+        Collection<MoreBetterGoods> exceptGoodsList = gson.fromJson(moreBetter.getExceptGoodsList() , new TypeToken<Collection<MoreBetterGoods>>(){}.getType());
         for(MoreBetterGoods regExceptGoods : exceptGoodsList){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
             // tmtbGoodsSq 생성
             log.info("regExceptGoods.getTmtbGoodsSq = {}",regExceptGoods.getTmtbGoodsSq());
-            if("".equals(regExceptGoods.getTmtbGoodsSq())){
-                Integer tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
+            Integer tmtbGoodsSq = regExceptGoods.getTmtbGoodsSq();
+            if(tmtbGoodsSq == null){
+                tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
                 regExceptGoods.setTmtbGoodsSq(tmtbGoodsSq);
             }
-            regExceptGoods.setTmtbSq(tmtb.getTmtbSq());
+            regExceptGoods.setTmtbSq(moreBetter.getTmtbSq());
             regExceptGoods.setTargetVal(regExceptGoods.getGoodsCd());
-            regExceptGoods.setRegNo(tmtb.getRegNo());
-            regExceptGoods.setUdpNo(tmtb.getUdpNo());
+            regExceptGoods.setRegNo(moreBetter.getRegNo());
+            regExceptGoods.setUdpNo(moreBetter.getUdpNo());
 
             morebetterDao.saveMorebetterGoods(regExceptGoods);
         }
 
         // 다다익선 할인구간 저장
-        Collection<MoreBetterSection> sectionGbList = tmtb.getSectionGbListNew();
+        Collection<MoreBetterSection> sectionGbList = gson.fromJson(moreBetter.getSectionGbList() , new TypeToken<Collection<MoreBetterSection>>(){}.getType());
         for(MoreBetterSection regSection : sectionGbList){
             log.info("regSection.getTmtbSectionSq = {}",regSection.getTmtbSectionSq());
             log.info("regSection.getTmtbValSq = {}",regSection.getTmtbValSq());
             // 다다익선 할인구간설정 2차조건(TB_TMTB_SECTION) 저장
             // tmtbSectionSq 생성
-            if("".equals(regSection.getTmtbSectionSq()) || regSection.getTmtbSectionSq() == null){
-                Integer tmtbSectionSq =  commonService.getNextSequence("SEQ_TMTB_SECTION");
+            Integer tmtbSectionSq = regSection.getTmtbSectionSq();
+            //if("".equals(regSection.getTmtbSectionSq()) || regSection.getTmtbSectionSq() == null){
+            if(tmtbSectionSq == null){
+                tmtbSectionSq =  commonService.getNextSequence("SEQ_TMTB_SECTION");
                 regSection.setTmtbSectionSq(tmtbSectionSq);
             }
             // 다다익선 조건에 따른 할인혜택(금액할인) 설정(TB_TMTB_VAL) 저장
             // tmtbValSq 생성
-            if("".equals(regSection.getTmtbValSq()) || regSection.getTmtbValSq() == null){
-                Integer tmtbValSq =  commonService.getNextSequence("SEQ_TMTB_VAL");
+            Integer tmtbValSq = regSection.getTmtbValSq();
+            if(tmtbValSq == null){
+                tmtbValSq =  commonService.getNextSequence("SEQ_TMTB_VAL");
                 regSection.setTmtbValSq(tmtbValSq);
             }
-            regSection.setTmtbSq(tmtb.getTmtbSq());
-            regSection.setRegNo(tmtb.getRegNo());
-            regSection.setUdpNo(tmtb.getUdpNo());
+            regSection.setTmtbSq(moreBetter.getTmtbSq());
+            regSection.setRegNo(moreBetter.getRegNo());
+            regSection.setUdpNo(moreBetter.getUdpNo());
 
             morebetterDao.saveMorebetterSection(regSection);
             morebetterDao.saveMorebetterVal(regSection);
         }
 
         // 다다익선 업체분담율(TB_TMTB_BURDEN) 저장
-        Collection<MoreBetterBurden> burdenList = tmtb.getBurdenListNew();
+        Collection<MoreBetterBurden> burdenList = gson.fromJson(moreBetter.getBurdenList() , new TypeToken<Collection<MoreBetterBurden>>(){}.getType());
         for (MoreBetterBurden regBurden : burdenList) {
             // tmtbBurdenSq 생성
             log.info("regBurden.getTmtbBurdenSq = {}",regBurden.getTmtbBurdenSq());
-            if("".equals(regBurden.getTmtbBurdenSq())){
-                Integer tmtbBurdenSq =  commonService.getNextSequence("SEQ_TMTB_BURDEN");
+            Integer tmtbBurdenSq = regBurden.getTmtbBurdenSq();
+            if(tmtbBurdenSq == null){
+                tmtbBurdenSq =  commonService.getNextSequence("SEQ_TMTB_BURDEN");
                 regBurden.setTmtbBurdenSq(tmtbBurdenSq);
             }
-            regBurden.setTmtbSq(tmtb.getTmtbSq());
-            regBurden.setRegNo(tmtb.getRegNo());
-            regBurden.setUdpNo(tmtb.getUdpNo());
+            regBurden.setTmtbSq(moreBetter.getTmtbSq());
+            regBurden.setRegNo(moreBetter.getRegNo());
+            regBurden.setUdpNo(moreBetter.getUdpNo());
 
             morebetterDao.saveMorebetterBurden(regBurden);
         }

+ 16 - 100
src/main/java/com/style24/admin/biz/web/TsaMarketingController.java

@@ -3,6 +3,9 @@ package com.style24.admin.biz.web;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.io.InputStream;
+import java.lang.reflect.Array;
+import java.lang.reflect.Type;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,30 +21,20 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.style24.admin.biz.service.TsaBusinessService;
-import com.style24.admin.biz.service.TsaCommonService;
-import com.style24.admin.biz.service.TsaCouponService;
-import com.style24.admin.biz.service.TsaMarketingService;
-import com.style24.admin.biz.service.TsaMorebetterService;
-import com.style24.admin.biz.service.TsaRendererService;
-import com.style24.admin.biz.service.TsaSystemService;
+import com.style24.admin.biz.service.*;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TsaPageRequest;
-import com.style24.persistence.domain.CommonCode;
-import com.style24.persistence.domain.Coupon;
-import com.style24.persistence.domain.FreeGoodsPromotion;
-import com.style24.persistence.domain.MoreBetter;
-import com.style24.persistence.domain.MoreBetterBurden;
-import com.style24.persistence.domain.MoreBetterGoods;
-import com.style24.persistence.domain.MoreBetterSection;
+import com.style24.persistence.domain.*;
 
 import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
-
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 /**
  * 마케팅 Controller
  * @author xodud1202
@@ -329,7 +322,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 */
 	@ResponseBody
 	@GetMapping("/morebetterRegPopup/form")
-	public ModelAndView morebetterRegForm(@RequestParam(value = "mode") String mode, @RequestParam(value = "tmtbSeq", required = false) Integer tmtbSeq, MoreBetter tmtb) {
+	public ModelAndView morebetterRegForm(@RequestParam(value = "mode") String mode, @RequestParam(value = "tmtbSeq", required = false) Integer tmtbSeq,MoreBetter moreBetter) {
 		ModelAndView mav = new ModelAndView();
 
 		// 상품상태 : 등록일때는 '대기'
@@ -354,9 +347,9 @@ public class TsaMarketingController extends TsaBaseController {
 
 		//tmtb sq 자동생성
 		Integer tmtbSq;
-		if ("N".equals(mode)) {
-			tmtbSq = commonService.getNextSequence("SEQ_TMTB");
-			tmtb.setTmtbSq(tmtbSq);
+		if("N".equals(mode)){
+			tmtbSq =  commonService.getNextSequence("SEQ_TMTB");
+			moreBetter.setTmtbSq(tmtbSq);
 		}
 
 		if ("U".equals(mode)) {
@@ -380,8 +373,8 @@ public class TsaMarketingController extends TsaBaseController {
 
 		mav.addObject("mode", mode);
 		mav.addObject("tmtbSeq", tmtbSeq);
-		mav.addObject("params", tmtb);
-		log.info("CHECK param tmtbSq::{}", tmtb.getTmtbSq());
+		mav.addObject("params", moreBetter);
+		log.info("CHECK param tmtbSq::{}", moreBetter.getTmtbSq());
 		mav.setViewName("marketing/MorebetterRegForm");
 		return mav;
 	}
@@ -396,85 +389,8 @@ public class TsaMarketingController extends TsaBaseController {
 	 */
 	@PostMapping("/morebetter/save")
 	@ResponseBody
-	public GagaResponse saveMorebetterDetail(@RequestBody MoreBetter tmtb) {
-		Collection<MoreBetterGoods> tmtbSupplyCompList = null;
-		Collection<MoreBetterGoods> tmtbBrandList = null;
-		Collection<MoreBetterGoods> tmtbApplyGoodsList = null;
-		Collection<MoreBetterGoods> tmtbExceptGoodsList = null;
-		Collection<MoreBetterBurden> tmtbBurdenList = null;
-		Collection<MoreBetterSection> tmtbSectionGbList = null;
-		ObjectMapper mapper = new ObjectMapper();
-
-		// 공급업체
-		try {
-			if (tmtb.getSupplyCompList() != null) {
-				tmtbSupplyCompList = mapper.readValue(tmtb.getSupplyCompList(), new TypeReference<Collection<MoreBetterGoods>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		// 브랜드
-		try {
-			if (tmtb.getBrandList() != null) {
-				tmtbBrandList = mapper.readValue(tmtb.getBrandList(), new TypeReference<Collection<MoreBetterGoods>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		// 적용상품
-		try {
-			if (tmtb.getApplyGoodsList() != null) {
-				tmtbApplyGoodsList = mapper.readValue(tmtb.getApplyGoodsList(), new TypeReference<Collection<MoreBetterGoods>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		// 적용상품
-		try {
-			if (tmtb.getExceptGoodsList() != null) {
-				tmtbExceptGoodsList = mapper.readValue(tmtb.getExceptGoodsList(), new TypeReference<Collection<MoreBetterGoods>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		// 할인구간
-		try {
-			if (tmtb.getSectionGbList() != null) {
-				tmtbSectionGbList = mapper.readValue(tmtb.getSectionGbList(), new TypeReference<Collection<MoreBetterSection>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		// 업체분담율
-		try {
-			if (tmtb.getBurdenList() != null) {
-				tmtbBurdenList = mapper.readValue(tmtb.getBurdenList(), new TypeReference<Collection<MoreBetterBurden>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		log.info("tmtb::{}", tmtb);
-
-		tmtb.setSupplyCompListNew(tmtbSupplyCompList);
-		tmtb.setBrandListNew(tmtbBrandList);
-		tmtb.setApplyGoodsListNew(tmtbApplyGoodsList);
-		tmtb.setExceptGoodsListNew(tmtbExceptGoodsList);
-		tmtb.setSectionGbListNew(tmtbSectionGbList);
-		tmtb.setBurdenListNew(tmtbBurdenList);
-
-		morebetterService.saveMoreBetterDetail(tmtb);
-
+	public GagaResponse saveMorebetterDetail(@RequestBody MoreBetter moreBetter) {
+		morebetterService.saveMoreBetterDetail(moreBetter);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 	/**

+ 3 - 10
src/main/java/com/style24/persistence/domain/MoreBetter.java

@@ -16,15 +16,15 @@ import java.util.Collection;
 @Data
 public class MoreBetter extends TscBaseDomain {
 	// 다다익선 마스터
-	private int tmtbSq;				// 프로모션ID
+	private Integer tmtbSq;				// 프로모션ID
 	private String tmtbNm;			// 프로모션명
 	private String tmtbStat;		// 프로모션 상태
 	private String tmtbStdt;		// 프로모션 시작일
 	private String tmtbEddt;		// 프로모션 종료일
 	private String multiYn;			// 복수,단수설정
 	private String delYn;			// 삭제여부
-	private Integer regNo;			// 등록자
-	private String  regDt;			// 등록일시
+	//private Integer regNo;			// 등록자
+	//private String  regDt;			// 등록일시
 	private Integer udpNo;			// 수정자
 	private String  udtDt;			// 수정일시
 	private String searchGubun;		// 프로모션 조회 검색 구분
@@ -59,13 +59,6 @@ public class MoreBetter extends TscBaseDomain {
 	//private String burdenRate;	// 업체분담율
 	private String useYn;			// 사용여부
 
-	private Collection<MoreBetterGoods> supplyCompListNew;
-	private Collection<MoreBetterGoods> brandListNew;
-	private Collection<MoreBetterGoods> applyGoodsListNew;
-	private Collection<MoreBetterGoods> exceptGoodsListNew;
-	private Collection<MoreBetterBurden> burdenListNew;
-	private Collection<MoreBetterSection> sectionGbListNew;
-
 	private String supplyCompList;
 	private String brandList;
 	private String applyGoodsList;

+ 2 - 2
src/main/java/com/style24/persistence/domain/MoreBetterBurden.java

@@ -19,8 +19,8 @@ public class MoreBetterBurden extends TscBaseDomain {
 	private String tmtbSupplyCd;	// 업체코드
 	private String tmtbBurdenRate;	// 업체분담율
 	private String useYn;			// 사용여부
-	private Integer regNo;			// 등록자
-	private String  regDt;			// 등록일시
+	//private Integer regNo;			// 등록자
+	//private String  regDt;			// 등록일시
 	private Integer udpNo;			// 수정자
 	private String  udtDt;			// 수정일시
 

+ 4 - 4
src/main/java/com/style24/persistence/domain/MoreBetterGoods.java

@@ -17,14 +17,14 @@ import java.util.Collection;
 @Data
 public class MoreBetterGoods extends TscBaseDomain {
 	// 다다익선 적용대상
-	private int tmtbGoodsSq;		// 업체분담율Sq
-	private int tmtbSq;				// 프로모션Sq
+	private Integer tmtbGoodsSq;		// 업체분담율Sq
+	private Integer tmtbSq;				// 프로모션Sq
 	private String goodsGb;			// 공통코드 (G800_10|기본상품, G800_20|적용상품, G800_30|제외상품, G800_40|ALL)
 	private String targetGb;		// 적용대상 (G260_10|상품, G260_12|브랜드, G260_13|공급처)
 	private String targetVal;		// 브랜드코드, 상품코드, 공급처코드
 	private String delYn;			// 삭제여부
-	private Integer regNo;			// 등록자
-	private String  regDt;			// 등록일시
+	//private Integer regNo;			// 등록자
+	//private String  regDt;			// 등록일시
 	private Integer udpNo;			// 수정자
 	private String  udtDt;			// 수정일시
 

+ 2 - 2
src/main/java/com/style24/persistence/domain/MoreBetterSection.java

@@ -25,8 +25,8 @@ public class MoreBetterSection extends TscBaseDomain {
 	private Integer dcVal;			// 할인값
 
 	private String  delYn;			// 삭제여부
-	private Integer regNo;			// 등록자
-	private String  regDt;			// 등록일시
+	//private Integer regNo;			// 등록자
+	//private String  regDt;			// 등록일시
 	private Integer udpNo;			// 수정자
 	private String  udtDt;			// 수정일시
 

+ 2 - 1
src/main/webapp/WEB-INF/views/marketing/MorebetterRegForm.html

@@ -67,7 +67,7 @@
 						<td>
 							<!-- 상태 입력 : before
                             <input class="w50p" type="text" id="disTmtbStat" name="disTmtbStat" maxlength="30" th:value="${params.tmtbStat}" disabled=""/>-->
-							<label class="rdoBtn" th:if="${tmtbStatList}" th:each="oneData, status : ${tmtbStatList}" ><input type="radio" id="disTmtbStat" name="disTmtbStat" th:value="${oneData.cd}" th:text="${oneData.cdNm}" required="required" data-valid-name="상태"/></label>
+							<label class="rdoBtn" th:if="${tmtbStatList}" th:each="oneData, status : ${tmtbStatList}" ><input type="radio" id="disTmtbStat" name="disTmtbStat" th:value="${oneData.cd}" th:text="${oneData.cdNm}" data-valid-name="상태"/></label>
 							<input type="hidden" id="tmtbStat" name="tmtbStat"/>
 						</td>
 					</tr>
@@ -410,6 +410,7 @@
 	gridOptionsFGExceptGoodsList.rowSelection = "multiple";
 	// 업체분담율 리스트 설정
 	var gridOptionsApplyBurdenList = gagaAgGrid.getGridOptions(columnApplyBurdenList);
+	gridOptionsApplyBurdenList.defaultColDef.editable = true;
 	gridOptionsApplyBurdenList.rowSelection = "multiple";
 	// 구간 할인/혜택 설정
 	var gridOptionsSectionGbList = gagaAgGrid.getGridOptions(columnSectionGbList);