Merge branch 'campain'
This commit is contained in:
rosewiper
commit
c47568ef82
@ -192,6 +192,12 @@ public class MjonMsgVO extends ComDefaultVO{
|
||||
private int mmsGroupFWCntSum; // mms 실패대기(건)
|
||||
private int mmsTotFWPriceSum; // mms 실패대기(금액)
|
||||
|
||||
private int shtSendCount;
|
||||
private int longSendCount;
|
||||
private int pictSendCount;
|
||||
private int atSendCount;
|
||||
private int ftSendCount;
|
||||
|
||||
private String searchDelayMsgYn;
|
||||
|
||||
public String getSearchDelayMsgYn() {
|
||||
@ -1559,4 +1565,34 @@ public class MjonMsgVO extends ComDefaultVO{
|
||||
public void setAtSmishingYn(String atSmishingYn) {
|
||||
this.atSmishingYn = atSmishingYn;
|
||||
}
|
||||
public int getShtSendCount() {
|
||||
return shtSendCount;
|
||||
}
|
||||
public void setShtSendCount(int shtSendCount) {
|
||||
this.shtSendCount = shtSendCount;
|
||||
}
|
||||
public int getLongSendCount() {
|
||||
return longSendCount;
|
||||
}
|
||||
public void setLongSendCount(int longSendCount) {
|
||||
this.longSendCount = longSendCount;
|
||||
}
|
||||
public int getPictSendCount() {
|
||||
return pictSendCount;
|
||||
}
|
||||
public void setPictSendCount(int pictSendCount) {
|
||||
this.pictSendCount = pictSendCount;
|
||||
}
|
||||
public int getAtSendCount() {
|
||||
return atSendCount;
|
||||
}
|
||||
public void setAtSendCount(int atSendCount) {
|
||||
this.atSendCount = atSendCount;
|
||||
}
|
||||
public int getFtSendCount() {
|
||||
return ftSendCount;
|
||||
}
|
||||
public void setFtSendCount(int ftSendCount) {
|
||||
this.ftSendCount = ftSendCount;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4292,13 +4292,13 @@ public class MjonPayController {
|
||||
SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||
List<MjonMsgVO> payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO);
|
||||
for(MjonMsgVO item : payUserSumList) {
|
||||
sendSumCount += item.getSendCount();
|
||||
sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount());
|
||||
supplySumPrice += item.getSupplyPrice();
|
||||
vatSumPrice += item.getVatPrice();
|
||||
totalSumPrice += item.getTotalPrice();
|
||||
|
||||
// 시작일, 종료일
|
||||
if (i == 0) {
|
||||
if (i == 0) {
|
||||
minRegDate = transFormat.parse(item.getMinRegDate());
|
||||
maxRegDate = transFormat.parse(item.getMaxRegDate());
|
||||
}
|
||||
@ -4528,7 +4528,7 @@ public class MjonPayController {
|
||||
SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||
List<MjonMsgVO> payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO);
|
||||
for(MjonMsgVO item : payUserSumList) {
|
||||
sendSumCount += item.getSendCount();
|
||||
sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount());
|
||||
supplySumPrice += item.getSupplyPrice();
|
||||
vatSumPrice += item.getVatPrice();
|
||||
totalSumPrice += item.getTotalPrice();
|
||||
|
||||
@ -3306,6 +3306,11 @@
|
||||
, MIN(DATE_FORMAT(M.REGDATE, '%Y-%m-%d' )) AS minRegDate
|
||||
, M.msgTypeName
|
||||
, M.orderByCode
|
||||
, SUM(IF(M.msgTypeName = '단문(SMS)', 1, 0)) AS shtSendCount
|
||||
, SUM(IF(M.msgTypeName = '장문(LMS)', 1, 0)) AS longSendCount
|
||||
, SUM(IF(M.msgTypeName = '그림(MMS)', 1, 0)) AS pictSendCount
|
||||
, SUM(IF(M.msgTypeName = '알림톡', 1, 0)) AS atSendCount
|
||||
, SUM(IF(M.msgTypeName = '친구톡', 1, 0)) AS ftSendCount
|
||||
, SUM(M.MSG_GROUP_CNT) AS sendCount
|
||||
, ifnull(ROUND(SUM(M.EACH_PRICE) , 2), 0) AS supplyPrice
|
||||
, 0 AS vatPrice
|
||||
|
||||
@ -155,8 +155,30 @@ function f_print(){
|
||||
<tr>
|
||||
<td>${result.msgTypeName}</td>
|
||||
<td>
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
|
||||
<c:out value="${sendCount}"/>
|
||||
<c:choose>
|
||||
<c:when test="${result.msgTypeName eq '단문(SMS)'}">
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.shtSendCount}" var="shtSendCount" />
|
||||
<c:out value="${shtSendCount}"/>
|
||||
</c:when>
|
||||
<c:when test="${result.msgTypeName eq '장문(LMS)'}">
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.longSendCount}" var="longSendCount" />
|
||||
<c:out value="${longSendCount}"/>
|
||||
</c:when>
|
||||
<c:when test="${result.msgTypeName eq '그림(MMS)'}">
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.pictSendCount}" var="pictSendCount" />
|
||||
<c:out value="${pictSendCount}"/>
|
||||
</c:when>
|
||||
<c:when test="${result.msgTypeName eq '알림톡'}">
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.atSendCount}" var="atSendCount" />
|
||||
<c:out value="${atSendCount}"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.ftSendCount}" var="ftSendCount" />
|
||||
<c:out value="${ftSendCount}"/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<%-- <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
|
||||
<c:out value="${sendCount}"/> --%>
|
||||
</td>
|
||||
<td>
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.supplyPrice}" var="supplyPrice" />
|
||||
|
||||
@ -113,8 +113,30 @@ function f_print(){
|
||||
<tr>
|
||||
<td>${result.msgTypeName}</td>
|
||||
<td>
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
|
||||
<c:out value="${sendCount}"/>
|
||||
<c:choose>
|
||||
<c:when test="${result.msgTypeName eq '단문(SMS)'}">
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.shtSendCount}" var="shtSendCount" />
|
||||
<c:out value="${shtSendCount}"/>
|
||||
</c:when>
|
||||
<c:when test="${result.msgTypeName eq '장문(LMS)'}">
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.longSendCount}" var="longSendCount" />
|
||||
<c:out value="${longSendCount}"/>
|
||||
</c:when>
|
||||
<c:when test="${result.msgTypeName eq '그림(MMS)'}">
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.pictSendCount}" var="pictSendCount" />
|
||||
<c:out value="${pictSendCount}"/>
|
||||
</c:when>
|
||||
<c:when test="${result.msgTypeName eq '알림톡'}">
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.atSendCount}" var="atSendCount" />
|
||||
<c:out value="${atSendCount}"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.ftSendCount}" var="ftSendCount" />
|
||||
<c:out value="${ftSendCount}"/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<%-- <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
|
||||
<c:out value="${sendCount}"/> --%>
|
||||
</td>
|
||||
<td>
|
||||
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.supplyPrice}" var="supplyPrice" />
|
||||
|
||||
Loading…
Reference in New Issue
Block a user