tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tolag3'

Browse Source
This commit is contained in:
leejunho 2025-02-12 16:15:03 +09:00
commit 07b20c3670
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/kcc/com/pdf/service/PdfVO.java
View File

@ -74,5 +74,6 @@ public class PdfVO {
@JsonIgnore private String fileName;
@JsonIgnore private String fileExtension;
@JsonIgnore private String rceptNo;
@JsonIgnore private String codeName;
}

14
src/main/java/kcc/com/pdf/service/impl/PdfServiceImpl.java
View File

@ -197,11 +197,23 @@ public class PdfServiceImpl extends EgovAbstractServiceImpl implements PdfServic
//pdf 포함파일 명들
StringBuilder fileNames = new StringBuilder("표지");
//codeName
processList.stream().forEach(t ->
{
PdfVO.Options optionsFileBefore = new PdfVO.Options();
optionsFileBefore.setMergeSrcUri(hostUri + "/gtm/case/pdfSubjectPop.do?caseNo=" + t.getCodeName());
PdfVO.Option optionFileBefore = new PdfVO.Option();
optionFileBefore.setLabel(t.getCodeName());
optionFileBefore.setHtmlUrlResource(true);
optionsFileBefore.getOption().add(optionFileBefore);
mergeTask.getOptions().add(optionsFileBefore);
PdfVO.Options options = new PdfVO.Options();
if(t.getResultFilePath().startsWith("/usr/local/homepage/WEB-INF/views/site/case/upload/uploadFiles/case")) {
;
options.setMergeSrcUri("file:/Z:" + t.getResultFilePath().substring("/usr/local/homepage/WEB-INF/views/site/case/upload/uploadFiles/case".length()));
}else {
options.setMergeSrcUri("file:/Z:" + pdfFilePath + t.getResultFilePath());

7
src/main/resources/egovframework/sqlmap/com/pdf/Pdf_SQL_Oracle.xml
View File

@ -13,9 +13,10 @@
, BB.FILE_PATH || BB.FILE_ORGNAME AS resultFilePath
, BB.FILE_EXTENSION AS fileExtension
, CC.RCEPT_NO AS rceptNo
, E.CODE_NAME AS codeName
FROM
(
SELECT
<!-- SELECT
TO_CHAR(A.CFRNC_NO) AS CFRNC_NO
, A.CASE_NO
FROM
@ -35,7 +36,7 @@
FROM
C_DLBRTMTR C
UNION
ALL
ALL -->
SELECT
D.RCEPT_NO AS CFRNC_NO
, D.CASE_NO
@ -46,6 +47,8 @@
ON TO_CHAR(AA.CFRNC_NO) = BB.FILE_NO
LEFT OUTER JOIN C_MASTER CC
ON AA.CASE_NO = CC.CASE_NO
LEFT JOIN C_CODE E
ON BB.FILE_GUBUN = E.CODE_IDXS
WHERE
BB.DEL_GUBUN = 'N'
AND AA.CASE_NO = #caseNo#

3
src/main/webapp/WEB-INF/jsp/com/pdf/pdfList.jsp
View File

@ -45,7 +45,8 @@
<input type="hidden" id="rceptNo" name="rceptNo" value="${pdfVO.rceptNo}"/>
</form>
<div class="btn_wrap right">
<button type="button" class="btn btn_text btn_45 darkblue_fill" onclick="docProcess();">문서요청</button>
<!-- <button type="button" class="btn btn_text btn_45 darkblue_fill" onclick="docProcess();">문서요청</button> -->
<button type="button" class="btn btn_text btn_45 darkblue_fill" onclick="docProcess();">업로드문서 통합</button>
<a href="#" onclick="location.reload();">
<img alt="새로고침" src="/img/page_refresh_big.png">
</a>

3
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendView.jsp
View File

@ -1000,7 +1000,8 @@ function docOpen(){
<button type="button" class="btn-default" onclick="smsAutoPopOpen('${caseNo}', '3');" style="margin-left: 5px; margin-bottom: 5px;">종료통지SMS</button>
</c:if>
<button type="button" class="btn-default" onclick="docOpen();" >사건문서</button>
<!-- <button type="button" class="btn-default" onclick="docOpen();" >사건문서</button> -->
<button type="button" class="btn-default" onclick="docOpen();" >업로드문서 통합 / 문서요청</button>
</div>