Commit @12e64c4ee5242c43df52c9f34dce2d4c86efd565

rosewiper 2023-11-27

관리자 문자 전송 순위 스케줄러 새벽 작업 일시 중단 처리 - 사용하지 않는 기능으로 서버의 새벽시간대 작업량이 많아 오류 발생으로 인함

 - 사용하지 않는 기능으로 서버의 새벽시간대 작업량이 많아 오류 발생으로 인함

관리자 팩스 발송 통계 기능 수정
 - 통계관리 > 팩스 발송 통계 화면 개선 내용 적용
 - 발송 매수 카운트 기능 추가
 - 일반/모바일 구분 화면 기능은 추후 작업 예정

@12e64c4ee5242c43df52c9f34dce2d4c86efd565

9ded699

12e64c4

src/main/java/itn/let/fax/admin/service/FaxStatVO.java

--- src/main/java/itn/let/fax/admin/service/FaxStatVO.java

+++ src/main/java/itn/let/fax/admin/service/FaxStatVO.java


 	private int statEndDate;                 //통계 종료일
 	private int statStandardDate;            //통계 where 기준
 	
+	private int succPageCnt;				//팩스 성공 페이지 수
+	private int failPageCnt;				//팩스 실패 페이지 수
+	
 	public String getReqDate() {
 		return reqDate;
 	}

 	public void setStatStandardDate(int statStandardDate) {
 		this.statStandardDate = statStandardDate;
 	}
+	public int getSuccPageCnt() {
+		return succPageCnt;
+	}
+	public void setSuccPageCnt(int succPageCnt) {
+		this.succPageCnt = succPageCnt;
+	}
+	public int getFailPageCnt() {
+		return failPageCnt;
+	}
+	public void setFailPageCnt(int failPageCnt) {
+		this.failPageCnt = failPageCnt;
+	}
 	
 }

9ded699

12e64c4

src/main/java/itn/let/fax/admin/service/impl/FaxAdmServiceImpl.java

--- src/main/java/itn/let/fax/admin/service/impl/FaxAdmServiceImpl.java

+++ src/main/java/itn/let/fax/admin/service/impl/FaxAdmServiceImpl.java


 import itn.let.fax.admin.service.FaxStatVO;
 import itn.let.fax.user.service.FaxGroupDataVO;
 import itn.let.fax.user.service.impl.FaxDAO;
-import itn.let.mjo.msg.service.MjonMsgVO;
 import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
 import itn.let.mjo.pay.service.impl.MjonPayDAO;
 import itn.let.module.base.PriceAndPoint;

 		
 		faxStatVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
 		faxStatVO.setLastIndex(paginationInfo.getLastRecordIndex());
-		faxStatVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		//faxStatVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		faxStatVO.setRecordCountPerPage(1000);
 		
 		// 최초 접근 시 오늘 날짜의 통계를 보여준다
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");

 			double succFaxCost = 0;
 			double failFaxCost = 0;
 			double succFaxRate = 0;
+			int succPageCnt = 0;
+			int failPageCnt = 0;
 			
 			for(FaxStatVO tmpVO : list) {
 				succFaxCnt += tmpVO.getSuccFaxCnt();
 				failFaxCnt += tmpVO.getFailFaxCnt();
 				succFaxCost += Double.parseDouble(tmpVO.getSuccFaxCost());
 				failFaxCost += Double.parseDouble(tmpVO.getFailFaxCost());
+				succPageCnt += tmpVO.getSuccPageCnt();
+				failPageCnt += tmpVO.getFailPageCnt();
 			}
 			
 			if(succFaxCnt + succFaxCnt != 0) {

 			faxStatVO.setSuccFaxCost(dcf.format(succFaxCost));
 			faxStatVO.setFailFaxCost(dcf.format(failFaxCost));
 			faxStatVO.setSuccFaxRate(Double.toString(succFaxRate));
+			faxStatVO.setSuccPageCnt(succPageCnt);
+			faxStatVO.setFailPageCnt(failPageCnt);
 			
 			List<FaxStatVO> totalSumList = new ArrayList<FaxStatVO>();
 			totalSumList.add(faxStatVO);

9ded699

12e64c4

src/main/java/itn/let/fax/admin/web/FaxAdmController.java

--- src/main/java/itn/let/fax/admin/web/FaxAdmController.java

+++ src/main/java/itn/let/fax/admin/web/FaxAdmController.java


     	return "/uss/ion/fax/faxAdmSendStatistics";
     }
     
