fix : 오류 수정

dev
이범준 4 months ago
parent 47e8a24e45
commit 9ccf317eb3

@ -201,9 +201,7 @@ public class AddsNimsController extends ApplicationController {
.toList(); .toList();
mav.addObject("fileInfos", toJson(fileInfos)); mav.addObject("fileInfos", toJson(fileInfos));
// 폐기증거사진 - 폐기증거사진 등록 정보 조회 // 폐기증거사진 - 폐기증거사진 등록 정보 조회
mav.addObject("dsuseRsltImgList", mav.addObject("dsuseRsltImgList","[]");
toJson("[]")
);
// 폐기일자가 있는 경우 - 폐기증거사진 등록 정보 조회 // 폐기일자가 있는 경우 - 폐기증거사진 등록 정보 조회
if(!isEmpty(dsuseRsltInfo.getDsuseDe())) { if(!isEmpty(dsuseRsltInfo.getDsuseDe())) {
@ -486,28 +484,6 @@ public class AddsNimsController extends ApplicationController {
Map<String,String> globalVariable = new HashMap<String,String>(); Map<String,String> globalVariable = new HashMap<String,String>();
printOption.setGlobalVariable(globalVariable); printOption.setGlobalVariable(globalVariable);
for(DataObject data : dataForDoc) {
String infKey = data.string("dscdmngId");
String subType = data.string("dscdmngSn");
List<DataObject> fileinfo = fileService.getFileList(
new FileQuery().setInfoKeys(infKey).setInfoType("100").setBy("SUB_TYPE").setTerm(subType)
);
if(fileinfo == null) { fileinfo = new ArrayList<DataObject>(); }
fileinfo = fileinfo.stream()
.filter((item) -> item.string("USE_YN").equals("Y"))
.sorted((item1, item2) -> item1.string("FILE_ID").compareTo(item2.string("FILE_ID")))
.toList();
if(fileinfo.isEmpty()) {
data.put("filePath", "");
} else {
data.put("filePath", fileinfo.get(fileinfo.size()-1).string("FILE_PATH"));
}
}
//1.한글문서파일 데이터 입력 //1.한글문서파일 데이터 입력
DisposeResultReport form = new DisposeResultReport(print, printOption, dataForDoc); DisposeResultReport form = new DisposeResultReport(print, printOption, dataForDoc);
//2.한글문서파일 생성 //2.한글문서파일 생성

@ -103,8 +103,8 @@
<th class="cmn" style="width: 120.469px;">폐기일자</th> <th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기방법</th> <th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 250.469px;">업체명</th> <th class="cmn" style="width: 250.469px;">업체명</th>
<th class="cmn" style="width: 140.469px;">폐기결과보고서</th> <th class="cmn" style="width: 150px;">폐기결과보고서</th>
<th class="cmn" style="width: 140.469px;">처리내역및사진</th> <th class="cmn" style="width: 150px;">처리내역및사진</th>
<th class="cmn" style="width: 120.141px;">취급일자</th> <th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 90px;">폐기건수</th> <th class="cmn" style="width: 90px;">폐기건수</th>
<th class="cmn" style="width: 160.469px;">처리상태</th> <th class="cmn" style="width: 160.469px;">처리상태</th>

Loading…
Cancel
Save