diff --git a/src/main/java/cokr/xit/fims/cmmn/xls/FormatMaker.java b/src/main/java/cokr/xit/fims/cmmn/xls/FormatMaker.java index ead9351d..ba1ae247 100644 --- a/src/main/java/cokr/xit/fims/cmmn/xls/FormatMaker.java +++ b/src/main/java/cokr/xit/fims/cmmn/xls/FormatMaker.java @@ -4,7 +4,6 @@ import java.io.File; import java.util.Map; import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.ss.usermodel.CellStyle; import cokr.xit.base.docs.xls.Comment; import cokr.xit.base.docs.xls.Format; @@ -48,17 +47,17 @@ public class FormatMaker { } - public static Format yyyy_mm_dd_hh_mm_ss(Format format, CellStyle dateDT, String key) { + public static Format yyyy_mm_dd_hh_mm_ss(Format format, String key) { return format.of(key).value(o -> { return DataFormat.yyyy_mm_dd_hh_mm_ss(((Map) o).get(key)); - }).style(dateDT); + }); } - public static Format yyyy_mm_dd(Format format, CellStyle dateYMD, String key) { + public static Format yyyy_mm_dd(Format format, String key) { return format.of(key).value(o -> { return DataFormat.yyyy_mm_dd_hh_mm_ss(((Map) o).get(key)); - }).style(dateYMD); + }); } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 34b26089..a9afaab8 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -133,14 +133,14 @@ public class Crdn06Controller extends ApplicationController { Map valueMap = new HashMap(); valueMap.put("자료출처", format.of("CRDN_INPT_SE_NM").style(center)); valueMap.put("차량번호", left); - valueMap.put("위반일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format,dateDT,"CRDN_YMD_TM")); + valueMap.put("위반일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format,"CRDN_YMD_TM").style(dateDT)); valueMap.put("단속장소", left); valueMap.put("사진건수", center); valueMap.put("스티커번호", left); valueMap.put("장애차량확인", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); valueMap.put("처리상태", format.of("CRDN_STTS_NM").style(center)); valueMap.put("제외사유", format.of("LEVY_EXCL_RSN_NM").style(center)); - valueMap.put("제외처리일자", FormatMaker.yyyy_mm_dd(format,dateYMD,"LEVY_EXCL_YMD")); + valueMap.put("제외처리일자", FormatMaker.yyyy_mm_dd(format,"LEVY_EXCL_YMD").style(dateYMD)); valueMap.put("제외내역", left); if(ifEmpty(query.getIncludePhoto(), () -> "").equals("Y")) { valueMap.put("사진1", FormatMaker.photoCellForApproval(format, comment, "CRDN_PHOTO_PATH1")); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index c3807a14..29cf0eee 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -127,9 +127,9 @@ public class Cvlc02Controller extends ApplicationController { valueMap.put("신고자", center); valueMap.put("담당자", center); valueMap.put("담당자전화번호", center); - valueMap.put("접수일자", FormatMaker.yyyy_mm_dd(format,dateYMD,"CVLCPT_RCPT_YMD")); - valueMap.put("처리기한", FormatMaker.yyyy_mm_dd_hh_mm_ss(format,dateDT,"CVLCPT_PRCS_PRNMNT_DT")); - valueMap.put("위반일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format,dateDT,"CRDN_YMD_TM")); + valueMap.put("접수일자", FormatMaker.yyyy_mm_dd(format,"CVLCPT_RCPT_YMD").style(dateYMD)); + valueMap.put("처리기한", FormatMaker.yyyy_mm_dd_hh_mm_ss(format,"CVLCPT_PRCS_PRNMNT_DT").style(dateDT)); + valueMap.put("위반일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format,"CRDN_YMD_TM").style(dateDT)); valueMap.put("위반내용", center); valueMap.put("차량번호", left); valueMap.put("서손/계고사유", center);