DBNT
/
FAICS
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

외사정보보고 검색 기능 수정

master
Hyung Geun 2022-04-25 15:33:39 +09:00
parent 8443310b64
commit 54db411eed
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java
View File

@ -529,7 +529,7 @@ public class ReportJudgeServiceImpl extends EgovAbstractServiceImpl implements R
}
int total = 0;
for (HashMap<String, String> item : list) {
total += Integer.parseInt(item.get(key));
total += Integer.parseInt(String.valueOf(item.get("bg")));
}
map.put(key, String.valueOf(total));
}

28
src/main/java/kcg/faics/report/web/ReportStatsController.java
View File

@ -204,7 +204,7 @@ public class ReportStatsController {
// 분야별 통계
if ("C".equals(searchVO.getStatsType())) {
header.put("placename", messageSource.getMessage("report.view.division", null, locale));
header.put("TOTAL", messageSource.getMessage("report.stats.total", null, locale));
header.put("total", messageSource.getMessage("report.stats.total", null, locale));
for (String category : reportSearchVO.getCategory1()) {
header.put(category + "_1", messageSource.getMessage("report.category." + category + "_1", null, locale));
}
@ -261,21 +261,21 @@ public class ReportStatsController {
} else if ("J".equals(searchVO.getStatsType())) {
header.put("placename", messageSource.getMessage("report.view.division", null, locale));
header.put("REPORT1", messageSource.getMessage("report.type.fullReport1", null, locale));
header.put("REPORT2", messageSource.getMessage("report.type.fullReport2", null, locale));
header.put("report1", messageSource.getMessage("report.type.fullReport1", null, locale));
header.put("report2", messageSource.getMessage("report.type.fullReport2", null, locale));
header.put("JU1", messageSource.getMessage("report.type.newsflash", null, locale));
header.put("JU2", messageSource.getMessage("report.type.judge", null, locale));
header.put("JU3", messageSource.getMessage("report.type.middle", null, locale));
header.put("JU4", messageSource.getMessage("report.type.notice", null, locale));
header.put("JU5", messageSource.getMessage("report.type.record", null, locale));
header.put("JU6", messageSource.getMessage("report.type.survey", null, locale));
header.put("JU7", messageSource.getMessage("report.type.reference", null, locale));
header.put("ju1", messageSource.getMessage("report.type.newsflash", null, locale));
header.put("ju2", messageSource.getMessage("report.type.judge", null, locale));
header.put("ju3", messageSource.getMessage("report.type.middle", null, locale));
header.put("ju4", messageSource.getMessage("report.type.notice", null, locale));
header.put("ju5", messageSource.getMessage("report.type.record", null, locale));
header.put("ju6", messageSource.getMessage("report.type.survey", null, locale));
header.put("ju7", messageSource.getMessage("report.type.reference", null, locale));
header.put("AG", messageSource.getMessage("report.stats.AGrade", null, locale));
header.put("BG", messageSource.getMessage("report.stats.BGrade", null, locale));
header.put("CG", messageSource.getMessage("report.stats.CGrade", null, locale));
header.put("DG", messageSource.getMessage("report.stats.DGrade", null, locale));
header.put("ag", messageSource.getMessage("report.stats.AGrade", null, locale));
header.put("bg", messageSource.getMessage("report.stats.BGrade", null, locale));
header.put("cg", messageSource.getMessage("report.stats.CGrade", null, locale));
header.put("dg", messageSource.getMessage("report.stats.DGrade", null, locale));
Date d = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");

2
src/main/webapp/WEB-INF/jsp/board/boardList.jsp
View File

@ -6,6 +6,8 @@
<%@ taglib prefix="ct" tagdir="/WEB-INF/tags"%>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<% request.setCharacterEncoding("UTF-8"); %>
<script type="text/javaScript" language="javascript" defer="defer">

2
src/main/webapp/WEB-INF/jsp/report/statistics.jsp
View File

@ -135,7 +135,6 @@
</div>
<script type="text/javaScript" language="javascript" defer="defer">
<!--
$(document).ready(function(){
//날짜 설정
$('input[id^="date"]').datepicker({dateFormat: 'yy-mm-dd'});
@ -178,5 +177,4 @@
document.searchForm.submit();
}
-->
</script>

1
src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
View File

@ -311,6 +311,7 @@
}
//분야별 엑셀받기
function fn_get_excel() {
document.searchForm.statsType.value = "<c:out value='${reportSearchVO.statsType}'/>";
document.searchForm.action = "<c:out value='/report/statsExcel.do' />";