Commit @03da959c4f6a76d363ce8b36d1e6fccac9a2d977

이호영 2025-02-10

발송결과 속도계속 오류사항 진행중 4891

@03da959c4f6a76d363ce8b36d1e6fccac9a2d977

e9891f3

03da959

src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java

--- src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java

+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java


 	private List msgGroupIdList;	//문자 그룹아이디 리스트
 	private String smsTxt;			//문자 내용
 	private String subject;			//문자 제목
+	private String subjectChkYn;			//문자 제목
 	private Date regdate;			//문자 등록일자
 	private Date reqdate;			//문자 예약 발송 일자
 	private String callFrom;		//발신번호

e9891f3

03da959

src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java

--- src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java

+++ src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java


 		// 목록
 		List<MjonMsgSentVO> resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
 
-		// 내용이 없고 이미지만 있을 경우
-		resultList.stream().forEach(t->{
-			log.info("+ t.getMsgKind() : [{}]",t.getMsgType());
-			if("6".equals(t.getMsgType()) 
-					&& StringUtils.isEmpty(t.getSmsTxt())
-					&& !"0".equals(t.getFileCnt()) 
-					) {
-				t.setSmsTxt("이미지");
-			}
-		});
 
 		// groupID에 대한 결과건수(대기, 성공 실패) 분할건수를 가져옴
 		resultList = makeDetailFunction(resultList);

 			t.setStatusCd(code);
 		});
 
+
+		resultList.stream().forEach(t->{
+
+			// 내용이 없고 이미지만 있을 경우
+			// 내용에 "이미지"표시
+			if("6".equals(t.getMsgType()) 
+					&& StringUtils.isEmpty(t.getSmsTxt())
+					&& !"0".equals(t.getFileCnt()) 
+					) {
+				t.setSmsTxt("이미지");
+			}
+			
+			// 예약 취소일 시 대기건도 0으로 표시
+			if( t.getReserveCYn().equals(("Y")) ) {
+				t.setResultSValue("0");
+				t.setResultFValue("0");
+				t.setResultWValue("0");
+			}
+		});
+		
+		
 		
 		
 		// 총 카운트

e9891f3

03da959

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml


 			, B.MSG_GROUP_CNT as msgGroupCnt
 			, B.SMS_TXT as smsTxt
 			, B.SUBJECT as subject
