diff --git a/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeProcessDetails.java b/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeProcessDetails.java index 5505dd3..3366b6a 100644 --- a/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeProcessDetails.java +++ b/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeProcessDetails.java @@ -54,7 +54,7 @@ public class DisposeProcessDetails extends HWPFormat { } if(mod == 1) { page = new DataObject(); - page.set("폐기증거제목", "폐기 증거"); + page.set("폐기증거제목", "사고마약류 등 가수분해 사진"); } page.set("폐기증거사진"+mod+"경로", afterPhotoPaths.get(i)); @@ -134,7 +134,7 @@ public class DisposeProcessDetails extends HWPFormat { .set("폐기정보-폐기종류", one.string("dsuseSeCdNm")) .set("폐기정보-폐기사유", one.string("dsusePrvCdNm")) .set("폐기정보-폐기장소", one.string("dsuseLoc")) - .set("폐기정보-폐기방법", one.string("dsuseMthCd")) + .set("폐기정보-폐기방법", one.string("dsuseMthCdNm")) .set("제품정보-구분", one.string("nrcdSeNm")) .set("제품정보-제품명", one.string("prductNm")) .set("제품정보-품목코드", one.string("prductCd")) @@ -177,7 +177,7 @@ public class DisposeProcessDetails extends HWPFormat { newObj.set("폐기전사진6제목", one.string("폐기전사진6제목")); newObj.set("폐기전사진6", writer.image().add(one.string("폐기전사진6경로"))); } - writer.table(0, 0, 4).setValues(List.of(newObj)); + writer.table(0, 1, 4).setValues(List.of(newObj)); } else if(this.formatFilePath.equals("template/hwp/photo_after_dispose.hwp")){ DataObject one = data3.get(currentRunCount-1-data2.size()); diff --git a/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeResultReport.java b/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeResultReport.java index ef024db..16186e1 100644 --- a/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeResultReport.java +++ b/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeResultReport.java @@ -34,7 +34,7 @@ public class DisposeResultReport extends HWPFormat { .set("폐기정보-폐기종류", one.string("dsuseSeCdNm")) .set("폐기정보-폐기사유", one.string("dsusePrvCdNm")) .set("폐기정보-폐기장소", one.string("dsuseLoc")) - .set("폐기정보-폐기방법", one.string("dsuseMthCd")) + .set("폐기정보-폐기방법", one.string("dsuseMthCdNm")) .set("제품정보-구분", one.string("nrcdSeNm")) .set("제품정보-제품명", one.string("prductNm")) .set("제품정보-품목코드", one.string("prductCd")) diff --git a/src/main/resources/template/hwp/photo_after_dispose.hwp b/src/main/resources/template/hwp/photo_after_dispose.hwp index 0ca1b60..be70b1c 100644 Binary files a/src/main/resources/template/hwp/photo_after_dispose.hwp and b/src/main/resources/template/hwp/photo_after_dispose.hwp differ diff --git a/src/main/resources/template/hwp/photo_before_dispose.hwp b/src/main/resources/template/hwp/photo_before_dispose.hwp index 9c3742d..56b041f 100644 Binary files a/src/main/resources/template/hwp/photo_before_dispose.hwp and b/src/main/resources/template/hwp/photo_before_dispose.hwp differ