+    
     // 팩스 금일 발송통계 갱신
  	@RequestMapping(value = "/uss/ion/msg/insertFaxCountStatTodayAjax.do")
  	public ResponseEntity<StatusResponse> insertFaxCountStatTodayAjax(FaxStatVO faxStatVO) throws Exception {

9ded699

12e64c4

src/main/resources/egovframework/spring/com/context-scheduling-sym-log-lgm.xml

--- src/main/resources/egovframework/spring/com/context-scheduling-sym-log-lgm.xml

+++ src/main/resources/egovframework/spring/com/context-scheduling-sym-log-lgm.xml


 
 
 	<!-- 3-1 -->
-	<!-- 문자전송순위통계집계  -->
-	<bean id="SttstMsgRankBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+	<!-- 문자전송순위통계집계  20231124 사용하지 않는 통계자료로 판단되어 사용 중단 처리 -->
+	<!-- <bean id="SttstMsgRankBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject" ref="sttstMsgScheduling" />
 		<property name="targetMethod" value="mjSttstMsgRankSmmmary" />
 		<property name="concurrent" value="false" />
-	</bean>
+	</bean> -->
 
-	<bean id="SttstMsgRankBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+	<!-- <bean id="SttstMsgRankBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="SttstMsgRankBean" />		
-	<!-- 매시간 43분 47초 마다 일별 문자 발송 데이터 집계 -->
+	매시간 43분 47초 마다 일별 문자 발송 데이터 집계
 	   	<property name="cronExpression" value="47 53 0-3,5-23 * * ?" />
-<!-- 	   	<property name="cronExpression" value="8 * * * * ?" /> -->
-	</bean>
+	
+	</bean> -->
 
 
 	<!-- 3-2 -->
-	<!-- 문자전송순위통계집계(하루한번) -->
-	<bean id="SttstMsgRankDayBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+	<!-- 문자전송순위통계집계(하루한번)  20231124 사용하지 않는 통계자료로 판단되어 사용 중단 처리 -->
+	<!-- <bean id="SttstMsgRankDayBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject" ref="sttstMsgScheduling" />
 		<property name="targetMethod" value="mjSttstMsgRankDaySmmmary" />
 		<property name="concurrent" value="false" />
-	</bean>
+	</bean> -->
 
-	<bean id="SttstMsgRankDayBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+	<!-- <bean id="SttstMsgRankDayBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="SttstMsgRankDayBean" />		
-	<!-- 매시간 43분 47초 마다 일별 문자 발송 데이터 집계 -->
+	매시간 43분 47초 마다 일별 문자 발송 데이터 집계
 	   	<property name="cronExpression" value="47 30 4 * * ?" />
-<!-- 	   	<property name="cronExpression" value="8 * * * * ?" /> -->
-	</bean>
+	</bean> -->
 
 
 	<!-- 14 -->

 				<ref bean="sysLogTrigger" /><!-- 시스템 로그 요약  -->
 				<ref bean="SttstMsgBeanTrigger" /><!-- 문자발송일별통계집계  -->
 				<ref bean="SttstMsgDayBeanTrigger" /><!-- 문자발송일별통계집계(매일한번)  -->
-				<ref bean="SttstMsgRankBeanTrigger" /><!-- 문자전송순위통계집계  -->
-				<ref bean="SttstMsgRankDayBeanTrigger" /><!-- 문자전송순위통계집계(매일한번)  -->
+				<!-- <ref bean="SttstMsgRankBeanTrigger" /> --><!-- 문자전송순위통계집계  -->
+				<!-- <ref bean="SttstMsgRankDayBeanTrigger" /> --><!-- 문자전송순위통계집계(매일한번)  -->
 
 				<!-- mj_msg_data 백업  -->
 				<ref bean="MjMsgDataBackupBeanTrigger" />

9ded699

12e64c4

src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml


 		              SUCC_FAX_USER_COST,
 		              FAIL_FAX_COST,
 		              SUCC_FAX_RATE,
+		              SUCC_PAGE_CNT,
+		              FAIL_PAGE_CNT,
 		              REG_DATE
 		       )
 		SELECT b.reqDate,

 		       b.succFaxUserCost,
 		       b.failFaxCost,
 		       b.succFaxRate,