+			, B.SUBJECT_CHK_YN as subjectChkYn
 			, DATE_FORMAT(B.REGDATE, '%Y-%m-%d %T') AS regdate
 			, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T') AS reqDate
 			, (

e9891f3

03da959

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp


 <script src="/publish/js/content.js"></script>
 <script src="/publish/js/popupLayer.js"></script>
 <script type="text/javascript">
+/* 문자 발송결과 리스트 advc*/
 $(document).ready(function(){
 // 	var searchStartDate = '${searchStartDate}';
 // 	console.log('searchStartDate : ', searchStartDate);

 									</c:when>
 									<c:otherwise>
 										<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" /></p>
+										
 									</c:otherwise>
 								</c:choose>
 							</td>

 											<span class="di">분할</span>
 										</c:if>
 									</c:if>
-									<a href="#none"onclick="fn_sentDetailView('${result.msgGroupId}')">
-										<c:out value="${result.smsTxt}" />
+									<a href="#none" onclick="fn_sentDetailView('${result.msgGroupId}')">
+										<c:choose>
+											<c:when test="${result.subjectChkYn eq 'Y' }">
+												<c:out value="${result.subject }" />
+											</c:when>
+											<c:otherwise>
+												<c:out value="${result.smsTxt}" />
+											</c:otherwise>
+										</c:choose>
 									</a>
 								</div>
 							</td>
 							<td>
-								<p><c:out value="${result.msgGroupCnt}"/> </p>
+								<p><fmt:formatNumber value="${result.msgGroupCnt}" type="number" groupingUsed="true" /> </p>
 							</td>
 							<td>
-								<p><c:out value="${result.resultWValue}"/> </p>
+								<p><fmt:formatNumber value="${result.resultWValue}" type="number" groupingUsed="true" /> </p>
 							</td>
 							<td>
-								<p class="c_002c9a"><c:out value="${result.resultSValue}"/> </p>
+								<p class="c_002c9a"><fmt:formatNumber value="${result.resultSValue}" type="number" groupingUsed="true" /> </p>
 							</td>
 							<td>
-								<p class="c_e40000"><c:out value="${result.resultFValue}"/> </p>
+								<p class="c_e40000"><fmt:formatNumber value="${result.resultFValue}" type="number" groupingUsed="true" /> </p>
 							</td>
 							<td>
 								<c:out value="${result.totPrice}"/>

Add a comment

Open 0
Closed 0

List

...	...	@@ -26,6 +26,7 @@
26	26	private List msgGroupIdList; //문자 그룹아이디 리스트
27	27	private String smsTxt; //문자 내용
28	28	private String subject; //문자 제목
	29	+ private String subjectChkYn; //문자 제목
29	30	private Date regdate; //문자 등록일자
30	31	private Date reqdate; //문자 예약 발송 일자
31	32	private String callFrom; //발신번호

...	...	@@ -132,16 +132,6 @@
132	132	// 목록
133	133	List<MjonMsgSentVO> resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
134	134
135		- // 내용이 없고 이미지만 있을 경우
136		- resultList.stream().forEach(t->{
137		- log.info("+ t.getMsgKind() : [{}]",t.getMsgType());
138		- if("6".equals(t.getMsgType())
139		- && StringUtils.isEmpty(t.getSmsTxt())
140		- && !"0".equals(t.getFileCnt())
141		- ) {
142		- t.setSmsTxt("이미지");
143		- }
144		- });
145	135
146	136	// groupID에 대한 결과건수(대기, 성공 실패) 분할건수를 가져옴
147	137	resultList = makeDetailFunction(resultList);
...	...	@@ -154,6 +144,27 @@
154	144	t.setStatusCd(code);
155	145	});
156	146
	147	+
	148	+ resultList.stream().forEach(t->{
	149	+
	150	+ // 내용이 없고 이미지만 있을 경우
	151	+ // 내용에 "이미지"표시
	152	+ if("6".equals(t.getMsgType())
	153	+ && StringUtils.isEmpty(t.getSmsTxt())
	154	+ && !"0".equals(t.getFileCnt())
	155	+ ) {
	156	+ t.setSmsTxt("이미지");
	157	+ }
	158	+
	159	+ // 예약 취소일 시 대기건도 0으로 표시
	160	+ if( t.getReserveCYn().equals(("Y")) ) {
	161	+ t.setResultSValue("0");
	162	+ t.setResultFValue("0");
	163	+ t.setResultWValue("0");
	164	+ }
	165	+ });
	166	+
	167	+
157	168
158	169
159	170	// 총 카운트

...	...	@@ -428,6 +428,7 @@
428	428	, B.MSG_GROUP_CNT as msgGroupCnt
429	429	, B.SMS_TXT as smsTxt
430	430	, B.SUBJECT as subject
	431	+ , B.SUBJECT_CHK_YN as subjectChkYn
431	432	, DATE_FORMAT(B.REGDATE, '%Y-%m-%d %T') AS regdate
432	433	, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T') AS reqDate
433	434	, (

...	...	@@ -8,6 +8,7 @@
8	8	<script src="/publish/js/content.js"></script>
9	9	<script src="/publish/js/popupLayer.js"></script>
10	10	<script type="text/javascript">
	11	+/* 문자 발송결과 리스트 advc*/
11	12	$(document).ready(function(){
12	13	// var searchStartDate = '${searchStartDate}';
13	14	// console.log('searchStartDate : ', searchStartDate);
...	...	@@ -245,6 +246,7 @@
245	246	</c:when>
246	247	<c:otherwise>
247	248	<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" /></p>
	249	+
248	250	</c:otherwise>
249	251	</c:choose>
250	252	</td>
...	...	@@ -272,22 +274,29 @@
272	274	<span class="di">분할</span>
273	275	</c:if>
274	276	</c:if>
275		- <a href="#none"onclick="fn_sentDetailView('${result.msgGroupId}')">
276		- <c:out value="${result.smsTxt}" />
	277	+ <a href="#none" onclick="fn_sentDetailView('${result.msgGroupId}')">
	278	+ <c:choose>
	279	+ <c:when test="${result.subjectChkYn eq 'Y' }">
	280	+ <c:out value="${result.subject }" />
	281	+ </c:when>
	282	+ <c:otherwise>
	283	+ <c:out value="${result.smsTxt}" />
	284	+ </c:otherwise>
	285	+ </c:choose>
277	286	</a>
278	287	</div>
279	288	</td>
280	289	<td>
281		- <p><c:out value="${result.msgGroupCnt}"/> </p>
	290	+ <p><fmt:formatNumber value="${result.msgGroupCnt}" type="number" groupingUsed="true" /> </p>
282	291	</td>
283	292	<td>
284		- <p><c:out value="${result.resultWValue}"/> </p>
	293	+ <p><fmt:formatNumber value="${result.resultWValue}" type="number" groupingUsed="true" /> </p>
285	294	</td>
286	295	<td>
287		- <p class="c_002c9a"><c:out value="${result.resultSValue}"/> </p>
	296	+ <p class="c_002c9a"><fmt:formatNumber value="${result.resultSValue}" type="number" groupingUsed="true" /> </p>
288	297	</td>
289	298	<td>
290		- <p class="c_e40000"><c:out value="${result.resultFValue}"/> </p>
	299	+ <p class="c_e40000"><fmt:formatNumber value="${result.resultFValue}" type="number" groupingUsed="true" /> </p>
291	300	</td>
292	301	<td>
293	302	<c:out value="${result.totPrice}"/>

Delete comment