260330 ITSM 수정
@34389f9b42e0537116c6accb98ef85c674555c20
--- src/main/java/egovframework/let/itsm/audit/service/AuditVO.java
+++ src/main/java/egovframework/let/itsm/audit/service/AuditVO.java
... | ... | @@ -18,6 +18,10 @@ |
| 18 | 18 |
|
| 19 | 19 |
private String autEndPnttm = ""; //'감사종료일', |
| 20 | 20 |
|
| 21 |
+ private String ntceBgndeYYYMMDD = ""; |
|
| 22 |
+ |
|
| 23 |
+ private String ntceEnddeYYYMMDD =""; |
|
| 24 |
+ |
|
| 21 | 25 |
private String autSj = ""; //감사명', |
| 22 | 26 |
|
| 23 | 27 |
private String autDept = ""; //'감사부서', |
... | ... | @@ -77,6 +81,22 @@ |
| 77 | 81 |
|
| 78 | 82 |
private int totCnt = 0; //하단 조인 |
| 79 | 83 |
|
| 84 |
+ public String getNtceBgndeYYYMMDD() {
|
|
| 85 |
+ return ntceBgndeYYYMMDD; |
|
| 86 |
+ } |
|
| 87 |
+ |
|
| 88 |
+ public void setNtceBgndeYYYMMDD(String ntceBgndeYYYMMDD) {
|
|
| 89 |
+ this.ntceBgndeYYYMMDD = ntceBgndeYYYMMDD; |
|
| 90 |
+ } |
|
| 91 |
+ |
|
| 92 |
+ public String getNtceEnddeYYYMMDD() {
|
|
| 93 |
+ return ntceEnddeYYYMMDD; |
|
| 94 |
+ } |
|
| 95 |
+ |
|
| 96 |
+ public void setNtceEnddeYYYMMDD(String ntceEnddeYYYMMDD) {
|
|
| 97 |
+ this.ntceEnddeYYYMMDD = ntceEnddeYYYMMDD; |
|
| 98 |
+ } |
|
| 99 |
+ |
|
| 80 | 100 |
public String getNisEvId() {
|
| 81 | 101 |
return nisEvId; |
| 82 | 102 |
} |
--- src/main/java/egovframework/let/itsm/sla/web/EvalManageController.java
+++ src/main/java/egovframework/let/itsm/sla/web/EvalManageController.java
... | ... | @@ -147,6 +147,11 @@ |
| 147 | 147 |
}else {
|
| 148 | 148 |
evalVO.setImsi("N");
|
| 149 | 149 |
} |
| 150 |
+ |
|
| 151 |
+ auditVO.setAutStrPnttm(auditVO.getNtceBgndeYYYMMDD()); |
|
| 152 |
+ auditVO.setAutEndPnttm(auditVO.getNtceEnddeYYYMMDD()); |
|
| 153 |
+ |
|
| 154 |
+ |
|
| 150 | 155 |
evalMngService.updateEvalItem(evalVO) ; //펑가지표 삭제 후 update |
| 151 | 156 |
}else{
|
| 152 | 157 |
//아이디에 매칭되는 임시파일 모두 삭제 |
--- src/main/webapp/WEB-INF/jsp/uss/itsm/audit/SciTecAuditFileUpload.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/itsm/audit/SciTecAuditFileUpload.jsp
... | ... | @@ -184,8 +184,21 @@ |
| 184 | 184 |
} |
| 185 | 185 |
|
| 186 | 186 |
$('select').niceSelect();
|
| 187 |
- |
|
| 187 |
+ |
|
| 188 |
+ |
|
| 189 |
+ $(function(){ //단일 파일업로드
|
|
| 190 |
+ $('#file_temp').change(function(e){
|
|
| 191 |
+ var objUpload = $(".file_upload_box");
|
|
| 192 |
+ var files = $('#file_temp')[0].files;
|
|
| 193 |
+ handleFileUpload(files,objUpload); //파일업로드 |
|
| 194 |
+ }); |
|
| 195 |
+ }); |
|
| 188 | 196 |
}); |
| 197 |
+ |
|
| 198 |
+ |
|
| 199 |
+/* 파일등록 */ |
|
| 200 |
+var _fileIdx = 0; |
|
| 201 |
+var _fileForm2 = new Array(); |
|
| 189 | 202 |
|
| 190 | 203 |
/* 삭제버튼 클릭시 */ |
| 191 | 204 |
function delete_item(itemId , delObject){
|
... | ... | @@ -301,6 +314,7 @@ |
| 301 | 314 |
$('.upload_box_img').show();
|
| 302 | 315 |
$('.upload_box_text').show();
|
| 303 | 316 |
$('.uploaded_obj').hide();
|
| 317 |
+ self.close(); |
|
| 304 | 318 |
} |
| 305 | 319 |
|
| 306 | 320 |
</script> |
... | ... | @@ -328,7 +342,8 @@ |
| 328 | 342 |
</c:forEach> |
| 329 | 343 |
</c:forEach> |
| 330 | 344 |
</select> |
| 331 |
- <!-- <input type="button" value="파일추가"> --> |
|
| 345 |
+ <input type="button" value="파일추가" class="asset_no_use_file_upload" onclick="document.all.file_temp.click();"> |
|
| 346 |
+ <input type="file" name="file_temp" id="file_temp" style="display:none" class="file"> |
|
| 332 | 347 |
</div> |
| 333 | 348 |
<div class="file_upload_box"> |
| 334 | 349 |
<img class="upload_box_img" src="/direct/img/upload_img.png" alt="" style="margin-top: 60px;"> |
--- src/main/webapp/WEB-INF/jsp/uss/itsm/bizCntrt/BizCntrtView.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/itsm/bizCntrt/BizCntrtView.jsp
... | ... | @@ -1287,9 +1287,11 @@ |
| 1287 | 1287 |
<input type="checkbox" name="atchFileId" value="${fileResult.atchFileId}" id="file_sort_each_${fileResult.bizItemId}" class="checkboxClass">
|
| 1288 | 1288 |
<label for="file_sort_each_${fileResult.bizItemId}"></label>
|
| 1289 | 1289 |
<img src="/direct/img/enroll_pdf_file.png" alt=""> |
| 1290 |
- <a href="javascript:downItsmFile('<c:out value="${fileResult.atchFileId}"/>','0')">
|
|
| 1291 |
- <c:out value="${fileResult.orignlFileNm}"/>
|
|
| 1292 |
- </a> |
|
| 1290 |
+ <div class="eva_file_name" style="width: 50px"> |
|
| 1291 |
+ <a href="javascript:downItsmFile('<c:out value="${fileResult.atchFileId}"/>','0')">
|
|
| 1292 |
+ <c:out value="${fileResult.orignlFileNm}"/>
|
|
| 1293 |
+ </a> |
|
| 1294 |
+ </div> |
|
| 1293 | 1295 |
<img src="/direct/img/add_enroll_popup_delect.png" alt="" onclick="delete_item_gamsa('${fileResult.bizItemId}' , 'ul_each_');">
|
| 1294 | 1296 |
</li> |
| 1295 | 1297 |
</ul> |
--- src/main/webapp/WEB-INF/jsp/uss/itsm/bizCntrt/BizFileUpload.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/itsm/bizCntrt/BizFileUpload.jsp
... | ... | @@ -177,7 +177,20 @@ |
| 177 | 177 |
} |
| 178 | 178 |
}); |
| 179 | 179 |
} |
| 180 |
+ |
|
| 181 |
+ $(function(){ //단일 파일업로드
|
|
| 182 |
+ $('#file_temp').change(function(e){
|
|
| 183 |
+ var objUpload = $(".file_upload_box");
|
|
| 184 |
+ var files = $('#file_temp')[0].files;
|
|
| 185 |
+ handleFileUpload(files,objUpload); //파일업로드 |
|
| 186 |
+ }); |
|
| 187 |
+ }); |
|
| 180 | 188 |
}); |
| 189 |
+ |
|
| 190 |
+/* 파일등록 */ |
|
| 191 |
+var _fileIdx = 0; |
|
| 192 |
+var _fileForm2 = new Array(); |
|
| 193 |
+ |
|
| 181 | 194 |
|
| 182 | 195 |
/* 삭제버튼 클릭시 */ |
| 183 | 196 |
function delete_item(itemId , delObject){
|
... | ... | @@ -295,7 +308,7 @@ |
| 295 | 308 |
$('.upload_box_img').show();
|
| 296 | 309 |
$('.upload_box_text').show();
|
| 297 | 310 |
$('.uploaded_obj').hide();
|
| 298 |
- close(); |
|
| 311 |
+ self.close(); |
|
| 299 | 312 |
} |
| 300 | 313 |
|
| 301 | 314 |
</script> |
... | ... | @@ -323,7 +336,8 @@ |
| 323 | 336 |
</c:forEach> |
| 324 | 337 |
</select> |
| 325 | 338 |
</c:if> |
| 326 |
- <!-- <input type="button" value="파일추가"> --> |
|
| 339 |
+ <input type="button" value="파일추가" class="asset_no_use_file_upload" onclick="document.all.file_temp.click();"> |
|
| 340 |
+ <input type="file" name="file_temp" id="file_temp" style="display:none" class="file"> |
|
| 327 | 341 |
</div> |
| 328 | 342 |
<div class="file_upload_box"> |
| 329 | 343 |
<img class="upload_box_img" src="/direct/img/upload_img.png" alt="" style="margin-top: 60px;"> |
--- src/main/webapp/WEB-INF/jsp/uss/itsm/nis/NisMngView.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/itsm/nis/NisMngView.jsp
... | ... | @@ -187,6 +187,11 @@ |
| 187 | 187 |
}); |
| 188 | 188 |
}); |
| 189 | 189 |
|
| 190 |
+ $("#auth_list_btn").click(function (event){
|
|
| 191 |
+ self.close(); |
|
| 192 |
+ }); |
|
| 193 |
+ |
|
| 194 |
+ |
|
| 190 | 195 |
|
| 191 | 196 |
$(".nis_eva_table_show").find(".tdRowNum").each(function(index, item){
|
| 192 | 197 |
var countID = $(this).attr('id');
|
... | ... | @@ -852,6 +857,10 @@ |
| 852 | 857 |
count = 0; |
| 853 | 858 |
} |
| 854 | 859 |
$("#generalResult8").val(count.toFixed(2));
|
| 860 |
+ $("#eva_grade").text($(".all_grade_value8").text());
|
|
| 861 |
+ $(".grade_value").text($(".all_grade_value8").text());
|
|
| 862 |
+ |
|
| 863 |
+ |
|
| 855 | 864 |
} |
| 856 | 865 |
|
| 857 | 866 |
|
... | ... | @@ -1759,7 +1768,7 @@ |
| 1759 | 1768 |
</div> |
| 1760 | 1769 |
<div class="eva_grade">준정부기관 평가점수 |
| 1761 | 1770 |
<div class="grade_wrap grade_wrap_2"> |
| 1762 |
- <div class="grade grade_2">0</div> |
|
| 1771 |
+ <div class="grade grade_2" id="eva_grade">0</div> |
|
| 1763 | 1772 |
</div> |
| 1764 | 1773 |
</div> |
| 1765 | 1774 |
<div class="line_btn" style="float: right; margin-right: 75px;"> |
... | ... | @@ -1804,7 +1813,7 @@ |
| 1804 | 1813 |
<input name="nisGenVOList[${status.index}].nisGenName" type="text" value="${nisGenLiInfo.nisGenName}">
|
| 1805 | 1814 |
</td> |
| 1806 | 1815 |
<td><input name="nisGenVOList[${status.index}].nisGenTotalScore" class="score_weights_plus1" type="text" numberOnly style="width:50px" value="${nisGenLiInfo.nisGenTotalScore}"></td>
|
| 1807 |
- <td><input name="nisGenVOList[${status.index}].nisGenSelfScore" class="score_weights_plus1" type="text" numberOnly style="width:50px" value="${nisGenLiInfo.nisGenSelfScore}"></td>
|
|
| 1816 |
+ <td><input name="nisGenVOList[${status.index}].nisGenSelfScore" class="score_weights_plus2" type="text" numberOnly style="width:50px" value="${nisGenLiInfo.nisGenSelfScore}"></td>
|
|
| 1808 | 1817 |
<td><input name="nisGenVOList[${status.index}].nisGenSelfPoint" class="score_weights_plus3" type="text" numberOnly style="width:50px" value="${nisGenLiInfo.nisGenSelfPoint}"></td>
|
| 1809 | 1818 |
<td><input name="nisGenVOList[${status.index}].nisGenRealScore" class="score_weights_plus4" type="text" numberOnly style="width:50px" value="${nisGenLiInfo.nisGenRealScore}"></td>
|
| 1810 | 1819 |
<td><input name="nisGenVOList[${status.index}].nisGenRealPoint" class="score_weights_plus5" type="text" numberOnly style="width:50px" value="${nisGenLiInfo.nisGenRealPoint}"></td>
|
... | ... | @@ -1924,7 +1933,7 @@ |
| 1924 | 1933 |
<input name="nisEvitMngVOList[${table_index}].nisEvitId" type="hidden" value="${nisEvalitemInfo.nisEvitId}">
|
| 1925 | 1934 |
<c:if test="${nisEvalitemInfo.nisEvitId eq nisEvalitemInfo.nisEvitSubId}">
|
| 1926 | 1935 |
<input class="evalItemTdNum" type="hidden" readonly> |
| 1927 |
- <input name="nisEvitMngVOList[${table_index}].nisEvitPoint" type="text" class="table_grade" value="${nisEvalitemInfo.nisEvitPoint}" readonly>
|
|
| 1936 |
+ <input name="nisEvitMngVOList[${table_index}].nisEvitPoint" type="text" class="table_grade" value="${nisEvalitemInfo.nisEvitPoint}">
|
|
| 1928 | 1937 |
</c:if> |
| 1929 | 1938 |
<c:if test="${nisEvalitemInfo.nisEvitId ne nisEvalitemInfo.nisEvitSubId}">
|
| 1930 | 1939 |
<input name="nisEvitMngVOList[${table_index}].nisEvitPoint" type="text" class="table_grade" value="${nisEvalitemInfo.nisEvitPoint}">
|
... | ... | @@ -1978,7 +1987,7 @@ |
| 1978 | 1987 |
</td> |
| 1979 | 1988 |
<td> |
| 1980 | 1989 |
<c:if test="${nisEvalitemInfo.nisEvitId eq nisEvalitemInfo.nisEvitSubId}">
|
| 1981 |
- <input name="nisEvitMngVOList[${table_index}].nisEvitResult" type="text" class="table_grade" value="${nisEvalitemInfo.nisEvitResult}" readonly>
|
|
| 1990 |
+ <input name="nisEvitMngVOList[${table_index}].nisEvitResult" type="text" class="table_grade" value="${nisEvalitemInfo.nisEvitResult}">
|
|
| 1982 | 1991 |
</c:if> |
| 1983 | 1992 |
<c:if test="${nisEvalitemInfo.nisEvitId ne nisEvalitemInfo.nisEvitSubId}">
|
| 1984 | 1993 |
<input name="nisEvitMngVOList[${table_index}].nisEvitResult" type="text" class="table_grade" value="${nisEvalitemInfo.nisEvitResult}">
|
... | ... | @@ -2125,7 +2134,7 @@ |
| 2125 | 2134 |
<td> |
| 2126 | 2135 |
<input class="evalItemTdNum" type="hidden" readonly> |
| 2127 | 2136 |
<input name="nisEvitMngVOList[].nisEvitId" id="temp_nisEvitId_01" type="hidden" value=""> |
| 2128 |
- <input name="nisEvitMngVOList[].nisEvitPoint" type="text" class="table_grade" value="0" readonly> |
|
| 2137 |
+ <input name="nisEvitMngVOList[].nisEvitPoint" type="text" class="table_grade" value="0"> |
|
| 2129 | 2138 |
</td> |
| 2130 | 2139 |
<td> |
| 2131 | 2140 |
<div class="grade_num"><p>1-1</p></div> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?