+		       b.succPageCnt,
+        	   b.failPageCnt,
 		       b.regDate
 		FROM   ( SELECT  a.reqDate                                                                                                                                                                                                        AS reqDate,
 		                '06'                                                                                                                                                                                                        AS AGENT_CODE,

 		                SUM( IF(a.Result          = 'SENT', 1, 0)  *a.faxUserCost)                                                                                                                                                                                                        AS succFaxUserCost,
 		                SUM(IF(a.Result           = 'FAIL', 1, 0)  *a.faxCost)                                                                                                                                                                                                        AS failFaxCost,
 		                IF(ROUND((SUM(IF(a.Result = 'SENT', 1, 0)) / IF(SUM(IF(a.Result <> '0', 1, 0)) = 0 , 1 , SUM(IF(a.Result <> '0', 1, 0)))) * 100) IS NOT NULL, ROUND((SUM(IF(a.Result = 'SENT', 1, 0)) / IF(SUM(IF(a.Result <> '0', 1, 0)) = 0 , 1, SUM(IF(a.Result <> '0', 1, 0)))) * 100), 0) AS succFaxRate,
-		                NOW()                                                                                                                                                                                                        AS regDate
+		                NOW()                                                                                                                                                                                                        AS regDate,
+		       			SUM(IF(a.Result          = 'SENT', 1, 0)  *a.resPage) AS succPageCnt,
+                 		SUM(IF(a.Result          = 'FAIL', 1, 0)  *a.resPage) AS failPageCnt
 		       FROM     (SELECT a.*,
 		                        b.EACH_PRICE AS faxUserCost
 		                FROM    mj_fax_summary_view a

 		       SUCC_FAX_USER_COST            = b.succFaxUserCost,
 		       FAIL_FAX_COST                 = b.failFaxCost,
 		       SUCC_FAX_RATE                 = b.succFaxRate,
+		       SUCC_PAGE_CNT				 = b.succPageCnt,
+		       FAIL_PAGE_CNT				 = b.failPageCnt,
 		       REG_DATE                      = now()
 	</update>
 	

 		         a.FAIL_FAX_CNT 	AS failFaxCnt,
 		         a.SUCC_FAX_COST 	AS succFaxCost,
 		         a.FAIL_FAX_COST 	AS failFaxCost,
-		         a.SUCC_FAX_RATE 	AS succFaxRate
+		         a.SUCC_FAX_RATE 	AS succFaxRate,
+		         a.SUCC_PAGE_CNT 	AS succPageCnt,
+		         a.FAIL_PAGE_CNT	AS failPageCnt
 		FROM     mj_fax_stat a
 		WHERE    
 				1=1

9ded699

12e64c4

src/main/webapp/WEB-INF/jsp/uss/ion/fax/faxAdmSendStatistics.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/fax/faxAdmSendStatistics.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/fax/faxAdmSendStatistics.jsp


 		fnCalChange("<c:out value='${searchVO.searchDateType}' />");
 	});
 
