Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
This commit is contained in:
myname
commit
1b4361ee96
@ -190,6 +190,7 @@ public class SeedFileService {
|
||||
siteIdx = SeedUtils.setReplaceNull(request.getParameter("siteIdx"));
|
||||
}
|
||||
String fileFuncType = (String)paramMap.get("fileFuncType");
|
||||
String fileFuncTypeOri = fileFuncType;
|
||||
|
||||
SeedProperties seedProperties = new SeedProperties();
|
||||
|
||||
@ -237,6 +238,21 @@ public class SeedFileService {
|
||||
copyContractYn = copyContractYnList[i];
|
||||
}
|
||||
|
||||
|
||||
/*250407 - 내부결재 첨부파일 처리 추가 */
|
||||
if("4840000000".equals(fileGubunData)) {
|
||||
fileFuncType = "x-1";
|
||||
SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ "/" +fileFuncType);
|
||||
}else if("4841000000".equals(fileGubunData)) {
|
||||
fileFuncType = "x-2";
|
||||
SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ "/" +fileFuncType);
|
||||
}else if("4842000000".equals(fileGubunData)) {
|
||||
fileFuncType = "x-3";
|
||||
SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ "/" +fileFuncType);
|
||||
}else {
|
||||
fileFuncType = fileFuncTypeOri;
|
||||
}
|
||||
|
||||
String fileType = uploadFileNameData.substring(uploadFileNameData.lastIndexOf(".")+1, uploadFileNameData.length());
|
||||
String reFileName = renameDate + "_" + SeedUtils.getSeedMD5Code(String.valueOf(SeedUtils.getRandom(999,1)));
|
||||
|
||||
@ -258,6 +274,7 @@ public class SeedFileService {
|
||||
paramMap.put("copyContractYn", copyContractYn);
|
||||
paramMap.put("fileGubun", fileGubunData);
|
||||
paramMap.put("fileMemo", fileMemoData);
|
||||
paramMap.put("fileFuncType", fileFuncType);
|
||||
//파일타입에 따라서 sql분기
|
||||
/*if(fileFuncType.equals("mediation")){
|
||||
dao.caseInsert(paramMap);
|
||||
|
||||
@ -1029,12 +1029,12 @@
|
||||
FROM C_CASEFILE CF
|
||||
WHERE FILE_NO = #{rceptNo}
|
||||
AND DEL_GUBUN = 'N'
|
||||
AND FILE_MEMO IN (
|
||||
AND (FILE_MEMO IS NULL OR FILE_MEMO IN (
|
||||
SELECT DOC_ID
|
||||
FROM C_SANCTNHISTORY
|
||||
WHERE CASE_NO = #{caseNo}
|
||||
AND RESULT IS NOT NULL
|
||||
)
|
||||
))
|
||||
</select>
|
||||
|
||||
<insert id="caseViewStatusInsert" parameterType="hashMap" useGeneratedKeys="false">
|
||||
|
||||
@ -3895,12 +3895,12 @@
|
||||
FROM C_CASEFILE CF
|
||||
WHERE FILE_NO = #{rceptNo}
|
||||
AND DEL_GUBUN = 'N'
|
||||
AND FILE_MEMO IN (
|
||||
AND (FILE_MEMO IS NULL OR FILE_MEMO IN (
|
||||
SELECT DOC_ID
|
||||
FROM C_SANCTNHISTORY
|
||||
WHERE CASE_NO = #{caseNo}
|
||||
AND RESULT IS NOT NULL
|
||||
)
|
||||
))
|
||||
</select>
|
||||
|
||||
<!--삭제처리 업데이트 -->
|
||||
|
||||
@ -6386,13 +6386,34 @@ function docOpen(obj) {
|
||||
<c:if test="${file.fileGubun == '4840000000'}">
|
||||
<div id="fileUploadP${status.count}" class="file_row">
|
||||
<img src="/kofair_case_seed/adm/images/component/icon_file_clip_blue.png"><a href="/seed/extra/down/file.do?dataIdx=${file.seqNo}&funcType=${file.fileFunc}&pathKey1=${siteIdx}">[${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner})</a>
|
||||
<!-- 그룹웨어 연동 파일의 경우 관리자만 삭제 가능 -->
|
||||
<c:choose>
|
||||
<c:when test="${not empty file.fileMemo}">
|
||||
<c:if test="${memberPosition == SeedConstants.GWANRIJA}">
|
||||
<a href="javascript:;" class="btn_file_del" onclick="javascript:jf_delete_file('${status.count}', '${file.fileSize}', 'Y', '19');"><i></i></a>
|
||||
</c:if>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<a href="javascript:;" class="btn_file_del" onclick="javascript:jf_delete_file('${status.count}', '${file.fileSize}', 'Y', '19');"><i></i></a>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<input type="hidden" name="fileIdx" value="${file.seqNo}" class="fileIdxClass"/>
|
||||
<input type="hidden" class="fileSeq_4840000000" value="${file.seqNo}" />
|
||||
</div>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</div>
|
||||
|
||||
<div class="fr">
|
||||
<c:choose>
|
||||
<c:when test="${masterData.statePro == '0404000000' && (memberId == masterData.caseExaminer || memberPosition == SeedConstants.GWANRIJA)}">
|
||||
<label for="upFile_19" class="btn-default violet responsive" style="width: 113px">파일 선택</label><br>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="bbs-view-item">
|
||||
@ -6410,6 +6431,17 @@ function docOpen(obj) {
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</div>
|
||||
|
||||
<div class="fr">
|
||||
<c:choose>
|
||||
<c:when test="${masterData.statePro == '0404000000' && (memberId == masterData.caseExaminer || memberPosition == SeedConstants.GWANRIJA)}">
|
||||
<label for="upFile_20" class="btn-default violet responsive" style="width: 113px">파일 선택</label><br>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="bbs-view-item">
|
||||
@ -6427,6 +6459,17 @@ function docOpen(obj) {
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</div>
|
||||
|
||||
<div class="fr">
|
||||
<c:choose>
|
||||
<c:when test="${masterData.statePro == '0404000000' && (memberId == masterData.caseExaminer || memberPosition == SeedConstants.GWANRIJA)}">
|
||||
<label for="upFile_21" class="btn-default violet responsive" style="width: 113px">파일 선택</label><br>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -10069,6 +10112,24 @@ function docOpen(obj) {
|
||||
<input type="file" name="upFile18" id="upFile_18" class="essential temp-file-hideen" onchange="fileTempUp(this, '4839000000');" required title="첨부파일" value="" style="ime-mode: disabled;" >
|
||||
</div>
|
||||
</form>
|
||||
<form id="fileTempUpFrm19" action="/seed/extra/temp/file.do" method="post" enctype="multipart/form-data">
|
||||
<input type="hidden" name="fileFuncType" value="x-1" />
|
||||
<div class="temp-file-area">
|
||||
<input type="file" name="upFile19" id="upFile_19" class="essential temp-file-hideen" onchange="fileTempUp(this, '4840000000');" required title="첨부파일" value="" style="ime-mode: disabled;" >
|
||||
</div>
|
||||
</form>
|
||||
<form id="fileTempUpFrm20" action="/seed/extra/temp/file.do" method="post" enctype="multipart/form-data">
|
||||
<input type="hidden" name="fileFuncType" value="x-2" />
|
||||
<div class="temp-file-area">
|
||||
<input type="file" name="upFile20" id="upFile_20" class="essential temp-file-hideen" onchange="fileTempUp(this, '4841000000');" required title="첨부파일" value="" style="ime-mode: disabled;" >
|
||||
</div>
|
||||
</form>
|
||||
<form id="fileTempUpFrm21" action="/seed/extra/temp/file.do" method="post" enctype="multipart/form-data">
|
||||
<input type="hidden" name="fileFuncType" value="x-3" />
|
||||
<div class="temp-file-area">
|
||||
<input type="file" name="upFile21" id="upFile_21" class="essential temp-file-hideen" onchange="fileTempUp(this, '4842000000');" required title="첨부파일" value="" style="ime-mode: disabled;" >
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<!-- 비즈박스 그룹웨어 연동 폼 -->
|
||||
<form name="nanumFrm" id="nanumFrm" action="" method="get">
|
||||
|
||||
@ -83,11 +83,12 @@ function jf_upload_set(fileName, reFileName, fileSize, fileType, copyContractYn,
|
||||
|
||||
|
||||
//홈페이지에서 등록하는 파일은 메모 박스가 없게...
|
||||
//250404 - 내부결재 첨부파일은 메모에 DOCID 사용하여 메모 제외
|
||||
var isFileMemo = true;
|
||||
if(reFileName != null && reFileName !="" && reFileName != undefined){
|
||||
var arrReName = reFileName.split("_");
|
||||
if(arrReName.length > 0){
|
||||
if(arrReName[0] == 'mediation'){
|
||||
if(arrReName[0] == 'mediation' || arrReName[0] == 'x-1' || arrReName[0] == 'x-2' || arrReName[0] == 'x-3'){
|
||||
isFileMemo = false;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user