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

Compare commits

base: DBNT:b9d9c182b21d31b7c1f8c2acdc22bfc9ec91c429
Branches Tags
DBNT:master
DBNT:oracle
..
compare: DBNT:56401270229e4cd1ff5586ab5d46d206e012b64d
Branches Tags
DBNT:master
DBNT:oracle

No commits in common. "b9d9c182b21d31b7c1f8c2acdc22bfc9ec91c429" and "56401270229e4cd1ff5586ab5d46d206e012b64d" have entirely different histories.
b9d9c182b2 ... 5640127022

4 changed files with 6 additions and 5 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -185,4 +185,3 @@ fabric.properties
hs_err_pid* hs_err_pid*
replay_pid* replay_pid*
faics.iml

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

@ -203,7 +203,7 @@ public class ReportStatsController {
// 분야별 통계 // 분야별 통계
if ("C".equals(searchVO.getStatsType())) { if ("C".equals(searchVO.getStatsType())) {
header.put("placename", messageSource.getMessage("report.view.division", null, locale)); 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()) { for (String category : reportSearchVO.getCategory1()) {
header.put(category + "_1", messageSource.getMessage("report.category." + category + "_1", null, locale)); header.put(category + "_1", messageSource.getMessage("report.category." + category + "_1", null, locale));
@ -259,7 +259,7 @@ public class ReportStatsController {
e.printStackTrace(); e.printStackTrace();
} }
} else if ("J".equals(searchVO.getStatsType())) { } else if ("J".equals(searchVO.getStatsType())) {
header.put("placename", messageSource.getMessage("report.view.division", null, locale)); header.put("PLACENAME", messageSource.getMessage("report.view.division", null, locale));
header.put("REPORT1", messageSource.getMessage("report.type.fullReport1", null, locale)); header.put("REPORT1", messageSource.getMessage("report.type.fullReport1", null, locale));
header.put("REPORT2", messageSource.getMessage("report.type.fullReport2", null, locale)); header.put("REPORT2", messageSource.getMessage("report.type.fullReport2", null, locale));

2
src/main/resources/sqlmapper/mappers/board/board.xml
View File

@ -149,7 +149,7 @@
#{notice}, #{notice},
1, 1,
0, 0,
0, 0,
#{data1,jdbcType=VARCHAR}, #{data1,jdbcType=VARCHAR},
#{data2,jdbcType=VARCHAR}, #{data2,jdbcType=VARCHAR},
#{place1,jdbcType=VARCHAR}, #{place1,jdbcType=VARCHAR},

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

@ -290,6 +290,7 @@
</form:form> </form:form>
<script type="text/javascript"> <script type="text/javascript">
<!--
$(document).ready(function(){ $(document).ready(function(){
// 조건보기 // 조건보기
$('#btnCondigion').click(function(){ $('#btnCondigion').click(function(){
@ -316,5 +317,6 @@
document.searchForm.action = "<c:out value='/report/statsExcel.do' />"; document.searchForm.action = "<c:out value='/report/statsExcel.do' />";
document.searchForm.submit(); document.searchForm.submit();
} }
-->
</script> </script>