-// 	function fnCalChange(type) {
-// 		if(type == 'day') {
-// 			$(".calendar_box").show();
-// 			$(".line").show();
-// 			$("#searchYear").hide();
-// 			$("#searchMonth").hide();
-// 			$("#searchQuarter").hide();
-// 		} else if(type == 'month') {
-// 			$(".calendar_box").hide();
-// 			$(".line").hide();
-// 			$("#searchYear").show();
-// 			$("#searchMonth").show();
-// 			$("#searchQuarter").hide();
-// 		} else if(type == 'quarter') {
-// 			$(".calendar_box").hide();
-// 			$(".line").hide();
-// 			$("#searchYear").show();
-// 			$("#searchMonth").hide();
-// 			$("#searchQuarter").show();
-// 		} else if(type == 'year') {
-// 			$(".calendar_box").hide();
-// 			$(".line").hide();
-// 			$("#searchYear").show();
-// 			$("#searchMonth").hide();
-// 			$("#searchQuarter").hide();
-// 		}
-// 	}
+ 	function fnCalChange(type) {
+ 		if(type == 'day') {
+ 			$(".calendar_box").show();
+ 			$(".line").show();
+ 			$("#searchYear").hide();
+ 			$("#searchMonth").hide();
+ 			$("#searchQuarter").hide();
+ 		} else if(type == 'month') {
+ 			$(".calendar_box").hide();
+ 			$(".line").hide();
+ 			$("#searchYear").show();
+ 			$("#searchMonth").show();
+ 			$("#searchQuarter").hide();
+ 		} else if(type == 'quarter') {
+ 			$(".calendar_box").hide();
+ 			$(".line").hide();
+ 			$("#searchYear").show();
+ 			$("#searchMonth").hide();
+ 			$("#searchQuarter").show();
+ 		} else if(type == 'year') {
+ 			$(".calendar_box").hide();
+ 			$(".line").hide();
+ 			$("#searchYear").show();
+ 			$("#searchMonth").hide();
+ 			$("#searchQuarter").hide();
+ 		}
+ 	}
 	
 	function fn_list_search() {
 		var form = document.listForm;

 			</div>
 			<div class="listTop" style="font-weight: normal; vertical-align:bottom;">
 				(부가세 별도)
-				(30분 단위 업데이트)
 				&nbsp;
 				<input type="button" style="cursor: pointer; height: 30px;" onclick="setTodayUpdate();" value="Today Update">
 			</div>

 				<table class="tbType1">
 					<colgroup>
 						<col style="width:4%;">
-						<col style="width:3%;">
+						<col style="width:5%;">
 						<col style="width:auto;">
 					</colgroup>
 					<thead>

 						<c:forEach items="${statList}" var="list">
 							<tr>
 								<td rowspan="2" style="border-right:2px solid #e6e6e6;"><ec:code codeId="ITN019" code="${list.agentCode}" /></td>
-								<td style="border-right:2px solid #e6e6e6;">건</td>
-								<td><c:out value="${list.succFaxCnt}"/></td>
-								<td><c:out value="${list.failFaxCnt}"/></td>
+								<td style="border-right:2px solid #e6e6e6;">건(매)</td>
+								<td><c:out value="${list.succFaxCnt}"/>(<c:out value="${list.succPageCnt}"/>)</td>
+								<td><c:out value="${list.failFaxCnt}"/>(<c:out value="${list.failPageCnt}"/>)</td>
 								<td><c:out value="${list.succFaxRate}"/>%</td>
 							</tr>
 							<tr>

Add a comment

Open 0
Closed 0

List

...	...	@@ -25,6 +25,9 @@
25	25	private int statEndDate; //통계 종료일
26	26	private int statStandardDate; //통계 where 기준
27	27
	28	+ private int succPageCnt; //팩스 성공 페이지 수
	29	+ private int failPageCnt; //팩스 실패 페이지 수
	30	+
28	31	public String getReqDate() {
29	32	return reqDate;
30	33	}
...	...	@@ -115,5 +118,17 @@
115	118	public void setStatStandardDate(int statStandardDate) {
116	119	this.statStandardDate = statStandardDate;
117	120	}
	121	+ public int getSuccPageCnt() {
	122	+ return succPageCnt;
	123	+ }
	124	+ public void setSuccPageCnt(int succPageCnt) {
	125	+ this.succPageCnt = succPageCnt;
	126	+ }
	127	+ public int getFailPageCnt() {
	128	+ return failPageCnt;
	129	+ }
	130	+ public void setFailPageCnt(int failPageCnt) {
	131	+ this.failPageCnt = failPageCnt;
	132	+ }
118	133
119	134	}

...	...	@@ -26,7 +26,6 @@
26	26	import itn.let.fax.admin.service.FaxStatVO;
27	27	import itn.let.fax.user.service.FaxGroupDataVO;
28	28	import itn.let.fax.user.service.impl.FaxDAO;
29		-import itn.let.mjo.msg.service.MjonMsgVO;
30	29	import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
31	30	import itn.let.mjo.pay.service.impl.MjonPayDAO;
32	31	import itn.let.module.base.PriceAndPoint;
...	...	@@ -128,7 +127,8 @@
128	127
129	128	faxStatVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
130	129	faxStatVO.setLastIndex(paginationInfo.getLastRecordIndex());
131		- faxStatVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
	130	+ //faxStatVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
	131	+ faxStatVO.setRecordCountPerPage(1000);
132	132
133	133	// 최초 접근 시 오늘 날짜의 통계를 보여준다
134	134	SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
...	...	@@ -212,12 +212,16 @@
212	212	double succFaxCost = 0;
213	213	double failFaxCost = 0;
214	214	double succFaxRate = 0;
	215	+ int succPageCnt = 0;
	216	+ int failPageCnt = 0;
215	217
216	218	for(FaxStatVO tmpVO : list) {
217	219	succFaxCnt += tmpVO.getSuccFaxCnt();
218	220	failFaxCnt += tmpVO.getFailFaxCnt();
219	221	succFaxCost += Double.parseDouble(tmpVO.getSuccFaxCost());
220	222	failFaxCost += Double.parseDouble(tmpVO.getFailFaxCost());
	223	+ succPageCnt += tmpVO.getSuccPageCnt();
	224	+ failPageCnt += tmpVO.getFailPageCnt();
221	225	}
222	226
223	227	if(succFaxCnt + succFaxCnt != 0) {
...	...	@@ -236,6 +240,8 @@
236	240	faxStatVO.setSuccFaxCost(dcf.format(succFaxCost));
237	241	faxStatVO.setFailFaxCost(dcf.format(failFaxCost));
238	242	faxStatVO.setSuccFaxRate(Double.toString(succFaxRate));
	243	+ faxStatVO.setSuccPageCnt(succPageCnt);
	244	+ faxStatVO.setFailPageCnt(failPageCnt);
239	245
240	246	List<FaxStatVO> totalSumList = new ArrayList<FaxStatVO>();
241	247	totalSumList.add(faxStatVO);

...	...	@@ -324,6 +324,7 @@
324	324	return "/uss/ion/fax/faxAdmSendStatistics";
325	325	}
326	326
	327	+
327	328	// 팩스 금일 발송통계 갱신
328	329	@RequestMapping(value = "/uss/ion/msg/insertFaxCountStatTodayAjax.do")
329	330	public ResponseEntity<StatusResponse> insertFaxCountStatTodayAjax(FaxStatVO faxStatVO) throws Exception {

...	...	@@ -92,35 +92,34 @@
92	92
93	93
94	94	<!-- 3-1 -->
95		- <!-- 문자전송순위통계집계 -->
96		- <bean id="SttstMsgRankBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
	95	+ <!-- 문자전송순위통계집계 20231124 사용하지 않는 통계자료로 판단되어 사용 중단 처리 -->
	96	+ <!-- <bean id="SttstMsgRankBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
97	97	<property name="targetObject" ref="sttstMsgScheduling" />
98	98	<property name="targetMethod" value="mjSttstMsgRankSmmmary" />
99	99	<property name="concurrent" value="false" />
100		- </bean>
	100	+ </bean> -->
101	101
102		- <bean id="SttstMsgRankBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
	102	+ <!-- <bean id="SttstMsgRankBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
103	103	<property name="jobDetail" ref="SttstMsgRankBean" />
104		- <!-- 매시간 43분 47초 마다 일별 문자 발송 데이터 집계 -->
	104	+ 매시간 43분 47초 마다 일별 문자 발송 데이터 집계
105	105	<property name="cronExpression" value="47 53 0-3,5-23 * * ?" />
106		-<!-- <property name="cronExpression" value="8 * * * * ?" /> -->
107		- </bean>
	106	+
	107	+ </bean> -->
108	108
109	109
110	110	<!-- 3-2 -->
111		- <!-- 문자전송순위통계집계(하루한번) -->
112		- <bean id="SttstMsgRankDayBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
	111	+ <!-- 문자전송순위통계집계(하루한번) 20231124 사용하지 않는 통계자료로 판단되어 사용 중단 처리 -->
	112	+ <!-- <bean id="SttstMsgRankDayBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
113	113	<property name="targetObject" ref="sttstMsgScheduling" />
114	114	<property name="targetMethod" value="mjSttstMsgRankDaySmmmary" />
115	115	<property name="concurrent" value="false" />
116		- </bean>
	116	+ </bean> -->
117	117
118		- <bean id="SttstMsgRankDayBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
	118	+ <!-- <bean id="SttstMsgRankDayBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
119	119	<property name="jobDetail" ref="SttstMsgRankDayBean" />
120		- <!-- 매시간 43분 47초 마다 일별 문자 발송 데이터 집계 -->
	120	+ 매시간 43분 47초 마다 일별 문자 발송 데이터 집계
121	121	<property name="cronExpression" value="47 30 4 * * ?" />
122		-<!-- <property name="cronExpression" value="8 * * * * ?" /> -->
123		- </bean>
	122	+ </bean> -->
124	123
125	124
126	125	<!-- 14 -->
...	...	@@ -151,8 +150,8 @@
151	150	<ref bean="sysLogTrigger" /><!-- 시스템 로그 요약 -->
152	151	<ref bean="SttstMsgBeanTrigger" /><!-- 문자발송일별통계집계 -->
153	152	<ref bean="SttstMsgDayBeanTrigger" /><!-- 문자발송일별통계집계(매일한번) -->
154		- <ref bean="SttstMsgRankBeanTrigger" /><!-- 문자전송순위통계집계 -->
155		- <ref bean="SttstMsgRankDayBeanTrigger" /><!-- 문자전송순위통계집계(매일한번) -->
	153	+ <!-- <ref bean="SttstMsgRankBeanTrigger" /> --><!-- 문자전송순위통계집계 -->
	154	+ <!-- <ref bean="SttstMsgRankDayBeanTrigger" /> --><!-- 문자전송순위통계집계(매일한번) -->
156	155
157	156	<!-- mj_msg_data 백업 -->
158	157	<ref bean="MjMsgDataBackupBeanTrigger" />

...	...	@@ -525,6 +525,8 @@
525	525	SUCC_FAX_USER_COST,
526	526	FAIL_FAX_COST,
527	527	SUCC_FAX_RATE,
	528	+ SUCC_PAGE_CNT,
	529	+ FAIL_PAGE_CNT,
528	530	REG_DATE
529	531	)
530	532	SELECT b.reqDate,
...	...	@@ -535,6 +537,8 @@
535	537	b.succFaxUserCost,
536	538	b.failFaxCost,
537	539	b.succFaxRate,
	540	+ b.succPageCnt,
	541	+ b.failPageCnt,
538	542	b.regDate
539	543	FROM ( SELECT a.reqDate AS reqDate,
540	544	'06' AS AGENT_CODE,
...	...	@@ -544,7 +548,9 @@
544	548	SUM( IF(a.Result = 'SENT', 1, 0) *a.faxUserCost) AS succFaxUserCost,
545	549	SUM(IF(a.Result = 'FAIL', 1, 0) *a.faxCost) AS failFaxCost,
546	550	IF(ROUND((SUM(IF(a.Result = 'SENT', 1, 0)) / IF(SUM(IF(a.Result <> '0', 1, 0)) = 0 , 1 , SUM(IF(a.Result <> '0', 1, 0)))) * 100) IS NOT NULL, ROUND((SUM(IF(a.Result = 'SENT', 1, 0)) / IF(SUM(IF(a.Result <> '0', 1, 0)) = 0 , 1, SUM(IF(a.Result <> '0', 1, 0)))) * 100), 0) AS succFaxRate,
547		- NOW() AS regDate
	551	+ NOW() AS regDate,
	552	+ SUM(IF(a.Result = 'SENT', 1, 0) *a.resPage) AS succPageCnt,
	553	+ SUM(IF(a.Result = 'FAIL', 1, 0) *a.resPage) AS failPageCnt
548	554	FROM (SELECT a.*,
549	555	b.EACH_PRICE AS faxUserCost
550	556	FROM mj_fax_summary_view a
...	...	@@ -575,6 +581,8 @@
575	581	SUCC_FAX_USER_COST = b.succFaxUserCost,
576	582	FAIL_FAX_COST = b.failFaxCost,
577	583	SUCC_FAX_RATE = b.succFaxRate,
	584	+ SUCC_PAGE_CNT = b.succPageCnt,
	585	+ FAIL_PAGE_CNT = b.failPageCnt,
578	586	REG_DATE = now()
579	587	</update>
580	588
...	...	@@ -584,7 +592,9 @@
584	592	a.FAIL_FAX_CNT AS failFaxCnt,
585	593	a.SUCC_FAX_COST AS succFaxCost,
586	594	a.FAIL_FAX_COST AS failFaxCost,
587		- a.SUCC_FAX_RATE AS succFaxRate
	595	+ a.SUCC_FAX_RATE AS succFaxRate,
	596	+ a.SUCC_PAGE_CNT AS succPageCnt,
	597	+ a.FAIL_PAGE_CNT AS failPageCnt
588	598	FROM mj_fax_stat a
589	599	WHERE
590	600	1=1

...	...	@@ -43,33 +43,33 @@
43	43	fnCalChange("<c:out value='${searchVO.searchDateType}' />");
44	44	});
45	45
46		-// function fnCalChange(type) {
47		-// if(type == 'day') {
48		-// $(".calendar_box").show();
49		-// $(".line").show();
50		-// $("#searchYear").hide();
51		-// $("#searchMonth").hide();
52		-// $("#searchQuarter").hide();
53		-// } else if(type == 'month') {
54		-// $(".calendar_box").hide();
55		-// $(".line").hide();
56		-// $("#searchYear").show();
57		-// $("#searchMonth").show();
58		-// $("#searchQuarter").hide();
59		-// } else if(type == 'quarter') {
60		-// $(".calendar_box").hide();
61		-// $(".line").hide();
62		-// $("#searchYear").show();
63		-// $("#searchMonth").hide();
64		-// $("#searchQuarter").show();
65		-// } else if(type == 'year') {
66		-// $(".calendar_box").hide();
67		-// $(".line").hide();
68		-// $("#searchYear").show();
69		-// $("#searchMonth").hide();
70		-// $("#searchQuarter").hide();
71		-// }
72		-// }
	46	+ function fnCalChange(type) {
	47	+ if(type == 'day') {
	48	+ $(".calendar_box").show();
	49	+ $(".line").show();
	50	+ $("#searchYear").hide();
	51	+ $("#searchMonth").hide();
	52	+ $("#searchQuarter").hide();
	53	+ } else if(type == 'month') {
	54	+ $(".calendar_box").hide();
	55	+ $(".line").hide();
	56	+ $("#searchYear").show();
	57	+ $("#searchMonth").show();
	58	+ $("#searchQuarter").hide();
	59	+ } else if(type == 'quarter') {
	60	+ $(".calendar_box").hide();
	61	+ $(".line").hide();
	62	+ $("#searchYear").show();
	63	+ $("#searchMonth").hide();
	64	+ $("#searchQuarter").show();
	65	+ } else if(type == 'year') {
	66	+ $(".calendar_box").hide();
	67	+ $(".line").hide();
	68	+ $("#searchYear").show();
	69	+ $("#searchMonth").hide();
	70	+ $("#searchQuarter").hide();
	71	+ }
	72	+ }
73	73
74	74	function fn_list_search() {
75	75	var form = document.listForm;
...	...	@@ -202,7 +202,6 @@
202	202	</div>
203	203	<div class="listTop" style="font-weight: normal; vertical-align:bottom;">
204	204	(부가세 별도)
205		- (30분 단위 업데이트)
206	205
207	206	<input type="button" style="cursor: pointer; height: 30px;" onclick="setTodayUpdate();" value="Today Update">
208	207	</div>
...	...	@@ -210,7 +209,7 @@
210	209	<table class="tbType1">
211	210	<colgroup>
212	211	<col style="width:4%;">
213		- <col style="width:3%;">
	212	+ <col style="width:5%;">
214	213	<col style="width:auto;">
215	214	</colgroup>
216	215	<thead>
...	...	@@ -228,9 +227,9 @@
228	227	<c:forEach items="${statList}" var="list">
229	228	<tr>
230	229	<td rowspan="2" style="border-right:2px solid #e6e6e6;"><ec:code codeId="ITN019" code="${list.agentCode}" /></td>
231		- <td style="border-right:2px solid #e6e6e6;">건</td>
232		- <td><c:out value="${list.succFaxCnt}"/></td>
233		- <td><c:out value="${list.failFaxCnt}"/></td>
	230	+ <td style="border-right:2px solid #e6e6e6;">건(매)</td>
	231	+ <td><c:out value="${list.succFaxCnt}"/>(<c:out value="${list.succPageCnt}"/>)</td>
	232	+ <td><c:out value="${list.failFaxCnt}"/>(<c:out value="${list.failPageCnt}"/>)</td>
234	233	<td><c:out value="${list.succFaxRate}"/>%</td>
235	234	</tr>
236	235	<tr>

Delete comment