Commit @da00ed6b8a86719c6d9b5799f32fbe65998fea95

이호영 2025-01-23

발송결과 리스트 화면 완료

@da00ed6b8a86719c6d9b5799f32fbe65998fea95

5cfae19

da00ed6

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

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

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


 package itn.let.mjo.msgsent.service;
 
-import java.io.Serializable;
 import java.util.List;
 
 import itn.let.cmm.vo.FileInfoVO;
+import itn.let.uss.umt.service.UserDefaultVO;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class MjonMsgDetailSentVO implements Serializable{
+public class MjonMsgDetailSentVO extends UserDefaultVO{
 
 	private static final long serialVersionUID = 1L;
 

 	
 	private String callTo;
 	private String statusTxt;
+	private String addrNm;
 
 
 	// FileInfo 리스트 필드 추가

5cfae19

da00ed6

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

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

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


 	private int resultSValue; // 성공건수
 	private int resultFValue; // 실패건수
 	private int resultWValue; // 대기건수
+	private String divideYN; // 분할여부
 	
 }

5cfae19

da00ed6

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

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

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


 package itn.let.mjo.msgsent.service;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
 
 import itn.let.fax.addr.service.FaxAddrGroupVO;
 import itn.let.mjo.addr.service.AddrGroupVO;

 
 	public List<MjonMsgDetailSentVO> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO);
 
+	public void msgSentExcelDownLoad(MjonMsgSentVO mjonMsgSentVO, HttpServletResponse response) throws IOException, Exception;
+
 	
 }

5cfae19

da00ed6

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

...	...	@@ -94,4 +94,12 @@
94	94	private String resultWValue;
95	95	private String resultWFValue;
96	96
	97	+ private String divideYN; // 분할여부
	98	+
	99	+ private String statusCd; // 진행상태 코드
	100	+
	101	+ // 결과 리스트 select 할 떄
	102	+ // TIMESTAMPDIFF(minute, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) as diffMin
	103	+ private int diffMin;
	104	+
97	105	}

5cfae19

da00ed6

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


 package itn.let.mjo.msgsent.service.impl;
 
+import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;

 		return resultList;
 	}
 	
-	//발송 관리 전체 발송 리스트 불러오기
+	/**
+	 *	advc
+	 *	이호영 20250121
+	 *	발송 관리 전체 발송 리스트 불러오기
+	 */
 	public Map<String, Object> selectAllMsgSentList_advc(MjonMsgSentVO mjonMsgSentVO) throws Exception{
 
 
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		
+		System.out.println("mjonMsgSentVO.getSearchConditionSite() :: "+ mjonMsgSentVO.getSearchConditionSite());
+		
 		// 목록
 		List<MjonMsgSentVO> resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
 
-		// MsgGroupId만 추출하여 리스트 생성
-//		List<String> msgGroupIdList = resultList.stream()
-//			.map(MjonMsgSentVO::getMsgGroupId) // MsgGroupId 추출
-//			.collect(Collectors.toList());    // 리스트로 수집
+		// groupID에 대한 결과건수(대기, 성공 실패) 분할건수를 가져옴
+		// TODO : 분할여부는 예약일 때만 가져오게 해야되는지 검토 필요
 		
-		
-		resultList.stream().forEach(t->{
-			MjonMsgSWFDTO mjonMsgSWFDTO =	mjonMsgSentDAO.findBySWF(t.getMsgGroupId());
-			t.setResultSValue(String.valueOf(mjonMsgSWFDTO.getResultSValue()));
-			t.setResultFValue(String.valueOf(mjonMsgSWFDTO.getResultFValue()));
-			t.setResultWValue(String.valueOf(mjonMsgSWFDTO.getResultWValue()));
-			
-			BigDecimal eachPrice = new BigDecimal(t.getEachPrice());
-			BigDecimal resultSValue = new BigDecimal(mjonMsgSWFDTO.getResultSValue());
-			BigDecimal totalPrice = eachPrice.multiply(resultSValue);
-			// 소수점 한 자리로 설정 (반올림)
-			BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP);
-			t.setTotPrice(roundedTotalPrice.toPlainString()); // 결과를 String으로 설정
-		});
+		resultList = makeDetailFunction(resultList);
 
+		// 공통코드 ITN057에 대한 코드화 진행
+		/*
+		 * CODE_ID	CODE	CODE_NM		CODE_DC
+		 * ITN057	01		진행중		진행중
+		 * ITN057	02		완료			완료출해야함
+		 * ITN057	03		예약대기		예약대기(발송전) 버튼으로 노출해야함
+		 * ITN057	04		-			예약취소 ( - 으로 노출 )
+		 * */
+		resultList.stream().forEach(t->{
+
+			String code;
+			
+			log.info(" + t.getDiffMin() :: [{}]", t.getDiffMin());
+			log.info(" + t.getDiffMin() :: [{}]", t.getDiffMin() > -5);
+			if ("Y".equals(t.getReserveCYn())) {
+				code = "04"; // 예약취소 코드
+			} else if (
+					"Y".equals(t.getReserveYn()) 
+						&& "N".equals(t.getReserveCYn()) 
+						&& t.getMsgGroupCnt().equals(t.getResultWValue())
+						&& t.getDiffMin() < -5 // 예약 시간이 5분 이상인 것들만
+						) {
+				code = "03"; // 예약대기 코드 ( 예약취소 버튼 노출 )
+			} else if (t.getMsgGroupCnt().equals(t.getResultSValue()) || t.getMsgGroupCnt().equals(t.getResultFValue())) {
+				code = "02"; // 완료 코드
+			} else {
+				code = "01"; // 진행중 코드
+			}
+			
+			
+			t.setStatusCd(code);
+		});
 
 		
 		
 		// 총 카운트
 		int totalCnt = mjonMsgSentDAO.countAllMsgSentList(mjonMsgSentVO);
-//		int totalCnt = 0;
 		resultMap.put("resultList", resultList);
 		resultMap.put("totalCnt", totalCnt);
 			

 		return resultMap;
 	}
 	
+
 
 	public Map<String, Object> selectAllMsgSentDetailView(MjonMsgDetailSentVO mjonMsgDetailSentVO) throws Exception{
 

 					.replaceAll("\\s*무료거부 0808800858", ""));
 		}
 		
-		if(Integer.parseInt(result.getFileCnt()) > 0)
+		if(StringUtils.isNotEmpty(result.getFileCnt()) && Integer.parseInt(result.getFileCnt()) > 0)
 		{
 			
 			List<FileInfoVO> fileInfos = getFileInfo(result);

 		
 		return list; 
 	}
+
+	public void msgSentExcelDownLoad(MjonMsgSentVO mjonMsgSentVO, HttpServletResponse response) throws Exception{
+
+		
+		mjonMsgSentVO.setRecordCountPerPage(100000);
+		mjonMsgSentVO.setFirstIndex(0);
+
+    	if(StringUtils.isEmpty(mjonMsgSentVO.getSearchSortOrd())) {
+			mjonMsgSentVO.setSearchSortOrd("desc");
+			mjonMsgSentVO.setSearchSortCnd("B.REQ_DATE");
+		}
+		
+		//예약 관리 리스트 불러오기
+		List<MjonMsgSentVO> resultAllSentList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
+
+		long startTime = System.nanoTime(); // 시작 시간 측정
+		resultAllSentList = makeDetailFunction(resultAllSentList);
+		long endTime = System.nanoTime(); // 끝난 시간 측정
+		double executionTimeInSeconds = (endTime - startTime) / 1_000_000_000.0;
+		System.out.println("Execution time: " + executionTimeInSeconds + " seconds");
+
+		SXSSFWorkbook  workbook = null; // SXSSFWorkbook 변수 선언
+		try{ 
+			
+			
+			// Workbook 생성
+			workbook = new SXSSFWorkbook();
+			Sheet sheet = workbook.createSheet("발송 내역");
+	
+			// 열 너비 설정
+			sheet.setColumnWidth(0, 3000);  // 번호 열
+			sheet.setColumnWidth(1, 4000);  // 발송일시 열
+			sheet.setColumnWidth(2, 5000);  // 구분 열
+			sheet.setColumnWidth(3, 3000);  // 형태 열
+			sheet.setColumnWidth(4, 10000); // 내용 열
+			sheet.setColumnWidth(5, 4000);  // 발송건수 열
+			sheet.setColumnWidth(6, 3000);  // 대기 열
+			sheet.setColumnWidth(7, 3000);  // 성공 열
+			sheet.setColumnWidth(8, 3000);  // 실패 열
+			sheet.setColumnWidth(9, 4000);  // 금액 열
+			sheet.setColumnWidth(10, 5000); // 진행상황 열
+	
+			// 헤더 스타일 설정
+			CellStyle headerStyle = workbook.createCellStyle();
+			headerStyle.setAlignment(HorizontalAlignment.CENTER);
+			headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+			headerStyle.setBorderTop(BorderStyle.THIN);
+			headerStyle.setBorderBottom(BorderStyle.THIN);
+			headerStyle.setBorderLeft(BorderStyle.THIN);
+			headerStyle.setBorderRight(BorderStyle.THIN);
+			headerStyle.setTopBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
+			headerStyle.setBottomBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
+			headerStyle.setLeftBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
+			headerStyle.setRightBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
+	
+			Font font = workbook.createFont();
+			font.setBold(true);  // 글씨체 굵게
+			font.setFontHeightInPoints((short) 12); // 글씨 크기
+			headerStyle.setFont(font);
+	
+			// 데이터 스타일 설정 (가운데 정렬)
+			CellStyle centerStyle = workbook.createCellStyle();
+			centerStyle.setAlignment(HorizontalAlignment.CENTER);
+			centerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+			centerStyle.setBorderTop(BorderStyle.THIN);
+			centerStyle.setBorderBottom(BorderStyle.THIN);
+			centerStyle.setBorderLeft(BorderStyle.THIN);
+			centerStyle.setBorderRight(BorderStyle.THIN);
+			centerStyle.setTopBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
+			centerStyle.setBottomBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
+			centerStyle.setLeftBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
+			centerStyle.setRightBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
+	
+			// 첫 번째 헤더 작성 (상단 병합)
+			Row headerRow = sheet.createRow(0);
+	
+			// 번호 열 추가
+			Cell cell = headerRow.createCell(0);
+			cell.setCellValue("번호");
+			cell.setCellStyle(headerStyle);
+			sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0)); // 번호 병합
+	
+			// 구분 열 추가
+			cell = headerRow.createCell(1);
+			cell.setCellValue("발송일시");
+			cell.setCellStyle(headerStyle);
+			sheet.addMergedRegion(new CellRangeAddress(0, 1, 1, 1)); // 구분 병합
+	
+			cell = headerRow.createCell(2);
+			cell.setCellValue("구분");
+			cell.setCellStyle(headerStyle);
+			sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 2)); // 발송일시 병합
+	
+			cell = headerRow.createCell(3);
+			cell.setCellValue("형태");
+			cell.setCellStyle(headerStyle);
+			sheet.addMergedRegion(new CellRangeAddress(0, 1, 3, 3)); // 형태 병합
+	
+			cell = headerRow.createCell(4);
+			cell.setCellValue("내용");
+			cell.setCellStyle(headerStyle);
+			sheet.addMergedRegion(new CellRangeAddress(0, 1, 4, 4)); // 내용 병합
+	
+			cell = headerRow.createCell(5);
+			cell.setCellValue("발송건수");
+			cell.setCellStyle(headerStyle);
+			sheet.addMergedRegion(new CellRangeAddress(0, 1, 5, 5)); // 발송건수 병합
+	
+			cell = headerRow.createCell(6);
+			cell.setCellValue("결과");
+			cell.setCellStyle(headerStyle);
+			sheet.addMergedRegion(new CellRangeAddress(0, 0, 6, 8)); // 결과 병합
+	
+			cell = headerRow.createCell(9);
+			cell.setCellValue("금액(원)");
+			cell.setCellStyle(headerStyle);
+			sheet.addMergedRegion(new CellRangeAddress(0, 1, 9, 9)); // 금액(원) 병합
+	
+			cell = headerRow.createCell(10);
+			cell.setCellValue("진행상황");
+			cell.setCellStyle(headerStyle);
+			sheet.addMergedRegion(new CellRangeAddress(0, 1, 10, 10)); // 진행상황 병합
+	
+			// 두 번째 헤더 작성 (결과 하위 열)
+			Row subHeaderRow = sheet.createRow(1);
+	
+			String[] subHeaders = {"대기", "성공", "실패"};
+			for (int i = 0; i < subHeaders.length; i++) {
+				cell = subHeaderRow.createCell(6 + i); // 결과 열 시작점(6번 열)부터 순차적으로 설정
+				cell.setCellValue(subHeaders[i]);
+				cell.setCellStyle(headerStyle);
+			}
+	
+			// 샘플 데이터 추가
+	//		Object[][] data = {
+	//			{1, "2025-01-23 12:00", "web", "SMS", "테스트 메시지입니다.", 139, 1, 0, 12, "-", "진행중"}
+	//		};
+			
+			
+			
+			
+			// Object[][]로 변환
+			Object[][] data = new Object[resultAllSentList.size()][11]; // 11은 필드 수
+	
+			for (int i = 0; i < resultAllSentList.size(); i++) {
+				MjonMsgSentVO vo = resultAllSentList.get(i);
+				data[i][0] = i;
+				data[i][1] = vo.getReqdate();
+				data[i][2] = "H".equals(vo.getSendKind()) ? "WEB" : "API";
+				
+				String msgType="단문";
+				if ("6".equals(vo.getMsgType())) {
+					msgType = "0".equals(vo.getFileCnt()) ? "장문" : "그림";
+				}
+				data[i][3] = msgType;
+				
+				String reserveTxt = "";
+				if("Y".equals(vo.getReserveYn())) {reserveTxt="[예약]";}
+				if("Y".equals(vo.getDivideYN())) {reserveTxt+="[분할]";}
+				
+				data[i][4] = reserveTxt + (StringUtils.isEmpty(vo.getSmsTxt()) ? "-" : vo.getSmsTxt());
+				data[i][5] = vo.getMsgGroupCnt();
+				data[i][6] = vo.getResultWValue();
+				data[i][7] = vo.getResultSValue();
+				data[i][8] = vo.getResultFValue();
+				data[i][9] = vo.getTotPrice();
+	
+				String statusTxt="진행중";
+				if ("Y".equals(vo.getReserveCYn())) {
+					statusTxt = "예약취소"; // 예약취소 코드
+	//			} else if ("Y".equals(vo.getReserveYn()) && vo.getMsgGroupCnt().equals(vo.getResultWValue())) {
+	//				statusTxt = "예약대기"; // 예약대기 코드 ( 예약취소 버튼 노출 )
+				} else if (vo.getMsgGroupCnt().equals(vo.getResultSValue()) || vo.getMsgGroupCnt().equals(vo.getResultFValue())) {
+					statusTxt = "완료"; // 완료 코드
+				}
+				
+				
+				
+				
+				data[i][10] = statusTxt;
+			}
+			
+			
+			
+	
+			int rowNum = 2; // 데이터 시작 행
+			for (Object[] rowData : data) {
+				Row row = sheet.createRow(rowNum++);
+				for (int col = 0; col < rowData.length; col++) {
+					cell = row.createCell(col);
+	
+					// "내용" 열만 제외하고 가운데 정렬
+					if (col == 4) { // 내용 열
+						cell.setCellValue((String) rowData[col]);
+					} else if (rowData[col] instanceof String) {
+						cell.setCellValue((String) rowData[col]);
+						cell.setCellStyle(centerStyle);
+					} else if (rowData[col] instanceof Integer) {
+						cell.setCellValue((Integer) rowData[col]);
+						cell.setCellStyle(centerStyle);
+					}
+				}
+			}
+	
+			// 파일 다운로드 응답 설정
+			String fileName ="발송관리_엑셀_리스트";		// 저장 파일명
+			SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat ( "yyyyMMdd_HHmmss", Locale.KOREA );
+			Date currentTime = new Date ();
+			String mTime = mSimpleDateFormat.format ( currentTime );
+			fileName = fileName+"("+mTime+")";
+	
+			response.setHeader("Set-Cookie", "fileDownload=true; path=/");
+			response.setHeader("Content-Disposition", String.format("attachment; filename=\""+new String((fileName).getBytes("KSC5601"),"8859_1")+".xlsx"));
+			response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+	
+			// 파일 출력
+			workbook.write(response.getOutputStream());
+			workbook.close();
+	
+		} catch (Exception e) {
+			// 에러 처리 로직
+			response.setHeader("Set-Cookie", "fileDownload=false; path=/");
+			response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+			response.setHeader("Content-Type", "text/html; charset=utf-8");
+
+			try (OutputStream out = response.getOutputStream()) {
+				byte[] data = "fail..".getBytes();
+				out.write(data, 0, data.length);
+			} catch (Exception ignore) {
+				ignore.printStackTrace();
+			}
+		} finally {
+			if (workbook != null) {
+				try {
+					workbook.dispose(); // SXSSFWorkbook 임시 파일 제거
+					workbook.close();
+				} catch (Exception ignore) {
+					ignore.printStackTrace();
+				}
+			}
+		}
+		
+	}
+	
+
+	private List<MjonMsgSentVO> makeDetailFunction(List<MjonMsgSentVO> resultList) {
+		resultList.stream().forEach(t->{
+			MjonMsgSWFDTO mjonMsgSWFDTO =	mjonMsgSentDAO.findBySWF(t.getMsgGroupId());
+			t.setResultSValue(String.valueOf(mjonMsgSWFDTO.getResultSValue())); // 성공건수
+			t.setResultFValue(String.valueOf(mjonMsgSWFDTO.getResultFValue())); // 실패건수
+			t.setResultWValue(String.valueOf(mjonMsgSWFDTO.getResultWValue())); // 대기건수
+			t.setDivideYN(mjonMsgSWFDTO.getDivideYN());
+			
+			
+			// TotPrice : 성공건수에 대한 금액 곱하기
+			BigDecimal eachPrice = new BigDecimal(t.getEachPrice());
+			BigDecimal resultSValue = new BigDecimal(mjonMsgSWFDTO.getResultSValue());
+			BigDecimal totalPrice = eachPrice.multiply(resultSValue);
+			// 소수점 한 자리로 설정 (반올림)// totalPrice 값을 소수점 한 자리까지 반올림하여 roundedTotalPrice에 저장
+			// RoundingMode.HALF_UP: 반올림 방식으로, 소수점 기준 5 이상이면 올림, 그렇지 않으면 내림
+			BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP);
+
+			// roundedTotalPrice가 0인지 확인
+			// BigDecimal.compareTo(BigDecimal.ZERO)는 값을 비교하는 메서드
+			// 결과:
+			// - 반환 값이 0이면 두 값이 같음
+			// - 반환 값이 음수이면 roundedTotalPrice가 0보다 작음
+			// - 반환 값이 양수이면 roundedTotalPrice가 0보다 큼
+			if (roundedTotalPrice.compareTo(BigDecimal.ZERO) == 0) {
+				// roundedTotalPrice 값이 0이면, "-" 문자열을 totPrice에 설정
+				t.setTotPrice("-"); 
+			} else {
+				// roundedTotalPrice 값이 0이 아닌 경우
+				// 반올림된 BigDecimal 값을 toPlainString()을 사용하여 문자열로 변환 후 totPrice에 설정
+				// toPlainString(): 지수 표기법 없이 일반적인 문자열 형태로 반환
+				t.setTotPrice(roundedTotalPrice.toPlainString());
+			}
+		});
+		return resultList;
+	}
+	
+	
 }

5cfae19

da00ed6

src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java

--- src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java

+++ src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java


 			return "redirect:/web/user/login/login.do";
 		}
     	
-    	mjonMsgSentVO.setUserId(userId);
-    	
-    	/*
-    	//전체 발송 건수 통계 불러오기
-    	mjonMsgSentVO.setMsgType("");
-    	List<MjonMsgSentVO> totalMsgCnt = mjonMsgSentService.selectDetailMsgSentCnt(mjonMsgSentVO);
-    	model.addAttribute("totalMsgCnt", totalMsgCnt);
-    	
-    	//단문 성공건, 실패건 불러오기
-    	mjonMsgSentVO.setMsgType("4");
-    	List<MjonMsgSentVO> smsMsgCnt = mjonMsgSentService.selectDetailMsgSentCnt(mjonMsgSentVO);
-    	model.addAttribute("smsMsgCnt", smsMsgCnt);
-    	
-    	//장문 성공건, 실패건 불러오기
-    	mjonMsgSentVO.setMsgType("6");
-    	mjonMsgSentVO.setFileCnt("0");
-    	List<MjonMsgSentVO> lmsMsgCnt = mjonMsgSentService.selectDetailMsgSentCnt(mjonMsgSentVO);
-    	model.addAttribute("lmsMsgCnt", lmsMsgCnt);
-    	
-    	//그림문자 성공건, 실패건 불러오기
-    	mjonMsgSentVO.setMsgType("6");
-    	mjonMsgSentVO.setFileCnt("1");
-    	List<MjonMsgSentVO> mmsMsgCnt = mjonMsgSentService.selectDetailMsgSentCnt(mjonMsgSentVO);
-    	model.addAttribute("mmsMsgCnt", mmsMsgCnt);
-    	*/
-    	
-    	/*
-    	//전체 발송 건수 통계 불러오기
-    	mjonMsgSentVO.setMsgType("");
-    	List<MjonMsgSentVO> totalMsgCnt = mjonMsgSentService.selectDetailMsgSentCntMix(mjonMsgSentVO);
-    	
-    	System.out.println("start");
-    	
-    	// H:홈페이지, A:API 로 sms, lms, mms 나누는 영역
-    	List<MjonMsgSentVO> H_totalMsgCnt = totalMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
-    	List<MjonMsgSentVO> H_smsMsgCnt = new ArrayList<MjonMsgSentVO>();
-    	List<MjonMsgSentVO> H_lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
-    	List<MjonMsgSentVO> H_mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
-    	
-    	System.out.println("start");
-
-    	List<MjonMsgSentVO> A_totalMsgCnt = totalMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
-    	List<MjonMsgSentVO> A_smsMsgCnt = new ArrayList<MjonMsgSentVO>();
-    	List<MjonMsgSentVO> A_lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
-    	List<MjonMsgSentVO> A_mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
-
-    	System.out.println(" ::H_totalMsgCnt :: "+ H_totalMsgCnt.size());
-    	System.out.println(" ::A_totalMsgCnt :: "+ A_totalMsgCnt.size());
-
-    	H_totalMsgCnt.forEach(t->{
-    		if (Integer.parseInt(t.getFilePath1())>0) {
-    			H_smsMsgCnt.add(t);
-    		} else if (Integer.parseInt(t.getFilePath2())>0) {
-    			H_lmsMsgCnt.add(t);
-    		} else if (Integer.parseInt(t.getFilePath3())>0) {
-    			H_mmsMsgCnt.add(t);
-    		}
-    	});
-    	
-    	A_totalMsgCnt.forEach(t->{
-    		if (Integer.parseInt(t.getFilePath1())>0) {
-    			A_smsMsgCnt.add(t);
-    		} else if (Integer.parseInt(t.getFilePath2())>0) {
-    			A_lmsMsgCnt.add(t);
-    		} else if (Integer.parseInt(t.getFilePath3())>0) {
-    			A_mmsMsgCnt.add(t);
-    		}
-    	});
-    	
-    	
- 
-    	 //* 홈페이지에서 보낸 데이터 LIST
-    	 //* SEND_KIND = "H"
-
-    	// 전체 영역
-    	model.addAttribute("H_allSentCntVO", this.getResultCntProc(H_totalMsgCnt));
-    	// 전체 단문(SMS)
-    	model.addAttribute("H_smsSentCntVO", this.getResultCntProc(H_smsMsgCnt));
-    	// 전체 장문(LMS)
-    	model.addAttribute("H_lmsSentCntVO", this.getResultCntProc(H_lmsMsgCnt));
-    	// 전체 장문(LMS)
-    	model.addAttribute("H_mmsSentCntVO", this.getResultCntProc(H_mmsMsgCnt));
-    	
-    	
-    	
-    	
-    	
-    	// * 홈페이지에서 보낸 데이터 LIST
-    	 //* SEND_KIND = "A"
-    	 
-    	// 전체 영역
-    	model.addAttribute("A_allSentCntVO", this.getResultCntProc(A_totalMsgCnt));
-    	// 전체 단문(SMS)
-    	model.addAttribute("A_smsSentCntVO", this.getResultCntProc(A_smsMsgCnt));
-    	// 전체 장문(LMS)
-    	model.addAttribute("A_lmsSentCntVO", this.getResultCntProc(A_lmsMsgCnt));
-    	// 전체 장문(LMS)
-    	model.addAttribute("A_mmsSentCntVO", this.getResultCntProc(A_mmsMsgCnt));
-    	*/
-    	
-    	
-    	
-    	 /*<isEqual prepend="AND" property="searchCondition" compareValue="2">
-         a.mber_nm LIKE CONCAT('%',#searchKeyword#,'%')  
-         </isEqual>
-         */
-    	ApiKeyVO apiKeyVO = new ApiKeyVO();
-    	apiKeyVO.setMberId(userId);
-		model.addAttribute("appMgmt", apiKeyMngService.selectMberApiKeyChk(apiKeyVO) > 0 ? true : false);
+//    	mjonMsgSentVO.setUserId(userId);
+//    	ApiKeyVO apiKeyVO = new ApiKeyVO();
+//    	apiKeyVO.setMberId(userId);
+//		model.addAttribute("appMgmt", apiKeyMngService.selectMberApiKeyChk(apiKeyVO) > 0 ? true : false);
     	
     	
     	

     	
     	}
     	
-    	String startDate = mjonMsgSentVO.getStartDate();
-    	String endDate = mjonMsgSentVO.getEndDate();
+//    	log.info(" + mjonMsgSentVO.getSearchStartDate() :: [{}]", mjonMsgSentVO.getSearchStartDate());
+//    	log.info(" + mjonMsgSentVO.getSearchStartDate() :: [{}]", mjonMsgSentVO.getSearchStartDate());
+//    	log.info(" + mjonMsgSentVO.getSearchStartDate() :: [{}]", mjonMsgSentVO.getSearchStartDate());
+//    	log.info(" + mjonMsgSentVO.getSearchStartDate() :: [{}]", mjonMsgSentVO.getSearchStartDate());
+//    	log.info(" + mjonMsgSentVO.getSearchStartDate() :: [{}]", mjonMsgSentVO.getSearchStartDate());
+    	String startDate = mjonMsgSentVO.getSearchStartDate();
+    	String endDate = mjonMsgSentVO.getSearchEndDate();
     	
     	if(StringUtils.isEmpty(startDate) 
     			&& StringUtils.isEmpty(endDate)) 
     	{
     		
-        	mjonMsgSentVO.setStartDate(DateUtils.getDateMonthsAgo(3));
-        	mjonMsgSentVO.setEndDate(DateUtils.getCurrentDate());
+        	mjonMsgSentVO.setSearchStartDate(DateUtils.getDateMonthsAgo(3));
+        	mjonMsgSentVO.setSearchEndDate(DateUtils.getCurrentDate());
         	
     	}
-    	
+
+    	log.info("pageIndex :: [{}]", mjonMsgSentVO.getPageIndex());
     	model.addAttribute("searchKeyword", mjonMsgSentVO.getSearchKeyword());
     	model.addAttribute("mjonMsgSentVO", mjonMsgSentVO);
     	model.addAttribute("siteId", mjonMsgSentVO.getSiteId());

     		HttpServletRequest request,
     		ModelMap model) throws Exception{
     	
-		System.out.println("MsgSentView_HA_allSentAjax");
 		
     	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
     	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());

     	
     	mjonMsgSentVO.setUserId(userId);
     	
+    	log.info("+ mjonMsgSentVO.getSearchStartDate() :: [{}]", mjonMsgSentVO.getSearchStartDate());
+    	log.info("+ mjonMsgSentVO.getSearchEndDate() :: [{}]", mjonMsgSentVO.getSearchEndDate());
     	//전체 발송 건수 통계 불러오기
     	mjonMsgSentVO.setMsgType("");
-    	log.info(" ::  mjonMsgSentService.selectDetailMsgSentCntMix :: ");
+    	long startTime = System.nanoTime(); // 시작 시간 측정
     	List<MjonMsgSentVO> totalMsgCnt = mjonMsgSentService.selectDetailMsgSentCntMix(mjonMsgSentVO);
+
+    	long endTime = System.nanoTime(); // 종료 시간 측정
+    	double executionTimeInSeconds = (endTime - startTime) / 1_000_000_000.0;
+    	System.out.println("Execution time: " + executionTimeInSeconds + " seconds");
     	
-    	System.out.println("start");
     	
     	// H:홈페이지, A:API 로 sms, lms, mms 나누는 영역
-    	List<MjonMsgSentVO> H_totalMsgCnt = totalMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
     	List<MjonMsgSentVO> H_smsMsgCnt = new ArrayList<MjonMsgSentVO>();
     	List<MjonMsgSentVO> H_lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
     	List<MjonMsgSentVO> H_mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
     	
-    	System.out.println("start");
-
-    	List<MjonMsgSentVO> A_totalMsgCnt = totalMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
-    	List<MjonMsgSentVO> A_smsMsgCnt = new ArrayList<MjonMsgSentVO>();
-    	List<MjonMsgSentVO> A_lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
-    	List<MjonMsgSentVO> A_mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
-
-
-    	H_totalMsgCnt.forEach(t->{
+    	totalMsgCnt.forEach(t->{
     		if (Integer.parseInt(t.getFilePath1())>0) {
     			H_smsMsgCnt.add(t);
     		} else if (Integer.parseInt(t.getFilePath2())>0) {

     		}
     	});
     	
-    	A_totalMsgCnt.forEach(t->{
-    		if (Integer.parseInt(t.getFilePath1())>0) {
-    			A_smsMsgCnt.add(t);
-    		} else if (Integer.parseInt(t.getFilePath2())>0) {
-    			A_lmsMsgCnt.add(t);
-    		} else if (Integer.parseInt(t.getFilePath3())>0) {
-    			A_mmsMsgCnt.add(t);
-    		}
-    	});
-    	
     	 //* 홈페이지에서 보낸 데이터 LIST
     	 //* SEND_KIND = "H"
 
     	// 전체 영역
-    	model.addAttribute("H_allSentCntVO", this.getResultCntProc(H_totalMsgCnt));
+    	model.addAttribute("H_allSentCntVO", this.getResultCntProc(H_smsMsgCnt));
     	// 전체 단문(SMS)
     	model.addAttribute("H_smsSentCntVO", this.getResultCntProc(H_smsMsgCnt));
     	// 전체 장문(LMS)

     	model.addAttribute("H_mmsSentCntVO", this.getResultCntProc(H_mmsMsgCnt));
     	
     	
-    	
-    	
-    	
-    	// * 홈페이지에서 보낸 데이터 LIST
-    	 //* SEND_KIND = "A"
-    	 
-    	// 전체 영역
-    	model.addAttribute("A_allSentCntVO", this.getResultCntProc(A_totalMsgCnt));
-    	// 전체 단문(SMS)
-    	model.addAttribute("A_smsSentCntVO", this.getResultCntProc(A_smsMsgCnt));
-    	// 전체 장문(LMS)
-    	model.addAttribute("A_lmsSentCntVO", this.getResultCntProc(A_lmsMsgCnt));
-    	// 전체 장문(LMS)
-    	model.addAttribute("A_mmsSentCntVO", this.getResultCntProc(A_mmsMsgCnt));
-    	
-    	
-    	
-    	
-    	 /*<isEqual prepend="AND" property="searchCondition" compareValue="2">
-         a.mber_nm LIKE CONCAT('%',#searchKeyword#,'%')  
-         </isEqual>
-         */
-    	ApiKeyVO apiKeyVO = new ApiKeyVO();
-    	apiKeyVO.setMberId(userId);
-		model.addAttribute("appMgmt", apiKeyMngService.selectMberApiKeyChk(apiKeyVO) > 0 ? true : false);
-		
-		System.out.println("MsgSentView_HA_allSentAjax_end");
     	
     	return "/web/msgsent/subcontent/MsgSentView_HA_allSentAjax";
     }

 		String pageUrl = "";
 		try {
 			
-				
+
+	    	log.info(" ListView pageIndex :: [{}]", mjonMsgSentVO.getPageIndex());
 				
 				
 			//로그인 권한정보 불러오기

 //			}
 			
 	    	//기본 내림차순 정렬
-	    	if(mjonMsgSentVO.getSearchSortOrd().equals("")) {
+	    	if(StringUtils.isEmpty(mjonMsgSentVO.getSearchSortOrd())) {
 	    		
 	    		mjonMsgSentVO.setSearchSortOrd("desc");
-	    		mjonMsgSentVO.setSearchSortCnd("regdate");
+	    		mjonMsgSentVO.setSearchSortCnd("B.REQ_DATE");
 	    	}
 	    	
-	    	if(mjonMsgSentVO.getListType().equals("")) {
-	    		
-	    		mjonMsgSentVO.setListType("groupList");
-	    		
-	    	}
 	    	
 	    	//선택 탭 정보 저장
 	    	//mjonResvMsgVO.setSearchMsgType(mjonResvMsgVO.getTabType());

 			mjonMsgSentVO.setLastIndex(paginationInfo.getLastRecordIndex());
 			mjonMsgSentVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 			
-			if(!DateUtils.dateChkAndValueChk(mjonMsgSentVO.getStartDate(),mjonMsgSentVO.getEndDate(), 3 )) {
-				mjonMsgSentVO.setStartDate(DateUtils.getDateMonthsAgo(3));
-				mjonMsgSentVO.setEndDate(DateUtils.getCurrentDate());
+			if(!DateUtils.dateChkAndValueChk(mjonMsgSentVO.getSearchStartDate(),mjonMsgSentVO.getSearchEndDate(), 3 )) {
+				mjonMsgSentVO.setSearchStartDate(DateUtils.getDateMonthsAgo(3));
+				mjonMsgSentVO.setSearchEndDate(DateUtils.getCurrentDate());
 			};
 	
-			model.addAttribute("startDate", mjonMsgSentVO.getStartDate());
-			model.addAttribute("endDate", mjonMsgSentVO.getEndDate());
+			model.addAttribute("searchStartDate", mjonMsgSentVO.getSearchStartDate());
+			model.addAttribute("searchEndDate", mjonMsgSentVO.getSearchEndDate());
 			
 			//전체 발송 리스트 불러오기
 			Map<String, Object> resultMap = mjonMsgSentService.selectAllMsgSentList_advc(mjonMsgSentVO);

 			model.addAttribute("mjonMsgSentVO", mjonMsgSentVO);
 			
 			String stateType = mjonMsgSentVO.getStateType();
-			// String pageUrl = "web/msgsent/MsgSentAllListAjax";
-			/*
-			pageUrl = "web/msgsent/MsgSentAllListAjax";
-			if(stateType.equals("ready")) {
-				
-				pageUrl = "web/msgsent/MsgSentReadyListAjax";
-				
-			}else if(stateType.equals("complete")) {
-				
-				pageUrl = "web/msgsent/MsgSentCompleteListAjax";
-				
-			}else if(stateType.equals("fail")) {
-				
-				pageUrl = "web/msgsent/MsgSentFailListAjax";
-				
-			}*/	
+			
 		} catch (Exception e) {
 			e.printStackTrace();
 			// TODO: handle exception

     		
     	}
     	
-    	String stateType = mjonMsgSentVO.getStateType();
-		String tabType = mjonMsgSentVO.getTabType();
     	
-    	// 메모리에 100개의 행을 유지합니다. 행의 수가 넘으면 디스크에 적습니다.
-		SXSSFWorkbook wb = new SXSSFWorkbook(100);
-		String fileName ="발송관리 엑셀 리스트";		// 저장 파일명
-		String sheetTitle = "문자 발송 내역" ; 		// 셀 제목
-		Sheet sheet = wb.createSheet(sheetTitle);
-		Cell cell = null;
-		Row row = null;
-		
-		CellStyle style = wb.createCellStyle();
-		style.setBorderBottom(CellStyle.BORDER_THIN); //테두리 두껍게 
-		style.setBorderLeft(CellStyle.BORDER_THIN);
-		style.setBorderRight(CellStyle.BORDER_THIN);
-		style.setBorderTop(CellStyle.BORDER_THIN);
-		
-		// 정렬
-		style.setAlignment(CellStyle.ALIGN_CENTER); //가운데 정렬
-		style.setVerticalAlignment(CellStyle.VERTICAL_CENTER); //높이 가운데 정렬
-		
-		Font font = wb.createFont();
-		font.setBoldweight(Font.BOLDWEIGHT_BOLD);  //글씨 bold
-		
-		
-		String type = "";
-		String fCnt = "";
-		
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-		
-		try{ 
-			
-			
-			mjonMsgSentVO.setRecordCountPerPage(100000);
-			mjonMsgSentVO.setFirstIndex(0);
-
-			if("".equals(mjonMsgSentVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
-				mjonMsgSentVO.setSearchSortCnd("regdate");
-				mjonMsgSentVO.setSearchSortOrd("desc");
-			}
-			
-			//예약 관리 리스트 불러오기
-			List<MjonMsgSentVO> resultAllSentList = mjonMsgSentService.selectAllMsgSentList(mjonMsgSentVO);
-			
-			{//화면 리스트
-				
-  				row = sheet.createRow(0);
-  				
-					sheet.setColumnWidth(1, 5000); // 발송일시 칼럼의 폭 조절
-					sheet.setColumnWidth(3, 10000); // 내용 칼럼의 폭 조절
-					sheet.setColumnWidth(4, 5000); // 받는사람 이름 칼럼의 폭 조절
-					sheet.setColumnWidth(5, 5000); // 받는사람 연락처 칼럼의 폭 조절
-					sheet.setColumnWidth(6, 5000); // 발신번호  칼럼의 폭 조절
-					sheet.setColumnWidth(7, 5000); // 발송상태 칼럼의 폭 조절
-					sheet.setColumnWidth(8, 5000); // 발송건수 칼럼의 폭 조절
-					
-					//셀병합 처리
-					sheet.addMergedRegion(new CellRangeAddress(0,1,0,0)); //번호 세로 셀병합
-	  				sheet.addMergedRegion(new CellRangeAddress(0,1,1,1)); //발송일시 세로 셀병합
-	  				sheet.addMergedRegion(new CellRangeAddress(0,1,2,2)); //형태 세로 셀병합
-	  				sheet.addMergedRegion(new CellRangeAddress(0,1,3,3)); //내용 세로 셀병합
-	  				sheet.addMergedRegion(new CellRangeAddress(0,1,4,4)); //받는사람 이름 셀병합
-	  				sheet.addMergedRegion(new CellRangeAddress(0,1,5,5)); //받는사람 연락처 셀병합
-	  				sheet.addMergedRegion(new CellRangeAddress(0,1,6,6)); //발신번호 세로 셀병합
-	  				sheet.addMergedRegion(new CellRangeAddress(0,1,7,7)); //발송상태 세로 셀병합
-	  				sheet.addMergedRegion(new CellRangeAddress(0,1,8,8)); //발송건수 세로 셀병합
-	  				
-					
-					cell = row.createCell(0);
-					cell.setCellValue("번호");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(1);
-					cell.setCellValue("발송일시");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(2);
-					cell.setCellValue("형태");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(3);
-					cell.setCellValue("내용");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(4);
-					cell.setCellValue("수신자");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(5);
-					cell.setCellValue("수신번호");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(6);
-					cell.setCellValue("발신번호");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(7);
-					cell.setCellValue("발송상태");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(8);
-					cell.setCellValue("발송건수");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(9);
-					cell.setCellValue("발송결과");
-					sheet.addMergedRegion(new CellRangeAddress(0,0,9,10)); // 발송결과 건수 가로 셀병합
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(10);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(11);
-					cell.setCellValue("금액");
-					sheet.addMergedRegion(new CellRangeAddress(0,0,11,12)); // 발송결과 건수 가로 셀병합
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(12);
-					cell.setCellValue("예약취소");
-					cell.setCellStyle(style);
-					
-					row = sheet.createRow(1);
-					
-					cell = row.createCell(0);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(1);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(2);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(3);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(4);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(5);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(6);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(7);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(8);
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(9);
-					cell.setCellValue("성공");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(10);
-					cell.setCellValue("실패/대기");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(11);
-					cell.setCellValue("과금");
-					cell.setCellStyle(style);
-					
-					cell = row.createCell(12);
-					cell.setCellValue("비과금");
-					cell.setCellStyle(style);
-				} 
-				
-				for(int i=0; i < resultAllSentList.size(); i++) {
-					String msgType = "단문";
-					if(resultAllSentList.get(i).getMsgType().equals("6") && resultAllSentList.get(i).getFileCnt().equals("0")) {
-						msgType = "장문";
-					}else if(resultAllSentList.get(i).getMsgType().equals("6") && !resultAllSentList.get(i).getFileCnt().equals("0")) {
-						msgType = "그림";
-					}
-					
-					
-					int excelLen = 0;
-					row = sheet.createRow(i+2);
-					excelLen = 12;
-						
-					for(int j=0 ; j <= excelLen ; j++) {
-						cell = row.createCell(j);
-						cell.setCellStyle(style);
-						
-						if(j==0) cell.setCellValue(i+1); //번호
-						if(j==1) cell.setCellValue(sdf.format((resultAllSentList.get(i)).getReqdate())); 	//발송일자
-						if(j==2) {
-							
-							type = resultAllSentList.get(i).getMsgType();
-							fCnt = resultAllSentList.get(i).getFileCnt();
-							
-							if(type.equals("4")) {
-								
-								cell.setCellValue("단문"); 	//형태
-								
-							}else {
-								
-								if(fCnt.equals("0")) {
-									
-									cell.setCellValue("장문"); 	//형태
-									
-								}else {
-									
-									cell.setCellValue("그림"); 	//형태
-									
-								}
-								
-							}
-							
-						} 
-						if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); 		//내용
-						if(j==4) cell.setCellValue((resultAllSentList.get(i)).getAddrNm());
-						if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallToComma());
-						if(j==6) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); 		//발신번호
-						if(j==7) { //발송상태 처리해주기
-							
-							String resvCYn = resultAllSentList.get(i).getReserveCYn();
-							String curState = resultAllSentList.get(i).getCurState();
-							
-							if(resvCYn.equals("Y")) {
-								
-								cell.setCellValue("예약 취소"); 		//발송상태
-								
-							}else {
-								
-								if(curState.equals("0")) {
-									
-									cell.setCellValue("발송 대기");		//발송상태
-									
-								}else if(curState.equals("1")) {
-									
-									cell.setCellValue("발송중"); 		//발송상태
-									
-								}else if(curState.equals("2")) {
-									
-									cell.setCellValue("결과 대기"); 	//발송상태
-									
-								}else if(curState.equals("3")) {
-									
-									cell.setCellValue("발송 완료"); 	//발송상태
-									
-								}
-							}
-							
-						}
-						if(j==8) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt());	//발송건수
-							
-						//발송결과 성공, 실패 처리
-						int resSucCnt = 0;
-						int resFailCnt = 0;
-						double resSucPrice = 0;
-						double resFailPirce = 0;
-						
-						
-						double eachPrice = Float.parseFloat(resultAllSentList.get(i).getEachPrice());
-						int resultSValue = 0;
-						int resultWFValue = 0;
-						
-						if(resultAllSentList.get(i).getResultSValue() != null) {
-							resultSValue = Integer.parseInt(resultAllSentList.get(i).getResultSValue());
-						}else {
-							resultSValue = 1;
-						}
-						
-						if(resultAllSentList.get(i).getResultWFValue() != null) {
-							resultWFValue = Integer.parseInt(resultAllSentList.get(i).getResultWFValue());
-						}else {
-							resultWFValue = 1;
-						}
-						
-						
-						if("S".equals(resultAllSentList.get(i).getMsgResult())) {
-							resSucCnt = resultSValue;
-						} else {
-							resFailCnt = resultWFValue;
-						}
-							
-						resSucPrice = eachPrice * resSucCnt;
-						resFailPirce = eachPrice * resFailCnt;
-						
-						
-						if(j==9) cell.setCellValue(resSucCnt); 		//발송결과 성공
-						if(j==10) cell.setCellValue(resFailCnt); 		//발송결과 실패
-						if(j==11) cell.setCellValue(resSucPrice); // 과금 금액
-						if(j==12) cell.setCellValue(resFailPirce); //비과금 금액
-					}
-				}
-			response.setHeader("Set-Cookie", "fileDownload=true; path=/");
-			SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat ( "yyyyMMdd_HHmmss", Locale.KOREA );
-			Date currentTime = new Date ();
-			String mTime = mSimpleDateFormat.format ( currentTime );
-			fileName = fileName+"("+mTime+")";
-			
-			response.setHeader("Content-Disposition", String.format("attachment; filename=\""+new String((fileName).getBytes("KSC5601"),"8859_1")+".xlsx"));
-			wb.write(response.getOutputStream());
-		}catch(Exception e) {
-  			response.setHeader("Set-Cookie", "fileDownload=false; path=/");
-  			response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
-  			response.setHeader("Content-Type","text/html; charset=utf-8");
-  			OutputStream out = null;
-  			try {
-  				out = response.getOutputStream();
-  				byte[] data = new String("fail..").getBytes();
-  				out.write(data, 0, data.length);
-  			} catch(Exception ignore) {
-  				ignore.printStackTrace();
-  			} finally {
-  				if(out != null) try { out.close(); } catch(Exception ignore) {}
-  			}
-  		}finally {
-  			// 디스크 적었던 임시파일을 제거합니다.
-  			wb.dispose();
-  			try { wb.close(); } catch(Exception ignore) {}
-  		}
+    	mjonMsgSentService.msgSentExcelDownLoad(mjonMsgSentVO, response);
+    	
     	
 		
 	}

5cfae19

da00ed6

src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java

--- src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java

+++ src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java


 			}
 			
 		} catch (Exception e) {
+			e.printStackTrace();
 			System.out.println("++++++++++++++++++++++ 예약문자 취소 deleteReservMsgCancelDataAjax Service Imple Error !!! " + e);
 		}
 		

5cfae19

da00ed6

src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java

--- src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java

+++ src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java


 	
 		ModelAndView modelAndView = new ModelAndView(); 
 		modelAndView.setViewName("jsonView");
+		try {
 		
-		//로그인 권한정보 불러오기
-		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
-    	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
-
-    	if(!userId.equals("")) {
-    		
-    		mjonResvMsgVO.setUserId(userId);
-    		
-    	}else {
-    		
-    		modelAndView.addObject("message", "로그인 후 이용이 가능합니다.");
-    		modelAndView.addObject("result", "fail");
-    		
-    		return modelAndView;
-    		
-    	}
-    	
-    	 // 디비에 문자 내용을 저장해 준다.
- 		int resultSts = mjonReservMsgService.deleteReservMsgCancelDataAjax(mjonResvMsgVO);
-		
-		if(resultSts > 0) {
+			//로그인 권한정보 불러오기
+			LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+	    	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
+	
+	    	if(!userId.equals("")) {
+	    		
+	    		mjonResvMsgVO.setUserId(userId);
+	    		
+	    	}else {
+	    		
+	    		modelAndView.addObject("message", "로그인 후 이용이 가능합니다.");
+	    		modelAndView.addObject("result", "fail");
+	    		
+	    		return modelAndView;
+	    		
+	    	}
+	    	
+	    	 // 디비에 문자 내용을 저장해 준다.
+	 		int resultSts = mjonReservMsgService.deleteReservMsgCancelDataAjax(mjonResvMsgVO);
 			
-			modelAndView.addObject("message", "예약 발송이 정상적으로 취소 되었습니다.");
-			modelAndView.addObject("result", "success");
+			if(resultSts > 0) {
+				
+				modelAndView.addObject("message", "예약 발송이 정상적으로 취소 되었습니다.");
+				modelAndView.addObject("result", "success");
+				
+			}else {
+				
+				modelAndView.addObject("message", "예약 발송 취소 처리가 실패 되었습니다. 잠시 후 다시 시도해 주세요.");
+				modelAndView.addObject("result", "fail");
+				
+			}
 			
-		}else {
-			
-			modelAndView.addObject("message", "예약 발송 취소 처리가 실패 되었습니다. 잠시 후 다시 시도해 주세요.");
-			modelAndView.addObject("result", "fail");
-			
+		} catch (Exception e) {
+			e.printStackTrace();
+			// TODO: handle exception
 		}
 		
 		return modelAndView;

5cfae19

da00ed6

src/main/java/itn/let/uss/umt/service/UserDefaultVO.java

--- src/main/java/itn/let/uss/umt/service/UserDefaultVO.java

+++ src/main/java/itn/let/uss/umt/service/UserDefaultVO.java


 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * 사용자정보 VO클래스로서일반회원, 기업회원, 업무사용자의  비지니스로직 처리시 기타조건성 항을 구성한다.
  * @author 공통서비스 개발팀 조재영

  *
  * </pre>
  */
+@Getter
+@Setter
 public class UserDefaultVO implements Serializable {
 	
 	/**

     /** 검색조건-성별     (0, M, F)*/
     private String searchSexdstn = "0";
     
-	/** 검색조건 */
+	/**  
+	 * 검색조건
+	 * 20250122 이호영 
+	 * 개선은 검색조건을 아래 세개만 사용하려고 함
+	 * */
     private String searchCondition ;
+    private String searchCondition01 ;
+    private String searchCondition02 ;
     
+    
+    
+    /** 검색조건 - 기존 */
+//    private String searchCondition ;
     private String searchCondition_01 ;
     
     private String searchConditionSite ;

 	
 	private String searchDeleteType;
 	
-	public String getSearchDeleteType() {
-		return searchDeleteType;
-	}
-
-	public void setSearchDeleteType(String searchDeleteType) {
-		this.searchDeleteType = searchDeleteType;
-	}
-
-	public String getSearchHotlineAgentCode() {
-		return searchHotlineAgentCode;
-	}
-
-	public void setSearchHotlineAgentCode(String searchHotlineAgentCode) {
-		this.searchHotlineAgentCode = searchHotlineAgentCode;
-	}
-
-	public String getSearchExceptSpamYn() {
-		return searchExceptSpamYn;
-	}
-
-	public void setSearchExceptSpamYn(String searchExceptSpamYn) {
-		this.searchExceptSpamYn = searchExceptSpamYn;
-	}
-
-	public String getSearchSmishingYn() {
-		return searchSmishingYn;
-	}
-
-	public void setSearchSmishingYn(String searchSmishingYn) {
-		this.searchSmishingYn = searchSmishingYn;
-	}
-
-	public String getSearchDeptPrePayment() {
-		return searchDeptPrePayment;
-	}
-
-	public void setSearchDeptPrePayment(String searchDeptPrePayment) {
-		this.searchDeptPrePayment = searchDeptPrePayment;
-	}
 
 	private String searchAdminSmsNoticeYn;
 	

 	private String searchThrDptCategoryCode; //3뎁스(하위카테고리) 검색	
 	
 		
-	public String getEditMode() {
-		return editMode;
-	}
-
-	public void setEditMode(String editMode) {
-		this.editMode = editMode;
-	}
-
-	public String getSearchSmsSalePrice() {
-		return searchSmsSalePrice;
-	}
-
-	public void setSearchSmsSalePrice(String searchSmsSalePrice) {
-		this.searchSmsSalePrice = searchSmsSalePrice;
-	}
-
-	public String getSearchAdminSmsNoticeYn() {
-		return searchAdminSmsNoticeYn;
-	}
-
-	public void setSearchAdminSmsNoticeYn(String searchAdminSmsNoticeYn) {
-		this.searchAdminSmsNoticeYn = searchAdminSmsNoticeYn;
-	}
-
-	public String getSearchDept() {
-		return searchDept;
-	}
-
-	public void setSearchDept(String searchDept) {
-		this.searchDept = searchDept;
-	}
-
-	public String getAuthorCode() {
-		return authorCode;
-	}
-
-	public void setAuthorCode(String authorCode) {
-		this.authorCode = authorCode;
-	}
-
-	public String getSearchCategoryCode() {
-		return searchCategoryCode;
-	}
-
-	public void setSearchCategoryCode(String searchCategoryCode) {
-		this.searchCategoryCode = searchCategoryCode;
-	}
-	
-	public String getSearchKeywordFrom() {
-		return searchKeywordFrom;
-	}
-
-	public void setSearchKeywordFrom(String searchKeywordFrom) {
-		this.searchKeywordFrom = searchKeywordFrom;
-	}
-
-	public String getSearchKeywordTo() {
-		return searchKeywordTo;
-	}
-
-	public void setSearchKeywordTo(String searchKeywordTo) {
-		this.searchKeywordTo = searchKeywordTo;
-	}
-
-	public String getFrstRegistPnttm() {
-		return frstRegistPnttm;
-	}
-
-	public void setFrstRegistPnttm(String frstRegistPnttm) {
-		this.frstRegistPnttm = frstRegistPnttm;
-	}
-
-	public String getFrstRegisterId() {
-		return frstRegisterId;
-	}
-
-	public void setFrstRegisterId(String frstRegisterId) {
-		this.frstRegisterId = frstRegisterId;
-	}
-
-	public String getLastUpdtPnttm() {
-		return lastUpdtPnttm;
-	}
-
-	public void setLastUpdtPnttm(String lastUpdtPnttm) {
-		this.lastUpdtPnttm = lastUpdtPnttm;
-	}
-
-	public String getLastUpdusrId() {
-		return lastUpdusrId;
-	}
-
-	public void setLastUpdusrId(String lastUpdusrId) {
-		this.lastUpdusrId = lastUpdusrId;
-	}
-
-	public int getTotCnt() {
-		return totCnt;
-	}
-
-	public void setTotCnt(int totCnt) {
-		this.totCnt = totCnt;
-	}
-
-	public String getUserTotailCount() {
-		return userTotailCount;
-	}
-
-	public void setUserTotailCount(String userTotailCount) {
-		this.userTotailCount = userTotailCount;
-	}
-
-	public String getUserNewCount() {
-		return userNewCount;
-	}
-
-	public void setUserNewCount(String userNewCount) {
-		this.userNewCount = userNewCount;
-	}
-
-	public String getUserDeleteCount() {
-		return userDeleteCount;
-	}
-
-	public void setUserDeleteCount(String userDeleteCount) {
-		this.userDeleteCount = userDeleteCount;
-	}
-
-	public String getUserNewBlock() {
-		return userNewBlock;
-	}
-
-	public void setUserNewBlock(String userNewBlock) {
-		this.userNewBlock = userNewBlock;
-	}
-
-	public String getSnsSiteId() {
-		return snsSiteId;
-	}
-
-	public void setSnsSiteId(String snsSiteId) {
-		this.snsSiteId = snsSiteId;
-	}
-
-	public String getSnsSiteName() {
-		return snsSiteName;
-	}
-
-	public void setSnsSiteName(String snsSiteName) {
-		this.snsSiteName = snsSiteName;
-	}
-
-	public String getSnsSite() {
-		return snsSite;
-	}
-
-	public void setSnsSite(String snsSite) {
-		this.snsSite = snsSite;
-	}
-
-	public String getSnsId() {
-		return snsId;
-	}
-
-	public void setSnsId(String snsId) {
-		this.snsId = snsId;
-	}
-
-	public String getSnsEmail() {
-		return snsEmail;
-	}
-
-	public void setSnsEmail(String snsEmail) {
-		this.snsEmail = snsEmail;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	/**
-	 * sbscrbSttus attribute 값을  리턴한다.
-	 * @return String
-	 */
-	public String getSbscrbSttus() {
-		return sbscrbSttus;
-	}
-
-	/**
-	 * sbscrbSttus attribute 값을 설정한다.
-	 * @param sbscrbSttus String
-	 */
-	public void setSbscrbSttus(String sbscrbSttus) {
-		this.sbscrbSttus = sbscrbSttus;
-	}
-
-	/**
-	 * searchCondition attribute 값을  리턴한다.
-	 * @return String
-	 */
-	public String getSearchCondition() {
-		return searchCondition;
-	}
-
-	/**
-	 * searchCondition attribute 값을 설정한다.
-	 * @param searchCondition String
-	 */
-	public void setSearchCondition(String searchCondition) {
-		this.searchCondition = searchCondition;
-	}
-
-	/**
-	 * searchKeyword attribute 값을  리턴한다.
-	 * @return String
-	 */
-	public String getSearchKeyword() {
-		return searchKeyword;
-	}
-
-	/**
-	 * searchKeyword attribute 값을 설정한다.
-	 * @param searchKeyword String
-	 */
-	public void setSearchKeyword(String searchKeyword) {
-		this.searchKeyword = searchKeyword;
-	}
-
-	/**
-	 * searchUseYn attribute 값을  리턴한다.
-	 * @return String
-	 */
-	public String getSearchUseYn() {
-		return searchUseYn;
-	}
-
-	/**
-	 * searchUseYn attribute 값을 설정한다.
-	 * @param searchUseYn String
-	 */
-	public void setSearchUseYn(String searchUseYn) {
-		this.searchUseYn = searchUseYn;
-	}
-
-	/**
-	 * pageIndex attribute 값을  리턴한다.
-	 * @return int
-	 */
-	public int getPageIndex() {
-		return pageIndex;
-	}
-
-	/**
-	 * pageIndex attribute 값을 설정한다.
-	 * @param pageIndex int
-	 */
-	public void setPageIndex(int pageIndex) {
-		this.pageIndex = pageIndex;
-	}
-
-	/**
-	 * pageUnit attribute 값을  리턴한다.
-	 * @return int
-	 */
-	public int getPageUnit() {
-		return pageUnit;
-	}
-
-	/**
-	 * pageUnit attribute 값을 설정한다.
-	 * @param pageUnit int
-	 */
-	public void setPageUnit(int pageUnit) {
-		this.pageUnit = pageUnit;
-	}
-
-	/**
-	 * pageSize attribute 값을  리턴한다.
-	 * @return int
-	 */
-	public int getPageSize() {
-		return pageSize;
-	}
-
-	/**
-	 * pageSize attribute 값을 설정한다.
-	 * @param pageSize int
-	 */
-	public void setPageSize(int pageSize) {
-		this.pageSize = pageSize;
-	}
-
-	/**
-	 * firstIndex attribute 값을  리턴한다.
-	 * @return int
-	 */
-	public int getFirstIndex() {
-		return firstIndex;
-	}
-
-	/**
-	 * firstIndex attribute 값을 설정한다.
-	 * @param firstIndex int
-	 */
-	public void setFirstIndex(int firstIndex) {
-		this.firstIndex = firstIndex;
-	}
-
-	/**
-	 * lastIndex attribute 값을  리턴한다.
-	 * @return int
-	 */
-	public int getLastIndex() {
-		return lastIndex;
-	}
-
-	/**
-	 * lastIndex attribute 값을 설정한다.
-	 * @param lastIndex int
-	 */
-	public void setLastIndex(int lastIndex) {
-		this.lastIndex = lastIndex;
-	}
-
-	/**
-	 * recordCountPerPage attribute 값을  리턴한다.
-	 * @return int
-	 */
-	public int getRecordCountPerPage() {
-		return recordCountPerPage;
-	}
-
-	/**
-	 * recordCountPerPage attribute 값을 설정한다.
-	 * @param recordCountPerPage int
-	 */
-	public void setRecordCountPerPage(int recordCountPerPage) {
-		this.recordCountPerPage = recordCountPerPage;
-	}
-    
-	/*성별조건 검색*/
-	public String getSearchSexdstn() {
-		return searchSexdstn;
-	}
-
-	public void setSearchSexdstn(String searchSexdstn) {
-		this.searchSexdstn = searchSexdstn;
-	}
-
-	/**
-     * toString 메소드를 대치한다.
-     */
-    public String toString() {
-    	return ToStringBuilder.reflectionToString(this);
-    }
-
-	public String getSiteId() {
-		return siteId;
-	}
-
-	public void setSiteId(String siteId) {
-		this.siteId = siteId;
-	}
-
-	public String getSearchConditionSite() {
-		return searchConditionSite;
-	}
-
-	public void setSearchConditionSite(String searchConditionSite) {
-		this.searchConditionSite = searchConditionSite;
-	}
-
-	public String getAdminYn() {
-		return adminYn;
-	}
-
-	public void setAdminYn(String adminYn) {
-		this.adminYn = adminYn;
-	}
-
-	public String getGnrlUser() {
-		return gnrlUser;
-	}
-
-	public void setGnrlUser(String gnrlUser) {
-		this.gnrlUser = gnrlUser;
-	}
-
-	
-	public String getEmplyrSttusCode() {
-		return emplyrSttusCode;
-	}
-
-	public void setEmplyrSttusCode(String emplyrSttusCode) {
-		this.emplyrSttusCode = emplyrSttusCode;
-	}
-
-	public String[] getEsntlIdNsttusCode() {
-		return esntlIdNsttusCode;
-	}
-
-	public void setEsntlIdNsttusCode(String[] esntlIdNsttusCode) {
-		this.esntlIdNsttusCode = esntlIdNsttusCode;
-	}
-
-	public String getEmplyrId() {
-		return emplyrId;
-	}
-
-	public void setEmplyrId(String emplyrId) {
-		this.emplyrId = emplyrId;
-	}
-
-	public String getSearchCondition_01() {
-		return searchCondition_01;
-	}
-
-	public void setSearchCondition_01(String searchCondition_01) {
-		this.searchCondition_01 = searchCondition_01;
-	}
-
-	public String getSearchSortCnd() {
-		return searchSortCnd;
-	}
-
-	public void setSearchSortCnd(String searchSortCnd) {
-		this.searchSortCnd = searchSortCnd;
-	}
-
-	public String getSearchSortOrd() {
-		return searchSortOrd;
-	}
-
-	public void setSearchSortOrd(String searchSortOrd) {
-		this.searchSortOrd = searchSortOrd;
-	}
-
-	public String getNiceFailUrl() {
-		return niceFailUrl;
-	}
-
-	public void setNiceFailUrl(String niceFailUrl) {
-		this.niceFailUrl = niceFailUrl;
-	}
-
-	public String getNiceSuccUrl() {
-		return niceSuccUrl;
-	}
-
-	public void setNiceSuccUrl(String niceSuccUrl) {
-		this.niceSuccUrl = niceSuccUrl;
-	}
-
-	public boolean isMobile() {
-		return isMobile;
-	}
-
-	public void setMobile(boolean isMobile) {
-		this.isMobile = isMobile;
-	}
-
-	public String getNiceMessage() {
-		return niceMessage;
-	}
-
-	public void setNiceMessage(String niceMessage) {
-		this.niceMessage = niceMessage;
-	}
-
-	public String getNiceNm() {
-		return niceNm;
-	}
-
-	public void setNiceNm(String niceNm) {
-		this.niceNm = niceNm;
-	}
-
-	public String getMblDn() {
-		return mblDn;
-	}
-
-	public void setMblDn(String mblDn) {
-		this.mblDn = mblDn;
-	}
-
-	public String getMberSttus() {
-		return mberSttus;
-	}
-
-	public void setMberSttus(String mberSttus) {
-		this.mberSttus = mberSttus;
-	}
-
-	public String getSearchStartDate() {
-		return searchStartDate;
-	}
-
-	public void setSearchStartDate(String searchStartDate) {
-		this.searchStartDate = searchStartDate;
-	}
-
-	public String getSearchEndDate() {
-		return searchEndDate;
-	}
-
-	public void setSearchEndDate(String searchEndDate) {
-		this.searchEndDate = searchEndDate;
-	}
-
-	public String getCandidateYn() {
-		return candidateYn;
-	}
-
-	public void setCandidateYn(String candidateYn) {
-		this.candidateYn = candidateYn;
-	}
-
-	public String getSearchBestCategory() {
-		return searchBestCategory;
-	}
-
-	public void setSearchBestCategory(String searchBestCategory) {
-		this.searchBestCategory = searchBestCategory;
-	}
-
-	public String getSearchDiv() {
-		return searchDiv;
-	}
-
-	public void setSearchDiv(String searchDiv) {
-		this.searchDiv = searchDiv;
-	}
-
-	public String getSearchTwoDptCategoryCode() {
-		return searchTwoDptCategoryCode;
-	}
-
-	public void setSearchTwoDptCategoryCode(String searchTwoDptCategoryCode) {
-		this.searchTwoDptCategoryCode = searchTwoDptCategoryCode;
-	}
-
-	public String getSearchThrDptCategoryCode() {
-		return searchThrDptCategoryCode;
-	}
-
-	public void setSearchThrDptCategoryCode(String searchThrDptCategoryCode) {
-		this.searchThrDptCategoryCode = searchThrDptCategoryCode;
-	}
-	
-   	public String getSearchStartDate2() {
-		return searchStartDate2;
-	}
-
-	public void setSearchStartDate2(String searchStartDate2) {
-		this.searchStartDate2 = searchStartDate2;
-	}
-
-	public String getSearchEndDate2() {
-		return searchEndDate2;
-	}
-
-	public void setSearchEndDate2(String searchEndDate2) {
-		this.searchEndDate2 = searchEndDate2;
-	}
-	
 	
 }

5cfae19

da00ed6

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


                 	,'01','00') AS tab2
                 , if (A.MSG_TYPE= '6' AND B.MSG_TYPE= '6' AND B.FILE_CNT > '0'
                 	,'01','00') AS tab3				
-				
 			<include refid="MjonMsgSentDAO.selectJoinQuery"/>
+			
 				AND	A.USER_ID    = #userId#
 				AND	B.USER_ID    = #userId#
 			<isNotEmpty property="ntceBgnde">

 			<isEmpty property="msgType">
 				AND A.MSG_TYPE IN ('4','6')
 			</isEmpty>
-				AND B.RESERVE_C_YN = 'N'
-				<![CDATA[ 
-					AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
-				]]>
 			<isNotEmpty property="fileCnt">
 				<isEqual property="fileCnt" compareValue="0">
 					AND     B.FILE_CNT   = '0'

 				<isNotEqual property="fileCnt" compareValue="0">
 					<![CDATA[ AND B.FILE_CNT > '0' ]]>
 				</isNotEqual>
+			</isNotEmpty>
+			<isNotEmpty property="searchStartDate">
+				<![CDATA[
+					AND DATE_FORMAT(B.REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
+				]]>
+			</isNotEmpty>
+			<isNotEmpty property="searchEndDate">
+				<![CDATA[
+					AND 	DATE_FORMAT(B.REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')
+				]]>
 			</isNotEmpty>
 		) A0
 		GROUP BY

 			WHERE (B.DEL_FLAG = 'N' OR B.DEL_FLAG IS NULL)
 				AND A.DEL_FLAG = 'N'
 				AND B.USER_ID = #userId#
-				AND B.RESERVE_C_YN = 'N'
-				<![CDATA[
-					AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
-				]]>
-				<isNotEmpty property="searchMsgType">
-					<isEqual property="searchMsgType" compareValue="S">
-						AND B.MSG_TYPE = '4'
-					</isEqual>
-					<isEqual property="searchMsgType" compareValue="L">
-						AND B.MSG_TYPE = '6'
-						AND B.FILE_CNT = '0'
-					</isEqual>
-					<isEqual property="searchMsgType" compareValue="M">
-					<![CDATA[
-						AND B.MSG_TYPE = '6'
-						AND B.FILE_CNT > '0'
-					]]>
-					</isEqual>
-				</isNotEmpty>
 				<isNotEmpty property="searchKeyword">
 					<isEqual property="searchCondition" compareValue="1" >
 						AND B.SUBJECT LIKE CONCAT('%', #searchKeyword#, '%')

 						AND B.CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%')
 					</isEqual>
 					<isEqual property="searchCondition" compareValue="3" >
-						AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
+						AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
 					</isEqual>
 				</isNotEmpty>
-				<isNotEmpty property="searchCondition_01">
-					AND sendKind = #searchCondition_01#
+				<isNotEmpty property="searchCondition01">
+					AND B.RESERVE_YN = #searchCondition01#
 				</isNotEmpty>
-			<isNotEmpty property="startDate">
-				<![CDATA[
-					AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
-				]]>
-			</isNotEmpty>
-			<isNotEmpty property="endDate">
-				<![CDATA[
-					AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#endDate#, '%Y-%m-%d')
-				]]>
-			</isNotEmpty>
+				<isNotEmpty property="searchCondition02">
+					<isEqual property="searchCondition02" compareValue="S">
+						AND B.MSG_TYPE = '4'
+					</isEqual>
+					<isEqual property="searchCondition02" compareValue="L">
+						AND B.MSG_TYPE = '6'
+						AND B.FILE_CNT = '0'
+					</isEqual>
+					<isEqual property="searchCondition02" compareValue="M">
+					<![CDATA[  
+						AND B.MSG_TYPE = '6'
+						AND B.FILE_CNT > '0'
+					]]>
+					</isEqual>
+				</isNotEmpty>
+				<isNotEmpty property="searchStartDate">
+					<![CDATA[
+						AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
+					]]>
+				</isNotEmpty>
+				<isNotEmpty property="searchEndDate">
+					<![CDATA[
+						AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')
+					]]>
+				</isNotEmpty>
 	</select>	
 	
 	

 	select 
 		SUM(IF(aa.result = 'S', 1, 0)) AS resultSValue,
 		SUM(IF(aa.result = 'W', 1, 0)) AS resultWValue,
-		SUM(IF(aa.result = 'F', 1, 0)) AS resultFValue
+		SUM(IF(aa.result = 'F', 1, 0)) AS resultFValue,
+		CASE
+			WHEN COUNT(DISTINCT REQ_DATE) > 1 THEN 'Y'
+			ELSE 'N'
+		END AS divideYN
 	from
 		(
 		select 

 					and A.RSLT_DATE is null ) then 'W'
 				else 'F'
 			end as result /* common query */
+			, A.REQ_DATE 
 		from
 			MJ_MSG_DATA A
 		where

 	
 	<!-- 전체 발송결과 조회  (전송사별)-->
 	<select id="MjonMsgSentDAO.selectAllMsgSentList_advc" parameterClass="mjonMsgSentVO" resultClass="mjonMsgSentVO">
-	
-SELECT
+		/* MjonMsgSentDAO.selectAllMsgSentList_advc */
+		SELECT
 			B.USER_ID as userId
 			, B.MSG_GROUP_ID as msgGroupId
 			, B.MSG_GROUP_CNT as msgGroupCnt

 			, B.MSG_KIND as msgKind
 			, B.DELAY_YN as delayYn
 			, B.DELAY_COMPLETE_YN as delayCompleteYn
+			, B.RESERVE_YN as reserveYn
+			, B.RESERVE_C_YN as reserveCYn
+			, TIMESTAMPDIFF(minute, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) as diffMin
 		FROM MJ_MSG_DATA A
 				 JOIN MJ_MSG_GROUP_DATA B ON A.MSG_GROUP_ID = B.MSG_GROUP_ID
 		WHERE (B.DEL_FLAG = 'N' OR B.DEL_FLAG IS NULL)
 			AND A.DEL_FLAG = 'N'
-			AND B.RESERVE_C_YN = 'N'
 			AND B.USER_ID = #userId#
-			<![CDATA[
-				AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
-			]]>
-				<isNotEmpty property="searchMsgType">
-					<isEqual property="searchMsgType" compareValue="S">
-						AND B.MSG_TYPE = '4'
-					</isEqual>
-					<isEqual property="searchMsgType" compareValue="L">
-						AND B.MSG_TYPE = '6'
-						AND B.FILE_CNT = '0'
-					</isEqual>
-					<isEqual property="searchMsgType" compareValue="M">
-					<![CDATA[
-						AND B.MSG_TYPE = '6'
-						AND B.FILE_CNT > '0'
-					]]>
-					</isEqual>
-				</isNotEmpty>
-				<isNotEmpty property="searchKeyword">
-					<isEqual property="searchCondition" compareValue="1" >
-						AND B.SUBJECT LIKE CONCAT('%', #searchKeyword#, '%')
-					</isEqual>
-					<isEqual property="searchCondition" compareValue="2" >
-						AND B.CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%')
-					</isEqual>
-					<isEqual property="searchCondition" compareValue="3" >
-						AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
-					</isEqual>
-				</isNotEmpty>
-				<isNotEmpty property="searchCondition_01">
-					AND sendKind = #searchCondition_01#
-				</isNotEmpty>
-			<isNotEmpty property="startDate">
+			<isNotEmpty property="searchKeyword">
+				<isEqual property="searchCondition" compareValue="2" >
+					AND B.CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%')
+				</isEqual>
+				<isEqual property="searchCondition" compareValue="3" >
+					AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
+				</isEqual>
+			</isNotEmpty>
+			<isNotEmpty property="searchCondition01">
+				AND B.RESERVE_YN = #searchCondition01#
+			</isNotEmpty>
+			<isNotEmpty property="searchCondition02">
+				<isEqual property="searchCondition02" compareValue="S">
+					AND B.MSG_TYPE = '4'
+				</isEqual>
+				<isEqual property="searchCondition02" compareValue="L">
+					AND B.MSG_TYPE = '6'
+					AND B.FILE_CNT = '0'
+				</isEqual>
+				<isEqual property="searchCondition02" compareValue="M">
+				<![CDATA[  
+					AND B.MSG_TYPE = '6'
+					AND B.FILE_CNT > '0'
+				]]>
+				</isEqual>
+			</isNotEmpty>
+			<isNotEmpty property="searchStartDate">
 				<![CDATA[
-					AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
+					AND DATE_FORMAT(B.REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
 				]]>
 			</isNotEmpty>
-			<isNotEmpty property="endDate">
+			<isNotEmpty property="searchEndDate">
 				<![CDATA[
-					AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#endDate#, '%Y-%m-%d')
+					AND 	DATE_FORMAT(B.REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')
 				]]>
 			</isNotEmpty>
 		GROUP BY B.MSG_GROUP_ID

5cfae19

da00ed6

src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp


 			<div id="kopost_organization" class="orgCont"></div>
 		</div>	
 		<div class="tbWrap">
+			<div class="btnWrap">
+				<input type="button" class="btnType1 bg_456ded main1_save_btn" value="저 장" onClick="fn_save_menuInfo(); return false;">
+			</div>
 			<span class="tbTit" id="menuTopNm" >코드를 선택하세요</span>
 			<table class="tbType2">
 				<colgroup>

5cfae19

da00ed6

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


 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
 <%@ page import="itn.com.cmm.LoginVO" %>
 <script src="/publish/js/content.js"></script>
 <script src="/publish/js/popupLayer.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
-	var startDate = '${startDate}';
-	var endDate = '${endDate}';
+// 	var searchStartDate = '${searchStartDate}';
+// 	console.log('searchStartDate : ', searchStartDate);
+// 	var searchEndDate = '${searchEndDate}';
+// 	console.log('searchEndDate : ', searchEndDate);
     
-	// DatePicker 값 수정
-    var startDatePicker = $('#startDate').pickadate('picker');
-    startDatePicker.set('select', startDate, { format: 'yyyy/mm/dd' });
-    startDatePicker = $('#endDate').pickadate('picker');
-    startDatePicker.set('select', endDate, { format: 'yyyy/mm/dd' });
+// 	// DatePicker 값 수정
+//     var startDatePicker = $('#searchStartDate').pickadate('picker');
+//     startDatePicker.set('select', searchStartDate, { format: 'yyyy/mm/dd' });
+//     startDatePicker = $('#searchEndDate').pickadate('picker');
+//     startDatePicker.set('select', searchEndDate, { format: 'yyyy/mm/dd' });
     
 	
 	/* 목록 정렬 항목 아이콘 표시 */ 

 
 function fn_sentDetailView(msgGroupId) {
 	// msgGroupId 값을 form에 설정
-	$("#detailForm #msgGroupId").val(msgGroupId);
+	$("#searchForm #msgGroupId").val(msgGroupId);
 
 	// form을 해당 URL로 제출
-	$("#detailForm").attr("action", "/web/mjon/msgsent/msgSentDetailView.do");
-	$("#detailForm").submit();
+	$("#searchForm").attr("action", "/web/mjon/msgsent/msgSentDetailView.do");
+	$("#searchForm").submit();
 }
 
 
+// function fnReservCancel(msgGroupId, agentCode, msgType){
+function fnReservCancel(msgGroupId){
+	
+	var form = document.resCancelForm;
+	var loginVO = '${LoginVO}';
+	
+	form.msgGroupId.value = msgGroupId;
+// 	form.agentCode.value = agentCode;
+// 	form.msgType.value = msgType;
+	
+	if(loginVO == "" || loginVO == null){
+		
+		alert("로그인 후 이용이 가능합니다.");
+		return false;
+		
+	}
+	console.log('msgGroupId : ', msgGroupId);
+	var data = new FormData(form);
+	url = "/web/mjon/reservmsg/deleteReservMsgCancelDataAjax.do";
+	
+	if(confirm("정말 예약을 취소하시겠습니까?")){
+		
+		$.ajax({
+			type: "POST",
+			url: url,
+			data: data,
+			dataType:'json',
+			async: true,
+			processData: false,
+			contentType: false,
+			cache: false,
+			success: function (returnData, status) {
+				if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
+					if("fail"==returnData.result){
+						
+						alert(returnData.message);
+						return false;
+					}
+				
+// 					var smsCnt = returnData.resultSts;
+				
+					alert("예약 발송이 정상적으로 취소 되었습니다.");
+					
+					//예약 관리 리스트 다시 불러오기
+					linkPage(1);
+					//현황도 갱신 필요하여 새로고침으로 변경
+// 					location.reload(true);
+					
+				} else if(status== 'fail'){
+					alert(returnData.message);
+				}
+			},
+	        error: function (e) { 
+	        	alert("예약 취소에 실패하였습니다."); console.log("ERROR : ", e); 
+	        },
+			beforeSend : function(xmlHttpRequest) {
+	        	//로딩창 show
+	        	$('.loading_layer').addClass('active');				
+			},	        	        
+	        complete : function(xhr, textStatus) {
+	        	//로딩창 hide
+	        	$('.loading_layer').removeClass('active');
+			}
+	    });
+		
+	}
+	
+}
 
 
 </script>

 							<input type="button" class="sort sortBtn" id="sort_orderByCode">
 						</div>
 					</th>
-					<!-- <th>발송방식
-						<div class="sort_wrap">
-							<input type="button" class="sort sortBtn" id="sort_sendKind">
-						</div>
-					</th> -->
 					<th rowspan="2">내용</th>
-					<!-- <th>받는사람
-						<div class="sort_wrap">
-							<input type="button" class="sort sortBtn" id="sort_callTo">
-						</div>
-					</th> -->
-					<!-- <th>발신번호
-						<div class="sort_wrap">
-							<input type="button" class="sort sortBtn" id="sort_callFrom">
-						</div>
-					</th> -->
 					<th rowspan="2">
 						발송건수
 						<div class="sort_wrap">

 			<tbody>
 				<c:choose>
 					<c:when test="${not empty resultAllSentList}">
-					<c:forEach var="resultAllSentList" items="${resultAllSentList}" varStatus="status">
+					<c:forEach var="result" items="${resultAllSentList}" varStatus="status">
 						<tr>
 							<td>
 								<label for="msgSentDel${status.count}" class="label">선택</label>
 								<c:choose>
-									<c:when test="${resultAllSentList.curState == '0'}">
-										<input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${resultAllSentList.msgGroupId}" disabled> 
+									<c:when test="${result.curState == '0'}">
+										<input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${result.msgGroupId}" disabled> 
 									</c:when>
 									<c:when test="${mjonMsgSentVO.listType == 'groupList'}">
-										<input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${resultAllSentList.msgGroupId}">	
+										<input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${result.msgGroupId}">	
 									</c:when>
 								</c:choose>
 								
 							</td>
 							<td>
 								<c:choose>
-									<c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
+									<c:when test="${result.delayYn eq 'Y' && result.delayCompleteYn eq 'N'}">
 									
 										<c:choose>
-											<c:when test="${resultAllSentList.curState eq '0'}">
+											<c:when test="${result.curState eq '0'}">
 												<%-- 
 													20240906 추가
 													발송 대기 상태일 때만 원래 발송시간을 보여주고, 발송이 완료되면 발송 처리 완료 시간(reqDate)을 보여준다.
 													30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌
 												 --%>
-												<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>	
+												<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.delayOrgTime}" /></p>	
 											</c:when>
 											<c:otherwise>
-												<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
+												<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" /></p>
 											</c:otherwise>
 										</c:choose>
 										
 									</c:when>
 									<c:otherwise>
-										<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
+										<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" /></p>
 									</c:otherwise>
 								</c:choose>
 							</td>
 							<td>
 								<p>
 									<c:choose>
-										<c:when test="${resultAllSentList.msgType eq '6' && resultAllSentList.fileCnt eq 0 }">
+										<c:when test="${result.msgType eq '6' && result.fileCnt eq 0 }">
 											장문
 										</c:when>
-										<c:when test="${resultAllSentList.msgType eq '6' && resultAllSentList.fileCnt ne 0 }">
+										<c:when test="${result.msgType eq '6' && result.fileCnt ne 0 }">
 											그림
 										</c:when>
 										<c:otherwise>

 								</p>
 							</td>
 							<td class="result_cont">
-<%-- 								<a href="#none" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;"> --%>
-<%-- 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button> --%>
-
 								<div class="icon_wrap">
-									<span class="re">예약</span>
-									<span class="di">분할</span>
-									<a href="#none"onclick="fn_sentDetailView('${resultAllSentList.msgGroupId}')">
-										<c:out value="${resultAllSentList.smsTxt}" />
+									<c:if test="${result.reserveYn eq 'Y'}">
+										<span class="re">예약</span>
+										<!-- 예약일때만 분할이 있음 -->
+										<c:if test="${result.divideYN eq 'Y'}">
+											<span class="di">분할</span>
+										</c:if>
+									</c:if>
+									<a href="#none"onclick="fn_sentDetailView('${result.msgGroupId}')">
+										<c:out value="${result.smsTxt}" />
 									</a>
 								</div>
 							</td>
 							<td>
-								<p><c:out value="${resultAllSentList.msgGroupCnt}"/> </p>
+								<p><c:out value="${result.msgGroupCnt}"/> </p>
 							</td>
 							<td>
-								<p><c:out value="${resultAllSentList.resultWValue}"/> </p>
+								<p><c:out value="${result.resultWValue}"/> </p>
 							</td>
 							<td>
-								<p class="c_002c9a"><c:out value="${resultAllSentList.resultSValue}"/> </p>
+								<p class="c_002c9a"><c:out value="${result.resultSValue}"/> </p>
 							</td>
 							<td>
-								<p class="c_e40000"><c:out value="${resultAllSentList.resultFValue}"/> </p>
+								<p class="c_e40000"><c:out value="${result.resultFValue}"/> </p>
 							</td>
 							<td>
-								<c:out value="${resultAllSentList.totPrice}"/>원
+								<c:out value="${result.totPrice}"/>
 							</td>
 							<td>
-								<p><button class="btnType btnType20">예약취소</button></p>
+								<c:choose>
+									<c:when test="${result.statusCd ne '03' }">
+										<ec:code codeId="ITN057" code="${result.statusCd }" />
+									</c:when>
+									<c:otherwise>
+										<p><button class="btnType btnType20" onClick="javascript:fnReservCancel('${result.msgGroupId}'); return false;">예약취소</button></p>
+									</c:otherwise>
+								</c:choose>
+							
+								<!--  -->
 							</td>
 							
 							

 					</c:when>
 					<c:otherwise>
 					<tr>
-						<td colspan="11">발송 내역이 없습니다.</td>
+						<td colspan="10">발송 내역이 없습니다.</td>
 					</tr>
 					</c:otherwise>
 				</c:choose>

 	<div class="table_btn clearfix">
 		<div class="table_btn_left">
 		<!-- 2022.07.04 발송결과 화면에 리스트 선택삭제 기능 제거(카운팅 및 금액 합산 오류 관련) -->
-<!-- 			<button type="button" class="btnType btnType15" onClick="javascript:fnDelete(); return false;"><i class="remove_img"></i>선택삭제</button> -->
-			<button type="button" data-tooltip="rev_popup02" class="btnType btnType15"><i class="add_img"></i>그룹등록</button>
-			<button type="button" class="btnType btnType15" onClick="javascript:fnDeleteAddrNo('${mjonMsgSentVO.listType}'); return false;"><i class="remove_img"></i>주소록에서 번호 삭제</button>
-            <button type="button" class="btnType btnType15" onClick="javascript:fnAddBlockNo('${mjonMsgSentVO.listType}'); return false;"></i>수신거부번호 등록</button>
+			<button type="button" class="btnType btnType15" onClick="javascript:fnDelete(); return false;"><i class="remove_img"></i>선택삭제</button>
+<!-- 			<button type="button" data-tooltip="rev_popup02" class="btnType btnType15"><i class="add_img"></i>그룹등록</button> -->
+<%-- 			<button type="button" class="btnType btnType15" onClick="javascript:fnDeleteAddrNo('${mjonMsgSentVO.listType}'); return false;"><i class="remove_img"></i>주소록에서 번호 삭제</button> --%>
+<%--             <button type="button" class="btnType btnType15" onClick="javascript:fnAddBlockNo('${mjonMsgSentVO.listType}'); return false;"></i>수신거부번호 등록</button> --%>
 		</div>
 		<div class="table_btn_right">
-			<button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad('all','${mjonMsgSentVO.tabType}'); return false;"><i class="downroad"></i>엑셀 다운로드</button>
-			<button type="button" class="print_btn btnType" onClick="javascript:fnShowPrintPopup('all','${mjonMsgSentVO.tabType}'); return false;"><i class="print_img"></i>발송결과 출력하기</button>
+			<button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad(); return false;"><i class="downroad"></i>엑셀 다운로드</button>
+<%-- 			<button type="button" class="print_btn btnType" onClick="javascript:fnShowPrintPopup('all','${mjonMsgSentVO.tabType}'); return false;"><i class="print_img"></i>발송결과 출력하기</button> --%>
 		</div>
 	</div>
 	<c:if test="${!empty resultAllSentList}">

 	<form name="detailForm" id="detailForm" method="post">
 		<input type="hidden" name="msgGroupId" id="msgGroupId" value=""/> 
 	</form>
+	
+	
+	<form id="resCancelForm" name="resCancelForm" method="post">
+		<input type="hidden" id="msgGroupId" name="msgGroupId" value=""/>
+<!-- 		<input type="hidden" id="agentCode" name="agentCode" value=""/> -->
+<!-- 		<input type="hidden" id="msgType" name="msgType" value=""/> -->
+	</form>

5cfae19

da00ed6

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

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

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


 	$tbDtailList = new Tabulator("#detailPopup", {
 		height: "255px",
 		width: "20%",
-		layout: "fitColumns",
+		layout: "fitDataStretch", // 데이터가 너비에 맞게 늘어나도록 설정
 		autoColumns: false,
 		headerHozAlign: "center",
 		validationMode: "highlight",

 		clipboardCopySelector: "table",
 		clipboardPasteAction: "insert", // insert, update, replace
         columns: [
+            {
+                title: "이름",
+                field: "addrNm",
+                hozAlign: "center",
+                headerHozAlign: "center",
+                width: 140
+            },
             {
                 title: "휴대폰",
                 field: "phone",

 	
 	fn_getDetailList();
 	
-	/* 
-	
 
 	
+	$('#goPageBtn').click(function(){
+		$("#goList").submit();
+	});
 	
-	 */
+	
+	
+	
+	
+	
 	
 });
 

 	data.forEach((row, index) => {
 
 		resultData.push({ 
+			// addrNm: row.addrNm, // 폰번호
 			phone: row.callTo, // 폰번호
 			result: row.statusTxt // 결과 메시지 추가
 		});

 
 </script>
 <div class="inner">
+	<form id="goList" name="goList" method="post" action="/web/mjon/msgsent/selectMsgSentView.do">
+		<input type="hidden" name="pageIndex" value="<c:out value="${searchVO.pageIndex}" />" />
+		<input type="hidden" name="searchSortCnd" value="<c:out value='${searchVO.searchSortCnd }' />" />
+		<input type="hidden" name="searchSortOrd" value="<c:out value='${searchVO.searchSortOrd }' />" />
+		<input type="hidden" name="searchCondition01" value="<c:out value='${searchVO.searchCondition01 }' />" />
+		<input type="hidden" name="searchCondition02" value="<c:out value='${searchVO.searchCondition02 }' />" />
+		<input type="hidden" name="searchStartDate" value="<c:out value='${searchVO.searchStartDate }' />" />
+		<input type="hidden" name="searchEndDate" value="<c:out value='${searchVO.searchEndDate }' />" />
+		<input type="hidden" name="searchCondition" value="<c:out value='${searchVO.searchCondition }' />" />
+		<input type="hidden" name="searchKeyword" value="<c:out value='${searchVO.searchKeyword }' />" />
+	</form>
 	<input id="msgGroupId" name="msgGroupId" type="hidden" value="${result.msgGroupId}"/>
 		<!-- send top -->
 	<div class="send_top">

 			<!--// 발송결과 상세 및 미리보기-->
 			<!-- 목록-->
 			<div class="btn_list_type1">
-				<button class="btnType btnType17">목록</button>
+				<button class="btnType btnType17" id="goPageBtn">목록</button>
 			</div>
 			<!--// 목록-->
 

5cfae19

da00ed6

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

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

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


 $(document).ready(function(){
 	
 	//초기 전체 리스트 페이지 보여주기
-	linkPage(1);
+	linkPage($('#searchForm #pageIndex').val());
+	
+	
+	fn_activateTab($('#searchForm #searchCondition01').val())
+	fn_setActiveTab($('#searchForm #searchCondition02').val())
+	
 	
 	var date = new Date() ;
 	//이전달 첫날/마지막날 조회

 		lastfuledday = lastfulstday + "/"+ new Date(date.getFullYear(), date.getMonth(), 0).getDate()+"" ;
 		lastfulstday += "/01" ;
 	}
+	console.log('lastfulstday: ', lastfulstday);
 	
 	//당월 첫날/마지막날 조회
 	thisfulstlday = date.getFullYear() + "/" ;
 	thisfulstlday += date.getMonth()+1 < 10  ? "0"+ (date.getMonth()+1) : date.getMonth()+1+"" ;
 	thisfuledtlday = thisfulstlday + "/"+ new Date(date.getFullYear(), date.getMonth()+1, 0).getDate()+"";
 	thisfulstlday += "/01" ;
+	console.log('thisfulstlday: ', thisfulstlday);
 	
 	//3개월 이전 날짜 구해오기
 	

 	$(document).on('click', '.sort', function (){
 		listSortOrd(this);
 	});
+	
+	
+	//  탭 :: 전체 , 즉시, 예약
+	$(document).on('click', '.sendKindBtn', function (){
+
+		// 클릭된 버튼의 data-info 값을 전달하여 함수 호출
+		fn_activateTab($(this).data('info'));
+		
+		linkPage(1);
+	});
+	
+	
+	
 
 	//목록 정렬 항목 클릭
 	function listSortOrd(obj){

 });
 
 
-	
+//탭 활성화 처리 함수
+function fn_activateTab(tabInfo) {
+	// 1. data-info 값을 가진 버튼 요소 찾기
+	var $button = $('.sendKindBtn[data-info="' + tabInfo + '"]');
+
+	// 2. 해당 버튼이 속한 탭 활성화 처리
+	$button.closest('ul').find('.tab').removeClass('active');
+	$button.closest('.tab').addClass('active');
+
+	// 3. hidden input 요소에 값 설정
+	$('#searchCondition01').val(tabInfo);
+}
 
 
 //캘린더에 날짜 입력해 주기

 }
 
 
-//검색 버튼 실행
+//페이지 이동 실행
 function linkPage(pageNo){
 	
 	var form = document.searchForm;
-	var stateType = form.stateType.value;
 	form.pageIndex.value = pageNo;
-	
+	console.log('form : ', form);
+
 	var sendData =  $(document.searchForm).serializeArray();
 	$(".msgSentAllLoad").html('<div class="list_info"><table class="tType4"><tbody><tr><td colspan="12">LOADING...</td></tr></tbody></table></div>');
 	$(".msgSentAllLoad").load("/web/mjon/msgsent/selectMsgSentListViewAjax.do", sendData ,function(response, status, xhr){

 		}
 	});
 	
-	if(msgId.length > 0){
+	console.log('msgId : ', msgId);
+	
+	if(msgId.length < 1){
+		alert("삭제할 문자를 선택해 주세요.");
+		return false;
+	}
 		
 		//22.04.25 구글 독스 alert 기준으로 이지우가 수정
 		/* if(confirm("선택한 발송문자를 삭제하시겠습니까? 삭제된 문자는 복구가 불가능 합니다.")) */
-		if(confirm("선택한 목록을 삭제하시겠습니까?")){
+		if(confirm("선택한 목록을 삭제하시겠습니까?\n삭제한 목록은 복구가 불가합니다.")){
 			
 			document.searchForm.msgGroupIdList.value = msgId;
 			var sendData =  $(document.searchForm).serializeArray();
 			
 			$(".msgSentAllLoad").load("/web/mjon/msgsent/deleteMsgSentDataAjax.do", sendData ,function(response, status, xhr){
 			});
-			
-// 			var form = document.searchForm;
-// 			form.action="/web/mjon/msgsent/selectMsgSentView.do";
-// 			form.submit();
+
+			alert("삭제되었습니다.");
+			var form = document.searchForm;
+			form.action="/web/mjon/msgsent/selectMsgSentView.do";
+			form.submit();
 		}
-		
-	}else{
-		
-		alert("삭제할 문자를 선택해 주세요.");
-		return false;
-		
-	}
-	
-}
-
-//상세보기 버튼 실행
-function fnRevDetailPop(msgGroupId, msgId, fileCnt){
-	document.resPopForm.msgGroupId.value = msgGroupId;
-	document.resPopForm.msgId.value = msgId;
-	var sendData =  $(document.resPopForm).serializeArray();
-	
-	var form = document.searchForm;
-	if (form.listType.value == "privateList") {
-		$("#msgSentDetailPopLoad").load("/web/mjon/msgsent/selectMsgSentDetailData2Ajax.do", sendData ,function(response, status, xhr){
-		});
-	}
-	else {
-		$("#msgSentDetailPopLoad").load("/web/mjon/msgsent/selectMsgSentDetailDataAjax.do", sendData ,function(response, status, xhr){
-		});		
-	}
-	
-}
-
-function fnListLoad(pageType, tabNum){
-	
-	var form = document.searchForm;
-	var $tab = $(".table_tab_wrap li").eq(tabNum); 	//
-	$tab.addClass("active");
-	$tab.find("button").attr("title", "선택됨");
-	$tab.siblings("li.tab").removeClass("active");
-	$tab.siblings("li.btn_tab").removeClass("active");
-	$tab.siblings("li.tab").find("button").removeAttr("title");
-	
-	if(pageType == 'all'){
-		
-		form.stateType.value = "all";
-		$(".tab_depth1").show();
-		
-	}else if(pageType == 'ready'){
-		
-		form.stateType.value = "ready";
-		$(".tab_depth1").show();
-		
-	}else if(pageType == 'complete'){
-		
-		form.stateType.value = "complete";
-		$(".tab_depth1").show();
-		
-	}else if(pageType == 'fail'){
-		form.listType.value = "privateList";
-		form.stateType.value = "fail";
-		$(".tab_depth1").hide();
-		
-	}
-	
-	/* if(pageType == 'fail'){//발송실패의 경우 모두 개인별 건수를 보여준다.
-		
-		form.listType.value = 'privateList';
-		
-	} */
-	
-	linkPage(1);
 	
 }
 
 // 전체/단문/장문/그림 탭 선택 처리
-function fnTabLoad(tabType, tabNum){
+function fnTabLoad(tabType){
+	
+	//즉시, 예약 탭은 전체로 바꿔야함
+	fn_activateTab('');
+
 	
 	var form = document.searchForm;
-	
-	form.tabType.value = tabType;
-	
-	//해당 탭의 전체 리스트 내역으로 불러오기
-	fnListLoad('all', '0');
-	var n=tabNum+1;
-	
-	//탭 선택 CSS 처리 
-	var $tab = $(".list_tab_wrap2 li:nth-child("+n+")"); 
-	var $tabPrev = $(".list_tab_wrap2 li:nth-child("+n+")").prev("li")
-	$tab.addClass("active");
-	$tab.find("button").attr("title", "선택됨");
-	$tab.siblings("li.tab").removeClass("active");
-	$tab.siblings("li.tab").find("button").removeAttr("title");
 
-	$tab.siblings("li:not(li:last-child)").find("button").css("border-right","1px solid #e5e5e5");
-	$tabPrev.find("button").css("border-right","0");
+	// 탭 선택 CSS 처리
+	fn_setActiveTab(tabType);
 	
+	linkPage(1);
 }
 
+//fnTabLoad 함수에 대한 탭 선택 CSS 처리 함수
+function fn_setActiveTab(tabType) {
+	var $tabs = $(".list_tab_wrap2 li"); // 전체 탭 리스트
+	$tabs.removeClass("active").find("button").removeAttr("title"); // 모든 탭 초기화
+
+	// tabType에 해당하는 탭 찾기
+	$tabs.each(function() {
+		var buttonText = $(this).find("button").text();
+		if ((tabType === '' && buttonText === "전체") ||
+			(tabType === 'S' && buttonText === "단문(SMS)") ||
+			(tabType === 'L' && buttonText === "장문(LMS)") ||
+			(tabType === 'M' && buttonText === "그림(MMS)")) {
+			$(this).addClass("active").find("button").attr("title", "선택됨");
+		}
+	});
+	
+	$('#searchCondition02').val(tabType);
+}
+
+
 function fnSearch(pageNo){
-	/* if(!fn_G_cmndataValueChk("startDate", "endDate", 3)){
+	/* if(!fn_G_cmndataValueChk("searchStartDate", "searchEndDate", 3)){
 		return;
 	}; */
+
+	fn_activateTab('')
+	fn_setActiveTab('')
 	
 	console.log('fnSearch')
 	var form = document.searchForm;

 function fnExcelDownLoad(pageType, tabType){
 	
 	var form = document.searchForm;
-	var loginVO = '${LoginVO}';
-	
-	form.stateType.value = pageType;
-	form.tabType.value = tabType;
-	
-	if(loginVO == "" || loginVO == null){
-		alert("로그인 후 이용이 가능합니다.");
-		return false;
-	}
 	
 	// 기간검색 유효성 검사
-	if ($("#startDate").val() == "" || $("#endDate").val() == "") {
-		alert("기간 설정을 먼저해주세요. 최근 3개월까지만 다운로드 가능합니다.")
-		return false; 
-	}
-	else {
-		if ($("#startDate").val() < prevMonth(3)) {
-			alert("최근 3개월까지만 다운로드 가능합니다.")
- 			return false; 			
-		}
-	}
 	
 	if(confirm("엑셀 다운로드를 하시겠습니까?")){
 		

 	
 }
 
-$(document).on('click', '.msgGgoupList', function(){
-	
-	var form = document.searchForm;
-	form.listType.value = "groupList";
-	linkPage(1);
-	
-});
-
-$(document).on('click', '.msgPrivateList', function(){
-	
-	var form = document.searchForm;
-	form.listType.value = "privateList";
-	linkPage(1);
-	
-});
 
 
 function fnDeleteAddrNo(listType){

 }
 
 
-/* 사용내역서 클릭 시 내역서 새창 팝업 오픈  */
+/* 사용내역서 클릭 시 내역서 새창 팝업 오픈  
 function fnShowPrintPopup(tabType, type) { 
 	//만들려는 팝업의 크기
 	var popup_wid = '840';

 	$("#searchForm").attr({"action":"/web/mjon/msgsent/printMsgSentDataAjax.do", "method":"post"}).submit();
 	
 }
-
+*/
 function addrGroupDuplCnt() {
 	document.searchForm.addrGrpNm.value = $('#grpNm').val();
 	

 }
 
 //발송결과 - 대기/성공/실패
-function subContent(p_content_no){	
+function subContent(){	
 	
-	var sendData =  $(document.listForm).serializeArray();
+	var sendData =  $(document.searchForm).serializeArray();
+	console.log('sendData :: ', sendData);
 	var v_html_pre	=	'<table>'
 			+	'<caption>구분, 충전금액, 사용금액, 잔액 등 정보를 제공하는 표</caption>'
 			+	'<colgroup>'

 					</div>
 				</div>--%>
 				<form id="searchForm" name="searchForm" method="post">
-					<input type="hidden" id="pageIndex" name="pageIndex" value="1"/>
+<!-- 					<input type="hidden" id="pageIndex" name="pageIndex" value="1"/> -->
+					<input type="hidden" id="pageIndex" name="pageIndex" value="<c:out value="${searchVO.pageIndex}" />" />
 					<input type="hidden" id="msgGroupIdList" name="msgGroupIdList" value=""/>
+					<input type="hidden" id="msgGroupId" name="msgGroupId" value=""/>
 					<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
 					<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
 					<input type="hidden" id="tabType" name="tabType" value="all"/><!-- 탭 종류 -->
 					<input type="hidden" id="stateType" name="stateType" value="all"/><!-- 발송상태 종류 -->
 					<input type="hidden" id="listType" name="listType" value="groupList"/><!-- 리스트 종류 -->
 					<input type="hidden" id="addrGrpNm" name="addrGrpNm" value=""/><!-- 주소록 그룹 이름 -->
-					<input type="hidden" id="mberId" name="mberId" value="${LoginVO.id}"/><!-- 주소록 그룹 이름 -->
+					<input type="hidden" id="mberId" name="mberId" value="${LoginVO.id}"/>
+					<input type="hidden" id="searchCondition01" name="searchCondition01" value="${searchVO.searchCondition01}"/>
+					<input type="hidden" id="searchCondition02" name="searchCondition02" value="${searchVO.searchCondition02}"/>
 				
 				
 					<div class="rev_content" id="tab5_1">

 								<div class="btn_left">
 									<span class="cal_label">기간선택</span>
 									<div class="calendar_wrap">
-										<input type="text" class="startDate inp calendar" title="검색 시작일" id="startDate" name="startDate" value="<c:out value='${mjonMsgSentVO.startDate}'/>" data-datecontrol="true">
+										<input type="text" class="searchStartDate inp calendar" title="검색 시작일" id="searchStartDate" name="searchStartDate" value="<c:out value='${mjonMsgSentVO.searchStartDate}'/>" data-datecontrol="true">
 										<span class="dateEtc">~</span>
-										<input type="text" class="endDate inp calendar" title="검색 종료일" id="endDate" name="endDate" value="<c:out value='${mjonMsgSentVO.endDate}'/>" data-datecontrol="true">
+										<input type="text" class="searchEndDate inp calendar" title="검색 종료일" id="searchEndDate" name="searchEndDate" value="<c:out value='${mjonMsgSentVO.searchEndDate}'/>" data-datecontrol="true">
 									</div>
-									<button type="button" onclick="setCalVal(lastfulstday,'startDate');setCalVal( lastfuledday,'endDate'); return false;"  class="btnType btnType19">전월</button>
-									<button type="button" onclick="setCalVal(thisfulstlday,'startDate');setCalVal( thisfuledtlday,'endDate'); return false;"  class="btnType btnType19">당월</button>
-									<button type="button" onclick="fn_G_getPrevMonth('startDate', 3);fn_G_getCurrDate('endDate'); return false;"  class="btnType btnType19">3개월</button>
+									<button type="button" onclick="setCalVal(lastfulstday,'searchStartDate');setCalVal( lastfuledday,'searchEndDate'); return false;"  class="btnType btnType19">전월</button>
+									<button type="button" onclick="setCalVal(thisfulstlday,'searchStartDate');setCalVal( thisfuledtlday,'searchEndDate'); return false;"  class="btnType btnType19">당월</button>
+									<button type="button" onclick="fn_G_getPrevMonth('searchStartDate', 3);fn_G_getCurrDate('searchEndDate'); return false;"  class="btnType btnType19">3개월</button>
 									<button type="button" class="btnType6" onClick="javascript:fnSearch(1); return false;">조회</button>
 								</div>
 								<div class="btn_right">
-									<%-- <label for="searchMsgType" class="label">문자형태 선택 == ${mjonMsgSentVO.searchMsgType}</label>
-									<select name="searchMsgType" id="searchMsgType" class="selType2">
-										<option value="">전체</option>
-										<option value="S" <c:if test="${mjonMsgSentVO.searchMsgType == 'S'}">selected</c:if> >단문</option>
-										<option value="L" <c:if test="${mjonMsgSentVO.searchMsgType == 'L'}">selected</c:if> >장문</option>
-										<option value="M" <c:if test="${mjonMsgSentVO.searchMsgType == 'M'}">selected</c:if> >그림</option>
-									</select> --%>
-									
-									<c:if test="${appMgmt }">
-									<label for="searchCondition_01" class="label">발신방식 == ${mjonMsgSentVO.searchCondition}</label>
-										<select name="searchCondition_01" id="searchCondition_01" class="selType2 select_all_btn">
-											<option value="" <c:if test="${empty mjonMsgSentVO.searchCondition_01 }">selected</c:if> >발송방식 전체</option>
-											<option value="H" <c:if test="${mjonMsgSentVO.searchCondition_01 == 'H'}">selected</c:if> >WEB</option>
-											<option value="A" <c:if test="${mjonMsgSentVO.searchCondition_01 == 'A'}">selected</c:if> >API</option>
-										</select>
-									</c:if>
-									<label for="searchCondition" class="label">발신번호 선택 == ${mjonMsgSentVO.searchCondition}</label>
+									<label for="searchCondition" class="label">검색 조건: ${mjonMsgSentVO.searchCondition == '2' ? '발신번호' : '문자내용'}</label>
 									<select name="searchCondition" id="searchCondition" class="selType2 select_btn">
 										<option value="2" <c:if test="${mjonMsgSentVO.searchCondition == '2'}">selected</c:if> >발신번호</option>
-										<option value="3" <c:if test="${mjonMsgSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option>
+										<option value="3" <c:if test="${mjonMsgSentVO.searchCondition == '3'}">selected</c:if> >문자내용</option>
 									</select>
 									<div class="search">
 										<label for="id" class="label"></label>

 						<div class="list_tab_wrap2 type4">
 							<!-- tab button -->
 							<ul class="list_tab">
-								<li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
-								<li class="tab"><button type="button" onclick="fnTabLoad('S',1); return false;">단문(SMS)</button></li>
-								<li class="tab"><button type="button" onclick="fnTabLoad('L',2); return false;">장문(LMS)</button></li>
-								<li class="tab"><button type="button" onclick="fnTabLoad('M',3); return false;">그림(MMS)</button></li>
+								<li class="tab active"><button type="button" onclick="fnTabLoad(''); return false;">전체</button></li>
+								<li class="tab"><button type="button" onclick="fnTabLoad('S'); return false;">단문(SMS)</button></li>
+								<li class="tab"><button type="button" onclick="fnTabLoad('L'); return false;">장문(LMS)</button></li>
+								<li class="tab"><button type="button" onclick="fnTabLoad('M'); return false;">그림(MMS)</button></li>
 							</ul><!--// tab button -->
 						</div>
 						<!-- 예약관리 > 전체 -->

 								
 								<!-- tab button -->
 								<ul>
-									<li class="tab active"><button type="button">전체</button></li>
-									<li class="tab"><button type="button">즉시</button></li>
-									<li class="tab"><button type="button">예약</button></li>
+										<li class="tab ${empty searchVO.searchCondition_01 ? 'active' : ''}">
+											<button type="button" class="sendKindBtn" data-info="">전체</button>
+										</li>
+										<li class="tab ${searchVO.searchCondition_01 == '0' ? 'active' : ''}">
+											<button type="button" class="sendKindBtn" data-info="N">즉시</button>
+										</li>
+										<li class="tab ${searchVO.searchCondition_01 == '1' ? 'active' : ''}">
+											<button type="button" class="sendKindBtn" data-info="Y">예약</button>
+										</li>
 								</ul>
 								<!--// tab button -->
 								

5cfae19

da00ed6

src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp

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


 
 </script>
 
-<div class="rev_admin_in">
+							<div class="rev_admin_in">
 								<div class="rev_admin_top clearfix">
 									<p>전체</p>
-									<c:set var="allTotal" value="${H_allSentCntVO.totCnt + A_allSentCntVO.totCnt }" />
+									<c:set var="allTotal" value="${H_smsSentCntVO.totCnt + H_lmsSentCntVO.totCnt + H_mmsSentCntVO.totCnt}" />
 									<p><span><fmt:formatNumber value="${allTotal }" pattern="#,###"/></span> 건</p>
 								</div>
-								<div class="rev_admin_btm admin_btm">
-									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+								<div class="rev_admin_btm">
+<%-- 									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P> --%>
 									<dl>
 										<dt>대기</dt>
 										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>

 										<dd><span class="c_e40000"><fmt:formatNumber value="${H_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
 									</dl>
 								</div>
-								<c:if test="${appMgmt }">
+								<%-- <c:if test="${appMgmt }">
 									<div class="rev_admin_btm admin_btm admin_btm_api">
 										<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
 										<dl>

 											<dd><span class="c_e40000"><fmt:formatNumber value="${A_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
 										</dl>
 									</div>	
-								</c:if>
+								</c:if> --%>
 							</div>
 							<div class="rev_admin_in">
 								<div class="rev_admin_top clearfix">
 									<p>단문(SMS)</p>
-									<c:set var="smsTotal" value="${H_smsSentCntVO.totCnt + A_smsSentCntVO.totCnt }" />
+									<c:set var="smsTotal" value="${H_smsSentCntVO.totCnt }" />
 									<p><span><fmt:formatNumber value="${smsTotal }" pattern="#,###"/></span> 건</p>
 								</div>
-								<div class="rev_admin_btm admin_btm">
-									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+								<div class="rev_admin_btm">
+<%-- 									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P> --%>
 									<dl>
 										<dt>대기</dt>
 										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_smsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>

 										<dd><span class="c_e40000"><fmt:formatNumber value="${H_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
 									</dl>
 								</div>
-								<c:if test="${appMgmt }">
+								<%-- <c:if test="${appMgmt }">
 									<div class="rev_admin_btm admin_btm admin_btm_api">
 										<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
 										<dl>

 											<dd><span class="c_e40000"><fmt:formatNumber value="${A_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
 										</dl>
 									</div>	
-								</c:if>
+								</c:if> --%>
 							</div>
 							<div class="rev_admin_in">
 								<div class="rev_admin_top clearfix">
 									<p>장문(LMS)</p>
-									<c:set var="lmsTotal" value="${H_lmsSentCntVO.totCnt + A_lmsSentCntVO.totCnt }" />
+									<c:set var="lmsTotal" value="${H_lmsSentCntVO.totCnt }" />
 									<p><span><fmt:formatNumber value="${lmsTotal }" pattern="#,###"/></span> 건</p>
 								</div>
-								<div class="rev_admin_btm admin_btm">
-									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+								<div class="rev_admin_btm">
+<%-- 									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P> --%>
 									<dl>
 										<dt>대기</dt>
 										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_lmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>

 										<dd><span class="c_e40000"><fmt:formatNumber value="${H_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
 									</dl>
 								</div>
-								<c:if test="${appMgmt }">
+								<%-- <c:if test="${appMgmt }">
 									<div class="rev_admin_btm admin_btm admin_btm_api">
 										<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
 										<dl>

 											<dd><span class="c_e40000"><fmt:formatNumber value="${A_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
 										</dl>
 									</div>	
-								</c:if>
+								</c:if> --%>
 							</div>
 							<div class="rev_admin_in">
 								<div class="rev_admin_top clearfix">
 									<p>그림(MMS)</p>
-									<c:set var="mmsTotal" value="${H_mmsSentCntVO.totCnt + A_mmsSentCntVO.totCnt }" />
+									<c:set var="mmsTotal" value="${H_mmsSentCntVO.totCnt }" />
 									<p><span><fmt:formatNumber value="${mmsTotal }" pattern="#,###"/></span> 건</p>
 								</div>
-								<div class="rev_admin_btm admin_btm">
-									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+								<div class="rev_admin_btm">
+<%-- 									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P> --%>
 									<dl>
 										<dt>대기</dt>
 										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_mmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>

 										<dd><span class="c_e40000"><fmt:formatNumber value="${H_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
 									</dl>
 								</div>
-								<c:if test="${appMgmt }">
+								<%-- <c:if test="${appMgmt }">
 									<div class="rev_admin_btm admin_btm admin_btm_api">
 										<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
 										<dl>

 											<dd><span class="c_e40000"><fmt:formatNumber value="${A_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
 										</dl>
 									</div>	
-								</c:if>
+								</c:if> --%>
 							</div>

Add a comment

Open 0
Closed 0

List

...	...	@@ -341,6 +341,7 @@
341	341	}
342	342
343	343	} catch (Exception e) {
	344	+ e.printStackTrace();
344	345	System.out.println("++++++++++++++++++++++ 예약문자 취소 deleteReservMsgCancelDataAjax Service Imple Error !!! " + e);
345	346	}
346	347

...	...	@@ -610,37 +610,43 @@
610	610
611	611	ModelAndView modelAndView = new ModelAndView();
612	612	modelAndView.setViewName("jsonView");
	613	+ try {
613	614
614		- //로그인 권한정보 불러오기
615		- LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
616		- String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
617		-
618		- if(!userId.equals("")) {
619		-
620		- mjonResvMsgVO.setUserId(userId);
621		-
622		- }else {
623		-
624		- modelAndView.addObject("message", "로그인 후 이용이 가능합니다.");
625		- modelAndView.addObject("result", "fail");
626		-
627		- return modelAndView;
628		-
629		- }
630		-
631		- // 디비에 문자 내용을 저장해 준다.
632		- int resultSts = mjonReservMsgService.deleteReservMsgCancelDataAjax(mjonResvMsgVO);
633		-
634		- if(resultSts > 0) {
	615	+ //로그인 권한정보 불러오기
	616	+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
	617	+ String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
	618	+
	619	+ if(!userId.equals("")) {
	620	+
	621	+ mjonResvMsgVO.setUserId(userId);
	622	+
	623	+ }else {
	624	+
	625	+ modelAndView.addObject("message", "로그인 후 이용이 가능합니다.");
	626	+ modelAndView.addObject("result", "fail");
	627	+
	628	+ return modelAndView;
	629	+
	630	+ }
	631	+
	632	+ // 디비에 문자 내용을 저장해 준다.
	633	+ int resultSts = mjonReservMsgService.deleteReservMsgCancelDataAjax(mjonResvMsgVO);
635	634
636		- modelAndView.addObject("message", "예약 발송이 정상적으로 취소 되었습니다.");
637		- modelAndView.addObject("result", "success");
	635	+ if(resultSts > 0) {
	636	+
	637	+ modelAndView.addObject("message", "예약 발송이 정상적으로 취소 되었습니다.");
	638	+ modelAndView.addObject("result", "success");
	639	+
	640	+ }else {
	641	+
	642	+ modelAndView.addObject("message", "예약 발송 취소 처리가 실패 되었습니다. 잠시 후 다시 시도해 주세요.");
	643	+ modelAndView.addObject("result", "fail");
	644	+
	645	+ }
638	646
639		- }else {
640		-
641		- modelAndView.addObject("message", "예약 발송 취소 처리가 실패 되었습니다. 잠시 후 다시 시도해 주세요.");
642		- modelAndView.addObject("result", "fail");
643		-
	647	+ } catch (Exception e) {
	648	+ e.printStackTrace();
	649	+ // TODO: handle exception
644	650	}
645	651
646	652	return modelAndView;

...	...	@@ -553,6 +553,9 @@
553	553	<div id="kopost_organization" class="orgCont"></div>
554	554	</div>
555	555	<div class="tbWrap">
	556	+ <div class="btnWrap">
	557	+ <input type="button" class="btnType1 bg_456ded main1_save_btn" value="저 장" onClick="fn_save_menuInfo(); return false;">
	558	+ </div>
556	559	<span class="tbTit" id="menuTopNm" >코드를 선택하세요</span>
557	560	<table class="tbType2">
558	561	<colgroup>

...	...	@@ -25,14 +25,14 @@
25	25
26	26	</script>
27	27
28		-<div class="rev_admin_in">
	28	+ <div class="rev_admin_in">
29	29	<div class="rev_admin_top clearfix">
30	30	<p>전체</p>
31		- <c:set var="allTotal" value="${H_allSentCntVO.totCnt + A_allSentCntVO.totCnt }" />
	31	+ <c:set var="allTotal" value="${H_smsSentCntVO.totCnt + H_lmsSentCntVO.totCnt + H_mmsSentCntVO.totCnt}" />
32	32	<p><span><fmt:formatNumber value="${allTotal }" pattern="#,###"/></span> 건</p>
33	33	</div>
34		- <div class="rev_admin_btm admin_btm">
35		- <P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
	34	+ <div class="rev_admin_btm">
	35	+<%-- <P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P> --%>
36	36	<dl>
37	37	<dt>대기</dt>
38	38	<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
...	...	@@ -46,7 +46,7 @@
46	46	<dd><span class="c_e40000"><fmt:formatNumber value="${H_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
47	47	</dl>
48	48	</div>
49		- <c:if test="${appMgmt }">
	49	+ <%-- <c:if test="${appMgmt }">
50	50	<div class="rev_admin_btm admin_btm admin_btm_api">
51	51	<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
52	52	<dl>
...	...	@@ -62,16 +62,16 @@
62	62	<dd><span class="c_e40000"><fmt:formatNumber value="${A_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
63	63	</dl>
64	64	</div>
65		- </c:if>
	65	+ </c:if> --%>
66	66	</div>
67	67	<div class="rev_admin_in">
68	68	<div class="rev_admin_top clearfix">
69	69	<p>단문(SMS)</p>
70		- <c:set var="smsTotal" value="${H_smsSentCntVO.totCnt + A_smsSentCntVO.totCnt }" />
	70	+ <c:set var="smsTotal" value="${H_smsSentCntVO.totCnt }" />
71	71	<p><span><fmt:formatNumber value="${smsTotal }" pattern="#,###"/></span> 건</p>
72	72	</div>
73		- <div class="rev_admin_btm admin_btm">
74		- <P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
	73	+ <div class="rev_admin_btm">
	74	+<%-- <P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P> --%>
75	75	<dl>
76	76	<dt>대기</dt>
77	77	<dd><span class="c_002c9a"><fmt:formatNumber value="${H_smsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
...	...	@@ -85,7 +85,7 @@
85	85	<dd><span class="c_e40000"><fmt:formatNumber value="${H_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
86	86	</dl>
87	87	</div>
88		- <c:if test="${appMgmt }">
	88	+ <%-- <c:if test="${appMgmt }">
89	89	<div class="rev_admin_btm admin_btm admin_btm_api">
90	90	<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
91	91	<dl>
...	...	@@ -101,16 +101,16 @@
101	101	<dd><span class="c_e40000"><fmt:formatNumber value="${A_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
102	102	</dl>
103	103	</div>
104		- </c:if>
	104	+ </c:if> --%>
105	105	</div>
106	106	<div class="rev_admin_in">
107	107	<div class="rev_admin_top clearfix">
108	108	<p>장문(LMS)</p>
109		- <c:set var="lmsTotal" value="${H_lmsSentCntVO.totCnt + A_lmsSentCntVO.totCnt }" />
	109	+ <c:set var="lmsTotal" value="${H_lmsSentCntVO.totCnt }" />
110	110	<p><span><fmt:formatNumber value="${lmsTotal }" pattern="#,###"/></span> 건</p>
111	111	</div>
112		- <div class="rev_admin_btm admin_btm">
113		- <P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
	112	+ <div class="rev_admin_btm">
	113	+<%-- <P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P> --%>
114	114	<dl>
115	115	<dt>대기</dt>
116	116	<dd><span class="c_002c9a"><fmt:formatNumber value="${H_lmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
...	...	@@ -124,7 +124,7 @@
124	124	<dd><span class="c_e40000"><fmt:formatNumber value="${H_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
125	125	</dl>
126	126	</div>
127		- <c:if test="${appMgmt }">
	127	+ <%-- <c:if test="${appMgmt }">
128	128	<div class="rev_admin_btm admin_btm admin_btm_api">
129	129	<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
130	130	<dl>
...	...	@@ -140,16 +140,16 @@
140	140	<dd><span class="c_e40000"><fmt:formatNumber value="${A_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
141	141	</dl>
142	142	</div>
143		- </c:if>
	143	+ </c:if> --%>
144	144	</div>
145	145	<div class="rev_admin_in">
146	146	<div class="rev_admin_top clearfix">
147	147	<p>그림(MMS)</p>
148		- <c:set var="mmsTotal" value="${H_mmsSentCntVO.totCnt + A_mmsSentCntVO.totCnt }" />
	148	+ <c:set var="mmsTotal" value="${H_mmsSentCntVO.totCnt }" />
149	149	<p><span><fmt:formatNumber value="${mmsTotal }" pattern="#,###"/></span> 건</p>
150	150	</div>
151		- <div class="rev_admin_btm admin_btm">
152		- <P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
	151	+ <div class="rev_admin_btm">
	152	+<%-- <P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P> --%>
153	153	<dl>
154	154	<dt>대기</dt>
155	155	<dd><span class="c_002c9a"><fmt:formatNumber value="${H_mmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
...	...	@@ -163,7 +163,7 @@
163	163	<dd><span class="c_e40000"><fmt:formatNumber value="${H_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
164	164	</dl>
165	165	</div>
166		- <c:if test="${appMgmt }">
	166	+ <%-- <c:if test="${appMgmt }">
167	167	<div class="rev_admin_btm admin_btm admin_btm_api">
168	168	<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
169	169	<dl>
...	...	@@ -179,5 +179,5 @@
179	179	<dd><span class="c_e40000"><fmt:formatNumber value="${A_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
180	180	</dl>
181	181	</div>
182		- </c:if>
	182	+ </c:if> --%>
183	183	</div> (No newline at end of file)

...	...	@@ -1,15 +1,15 @@
1	1	package itn.let.mjo.msgsent.service;
2	2
3		-import java.io.Serializable;
4	3	import java.util.List;
5	4
6	5	import itn.let.cmm.vo.FileInfoVO;
	6	+import itn.let.uss.umt.service.UserDefaultVO;
7	7	import lombok.Getter;
8	8	import lombok.Setter;
9	9
10	10	@Getter
11	11	@Setter
12		-public class MjonMsgDetailSentVO implements Serializable{
	12	+public class MjonMsgDetailSentVO extends UserDefaultVO{
13	13
14	14	private static final long serialVersionUID = 1L;
15	15
...	...	@@ -32,6 +32,7 @@
32	32
33	33	private String callTo;
34	34	private String statusTxt;
	35	+ private String addrNm;
35	36
36	37
37	38	// FileInfo 리스트 필드 추가

...	...	@@ -28,5 +28,6 @@
28	28	private int resultSValue; // 성공건수
29	29	private int resultFValue; // 실패건수
30	30	private int resultWValue; // 대기건수
	31	+ private String divideYN; // 분할여부
31	32
32	33	}

...	...	@@ -1,7 +1,10 @@
1	1	package itn.let.mjo.msgsent.service;
2	2
	3	+import java.io.IOException;
3	4	import java.util.List;
4	5	import java.util.Map;
	6	+
	7	+import javax.servlet.http.HttpServletResponse;
5	8
6	9	import itn.let.fax.addr.service.FaxAddrGroupVO;
7	10	import itn.let.mjo.addr.service.AddrGroupVO;
...	...	@@ -64,5 +67,7 @@
64	67
65	68	public List<MjonMsgDetailSentVO> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO);
66	69
	70	+ public void msgSentExcelDownLoad(MjonMsgSentVO mjonMsgSentVO, HttpServletResponse response) throws IOException, Exception;
	71	+
67	72
68	73	}

...	...	@@ -1,17 +1,37 @@
1	1	package itn.let.mjo.msgsent.service.impl;
2	2
	3	+import java.io.OutputStream;
3	4	import java.math.BigDecimal;
4	5	import java.math.RoundingMode;
	6	+import java.text.SimpleDateFormat;
5	7	import java.util.ArrayList;
	8	+import java.util.Date;
6	9	import java.util.HashMap;
7	10	import java.util.List;
	11	+import java.util.Locale;
8	12	import java.util.Map;
9	13	import java.util.regex.Matcher;
10	14	import java.util.regex.Pattern;
11	15
12	16	import javax.annotation.Resource;
	17	+import javax.servlet.http.HttpServletResponse;
13	18
14	19	import org.apache.commons.io.FilenameUtils;
	20	+import org.apache.commons.lang3.StringUtils;
	21	+import org.apache.poi.ss.usermodel.BorderStyle;
	22	+import org.apache.poi.ss.usermodel.Cell;
	23	+import org.apache.poi.ss.usermodel.CellStyle;
	24	+import org.apache.poi.ss.usermodel.FillPatternType;
	25	+import org.apache.poi.ss.usermodel.Font;
	26	+import org.apache.poi.ss.usermodel.HorizontalAlignment;
	27	+import org.apache.poi.ss.usermodel.IndexedColors;
	28	+import org.apache.poi.ss.usermodel.Row;
	29	+import org.apache.poi.ss.usermodel.Sheet;
	30	+import org.apache.poi.ss.usermodel.VerticalAlignment;
	31	+import org.apache.poi.ss.util.CellRangeAddress;
	32	+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
	33	+import org.apache.poi.xssf.usermodel.XSSFFont;
	34	+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
15	35	import org.springframework.stereotype.Service;
16	36
17	37	import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
...	...	@@ -96,41 +116,63 @@
96	116	return resultList;
97	117	}
98	118
99		- //발송 관리 전체 발송 리스트 불러오기
	119	+ /**
	120	+ * advc
	121	+ * 이호영 20250121
	122	+ * 발송 관리 전체 발송 리스트 불러오기
	123	+ */
100	124	public Map<String, Object> selectAllMsgSentList_advc(MjonMsgSentVO mjonMsgSentVO) throws Exception{
101	125
102	126
103	127	Map<String, Object> resultMap = new HashMap<String, Object>();
104	128
	129	+ System.out.println("mjonMsgSentVO.getSearchConditionSite() :: "+ mjonMsgSentVO.getSearchConditionSite());
	130	+
105	131	// 목록
106	132	List<MjonMsgSentVO> resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
107	133
108		- // MsgGroupId만 추출하여 리스트 생성
109		-// List<String> msgGroupIdList = resultList.stream()
110		-// .map(MjonMsgSentVO::getMsgGroupId) // MsgGroupId 추출
111		-// .collect(Collectors.toList()); // 리스트로 수집
	134	+ // groupID에 대한 결과건수(대기, 성공 실패) 분할건수를 가져옴
	135	+ // TODO : 분할여부는 예약일 때만 가져오게 해야되는지 검토 필요
112	136
113		-
114		- resultList.stream().forEach(t->{
115		- MjonMsgSWFDTO mjonMsgSWFDTO = mjonMsgSentDAO.findBySWF(t.getMsgGroupId());
116		- t.setResultSValue(String.valueOf(mjonMsgSWFDTO.getResultSValue()));
117		- t.setResultFValue(String.valueOf(mjonMsgSWFDTO.getResultFValue()));
118		- t.setResultWValue(String.valueOf(mjonMsgSWFDTO.getResultWValue()));
119		-
120		- BigDecimal eachPrice = new BigDecimal(t.getEachPrice());
121		- BigDecimal resultSValue = new BigDecimal(mjonMsgSWFDTO.getResultSValue());
122		- BigDecimal totalPrice = eachPrice.multiply(resultSValue);
123		- // 소수점 한 자리로 설정 (반올림)
124		- BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP);
125		- t.setTotPrice(roundedTotalPrice.toPlainString()); // 결과를 String으로 설정
126		- });
	137	+ resultList = makeDetailFunction(resultList);
127	138
	139	+ // 공통코드 ITN057에 대한 코드화 진행
	140	+ /*
	141	+ * CODE_ID CODE CODE_NM CODE_DC
	142	+ * ITN057 01 진행중 진행중
	143	+ * ITN057 02 완료 완료출해야함
	144	+ * ITN057 03 예약대기 예약대기(발송전) 버튼으로 노출해야함
	145	+ * ITN057 04 - 예약취소 ( - 으로 노출 )
	146	+ * */
	147	+ resultList.stream().forEach(t->{
	148	+
	149	+ String code;
	150	+
	151	+ log.info(" + t.getDiffMin() :: [{}]", t.getDiffMin());
	152	+ log.info(" + t.getDiffMin() :: [{}]", t.getDiffMin() > -5);
	153	+ if ("Y".equals(t.getReserveCYn())) {
	154	+ code = "04"; // 예약취소 코드
	155	+ } else if (
	156	+ "Y".equals(t.getReserveYn())
	157	+ && "N".equals(t.getReserveCYn())
	158	+ && t.getMsgGroupCnt().equals(t.getResultWValue())
	159	+ && t.getDiffMin() < -5 // 예약 시간이 5분 이상인 것들만
	160	+ ) {
	161	+ code = "03"; // 예약대기 코드 ( 예약취소 버튼 노출 )
	162	+ } else if (t.getMsgGroupCnt().equals(t.getResultSValue()) \|\| t.getMsgGroupCnt().equals(t.getResultFValue())) {
	163	+ code = "02"; // 완료 코드
	164	+ } else {
	165	+ code = "01"; // 진행중 코드
	166	+ }
	167	+
	168	+
	169	+ t.setStatusCd(code);
	170	+ });
128	171
129	172
130	173
131	174	// 총 카운트
132	175	int totalCnt = mjonMsgSentDAO.countAllMsgSentList(mjonMsgSentVO);
133		-// int totalCnt = 0;
134	176	resultMap.put("resultList", resultList);
135	177	resultMap.put("totalCnt", totalCnt);
136	178
...	...	@@ -138,6 +180,7 @@
138	180	return resultMap;
139	181	}
140	182
	183	+
141	184
142	185	public Map<String, Object> selectAllMsgSentDetailView(MjonMsgDetailSentVO mjonMsgDetailSentVO) throws Exception{
143	186
...	...	@@ -152,7 +195,7 @@
152	195	.replaceAll("\\s*무료거부 0808800858", ""));
153	196	}
154	197
155		- if(Integer.parseInt(result.getFileCnt()) > 0)
	198	+ if(StringUtils.isNotEmpty(result.getFileCnt()) && Integer.parseInt(result.getFileCnt()) > 0)
156	199	{
157	200
158	201	List<FileInfoVO> fileInfos = getFileInfo(result);
...	...	@@ -370,4 +413,286 @@
370	413
371	414	return list;
372	415	}
	416	+
	417	+ public void msgSentExcelDownLoad(MjonMsgSentVO mjonMsgSentVO, HttpServletResponse response) throws Exception{
	418	+
	419	+
	420	+ mjonMsgSentVO.setRecordCountPerPage(100000);
	421	+ mjonMsgSentVO.setFirstIndex(0);
	422	+
	423	+ if(StringUtils.isEmpty(mjonMsgSentVO.getSearchSortOrd())) {
	424	+ mjonMsgSentVO.setSearchSortOrd("desc");
	425	+ mjonMsgSentVO.setSearchSortCnd("B.REQ_DATE");
	426	+ }
	427	+
	428	+ //예약 관리 리스트 불러오기
	429	+ List<MjonMsgSentVO> resultAllSentList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
	430	+
	431	+ long startTime = System.nanoTime(); // 시작 시간 측정
	432	+ resultAllSentList = makeDetailFunction(resultAllSentList);
	433	+ long endTime = System.nanoTime(); // 끝난 시간 측정
	434	+ double executionTimeInSeconds = (endTime - startTime) / 1_000_000_000.0;
	435	+ System.out.println("Execution time: " + executionTimeInSeconds + " seconds");
	436	+
	437	+ SXSSFWorkbook workbook = null; // SXSSFWorkbook 변수 선언
	438	+ try{
	439	+
	440	+
	441	+ // Workbook 생성
	442	+ workbook = new SXSSFWorkbook();
	443	+ Sheet sheet = workbook.createSheet("발송 내역");
	444	+
	445	+ // 열 너비 설정
	446	+ sheet.setColumnWidth(0, 3000); // 번호 열
	447	+ sheet.setColumnWidth(1, 4000); // 발송일시 열
	448	+ sheet.setColumnWidth(2, 5000); // 구분 열
	449	+ sheet.setColumnWidth(3, 3000); // 형태 열
	450	+ sheet.setColumnWidth(4, 10000); // 내용 열
	451	+ sheet.setColumnWidth(5, 4000); // 발송건수 열
	452	+ sheet.setColumnWidth(6, 3000); // 대기 열
	453	+ sheet.setColumnWidth(7, 3000); // 성공 열
	454	+ sheet.setColumnWidth(8, 3000); // 실패 열
	455	+ sheet.setColumnWidth(9, 4000); // 금액 열
	456	+ sheet.setColumnWidth(10, 5000); // 진행상황 열
	457	+
	458	+ // 헤더 스타일 설정
	459	+ CellStyle headerStyle = workbook.createCellStyle();
	460	+ headerStyle.setAlignment(HorizontalAlignment.CENTER);
	461	+ headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
	462	+ headerStyle.setBorderTop(BorderStyle.THIN);
	463	+ headerStyle.setBorderBottom(BorderStyle.THIN);
	464	+ headerStyle.setBorderLeft(BorderStyle.THIN);
	465	+ headerStyle.setBorderRight(BorderStyle.THIN);
	466	+ headerStyle.setTopBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
	467	+ headerStyle.setBottomBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
	468	+ headerStyle.setLeftBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
	469	+ headerStyle.setRightBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
	470	+
	471	+ Font font = workbook.createFont();
	472	+ font.setBold(true); // 글씨체 굵게
	473	+ font.setFontHeightInPoints((short) 12); // 글씨 크기
	474	+ headerStyle.setFont(font);
	475	+
	476	+ // 데이터 스타일 설정 (가운데 정렬)
	477	+ CellStyle centerStyle = workbook.createCellStyle();
	478	+ centerStyle.setAlignment(HorizontalAlignment.CENTER);
	479	+ centerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
	480	+ centerStyle.setBorderTop(BorderStyle.THIN);
	481	+ centerStyle.setBorderBottom(BorderStyle.THIN);
	482	+ centerStyle.setBorderLeft(BorderStyle.THIN);
	483	+ centerStyle.setBorderRight(BorderStyle.THIN);
	484	+ centerStyle.setTopBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
	485	+ centerStyle.setBottomBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
	486	+ centerStyle.setLeftBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
	487	+ centerStyle.setRightBorderColor(IndexedColors.GREY_25_PERCENT.getIndex());
	488	+
	489	+ // 첫 번째 헤더 작성 (상단 병합)
	490	+ Row headerRow = sheet.createRow(0);
	491	+
	492	+ // 번호 열 추가
	493	+ Cell cell = headerRow.createCell(0);
	494	+ cell.setCellValue("번호");
	495	+ cell.setCellStyle(headerStyle);
	496	+ sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0)); // 번호 병합
	497	+
	498	+ // 구분 열 추가
	499	+ cell = headerRow.createCell(1);
	500	+ cell.setCellValue("발송일시");
	501	+ cell.setCellStyle(headerStyle);
	502	+ sheet.addMergedRegion(new CellRangeAddress(0, 1, 1, 1)); // 구분 병합
	503	+
	504	+ cell = headerRow.createCell(2);
	505	+ cell.setCellValue("구분");
	506	+ cell.setCellStyle(headerStyle);
	507	+ sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 2)); // 발송일시 병합
	508	+
	509	+ cell = headerRow.createCell(3);
	510	+ cell.setCellValue("형태");
	511	+ cell.setCellStyle(headerStyle);
	512	+ sheet.addMergedRegion(new CellRangeAddress(0, 1, 3, 3)); // 형태 병합
	513	+
	514	+ cell = headerRow.createCell(4);
	515	+ cell.setCellValue("내용");
	516	+ cell.setCellStyle(headerStyle);
	517	+ sheet.addMergedRegion(new CellRangeAddress(0, 1, 4, 4)); // 내용 병합
	518	+
	519	+ cell = headerRow.createCell(5);
	520	+ cell.setCellValue("발송건수");
	521	+ cell.setCellStyle(headerStyle);
	522	+ sheet.addMergedRegion(new CellRangeAddress(0, 1, 5, 5)); // 발송건수 병합
	523	+
	524	+ cell = headerRow.createCell(6);
	525	+ cell.setCellValue("결과");
	526	+ cell.setCellStyle(headerStyle);
	527	+ sheet.addMergedRegion(new CellRangeAddress(0, 0, 6, 8)); // 결과 병합
	528	+
	529	+ cell = headerRow.createCell(9);
	530	+ cell.setCellValue("금액(원)");
	531	+ cell.setCellStyle(headerStyle);
	532	+ sheet.addMergedRegion(new CellRangeAddress(0, 1, 9, 9)); // 금액(원) 병합
	533	+
	534	+ cell = headerRow.createCell(10);
	535	+ cell.setCellValue("진행상황");
	536	+ cell.setCellStyle(headerStyle);
	537	+ sheet.addMergedRegion(new CellRangeAddress(0, 1, 10, 10)); // 진행상황 병합
	538	+
	539	+ // 두 번째 헤더 작성 (결과 하위 열)
	540	+ Row subHeaderRow = sheet.createRow(1);
	541	+
	542	+ String[] subHeaders = {"대기", "성공", "실패"};
	543	+ for (int i = 0; i < subHeaders.length; i++) {
	544	+ cell = subHeaderRow.createCell(6 + i); // 결과 열 시작점(6번 열)부터 순차적으로 설정
	545	+ cell.setCellValue(subHeaders[i]);
	546	+ cell.setCellStyle(headerStyle);
	547	+ }
	548	+
	549	+ // 샘플 데이터 추가
	550	+ // Object[][] data = {
	551	+ // {1, "2025-01-23 12:00", "web", "SMS", "테스트 메시지입니다.", 139, 1, 0, 12, "-", "진행중"}
	552	+ // };
	553	+
	554	+
	555	+
	556	+
	557	+ // Object[][]로 변환
	558	+ Object[][] data = new Object[resultAllSentList.size()][11]; // 11은 필드 수
	559	+
	560	+ for (int i = 0; i < resultAllSentList.size(); i++) {
	561	+ MjonMsgSentVO vo = resultAllSentList.get(i);
	562	+ data[i][0] = i;
	563	+ data[i][1] = vo.getReqdate();
	564	+ data[i][2] = "H".equals(vo.getSendKind()) ? "WEB" : "API";
	565	+
	566	+ String msgType="단문";
	567	+ if ("6".equals(vo.getMsgType())) {
	568	+ msgType = "0".equals(vo.getFileCnt()) ? "장문" : "그림";
	569	+ }
	570	+ data[i][3] = msgType;
	571	+
	572	+ String reserveTxt = "";
	573	+ if("Y".equals(vo.getReserveYn())) {reserveTxt="[예약]";}
	574	+ if("Y".equals(vo.getDivideYN())) {reserveTxt+="[분할]";}
	575	+
	576	+ data[i][4] = reserveTxt + (StringUtils.isEmpty(vo.getSmsTxt()) ? "-" : vo.getSmsTxt());
	577	+ data[i][5] = vo.getMsgGroupCnt();
	578	+ data[i][6] = vo.getResultWValue();
	579	+ data[i][7] = vo.getResultSValue();
	580	+ data[i][8] = vo.getResultFValue();
	581	+ data[i][9] = vo.getTotPrice();
	582	+
	583	+ String statusTxt="진행중";
	584	+ if ("Y".equals(vo.getReserveCYn())) {
	585	+ statusTxt = "예약취소"; // 예약취소 코드
	586	+ // } else if ("Y".equals(vo.getReserveYn()) && vo.getMsgGroupCnt().equals(vo.getResultWValue())) {
	587	+ // statusTxt = "예약대기"; // 예약대기 코드 ( 예약취소 버튼 노출 )
	588	+ } else if (vo.getMsgGroupCnt().equals(vo.getResultSValue()) \|\| vo.getMsgGroupCnt().equals(vo.getResultFValue())) {
	589	+ statusTxt = "완료"; // 완료 코드
	590	+ }
	591	+
	592	+
	593	+
	594	+
	595	+ data[i][10] = statusTxt;
	596	+ }
	597	+
	598	+
	599	+
	600	+
	601	+ int rowNum = 2; // 데이터 시작 행
	602	+ for (Object[] rowData : data) {
	603	+ Row row = sheet.createRow(rowNum++);
	604	+ for (int col = 0; col < rowData.length; col++) {
	605	+ cell = row.createCell(col);
	606	+
	607	+ // "내용" 열만 제외하고 가운데 정렬
	608	+ if (col == 4) { // 내용 열
	609	+ cell.setCellValue((String) rowData[col]);
	610	+ } else if (rowData[col] instanceof String) {
	611	+ cell.setCellValue((String) rowData[col]);
	612	+ cell.setCellStyle(centerStyle);
	613	+ } else if (rowData[col] instanceof Integer) {
	614	+ cell.setCellValue((Integer) rowData[col]);
	615	+ cell.setCellStyle(centerStyle);
	616	+ }
	617	+ }
	618	+ }
	619	+
	620	+ // 파일 다운로드 응답 설정
	621	+ String fileName ="발송관리_엑셀_리스트"; // 저장 파일명
	622	+ SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat ( "yyyyMMdd_HHmmss", Locale.KOREA );
	623	+ Date currentTime = new Date ();
	624	+ String mTime = mSimpleDateFormat.format ( currentTime );
	625	+ fileName = fileName+"("+mTime+")";
	626	+
	627	+ response.setHeader("Set-Cookie", "fileDownload=true; path=/");
	628	+ response.setHeader("Content-Disposition", String.format("attachment; filename=\""+new String((fileName).getBytes("KSC5601"),"8859_1")+".xlsx"));
	629	+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
	630	+
	631	+ // 파일 출력
	632	+ workbook.write(response.getOutputStream());
	633	+ workbook.close();
	634	+
	635	+ } catch (Exception e) {
	636	+ // 에러 처리 로직
	637	+ response.setHeader("Set-Cookie", "fileDownload=false; path=/");
	638	+ response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
	639	+ response.setHeader("Content-Type", "text/html; charset=utf-8");
	640	+
	641	+ try (OutputStream out = response.getOutputStream()) {
	642	+ byte[] data = "fail..".getBytes();
	643	+ out.write(data, 0, data.length);
	644	+ } catch (Exception ignore) {
	645	+ ignore.printStackTrace();
	646	+ }
	647	+ } finally {
	648	+ if (workbook != null) {
	649	+ try {
	650	+ workbook.dispose(); // SXSSFWorkbook 임시 파일 제거
	651	+ workbook.close();
	652	+ } catch (Exception ignore) {
	653	+ ignore.printStackTrace();
	654	+ }
	655	+ }
	656	+ }
	657	+
	658	+ }
	659	+
	660	+
	661	+ private List<MjonMsgSentVO> makeDetailFunction(List<MjonMsgSentVO> resultList) {
	662	+ resultList.stream().forEach(t->{
	663	+ MjonMsgSWFDTO mjonMsgSWFDTO = mjonMsgSentDAO.findBySWF(t.getMsgGroupId());
	664	+ t.setResultSValue(String.valueOf(mjonMsgSWFDTO.getResultSValue())); // 성공건수
	665	+ t.setResultFValue(String.valueOf(mjonMsgSWFDTO.getResultFValue())); // 실패건수
	666	+ t.setResultWValue(String.valueOf(mjonMsgSWFDTO.getResultWValue())); // 대기건수
	667	+ t.setDivideYN(mjonMsgSWFDTO.getDivideYN());
	668	+
	669	+
	670	+ // TotPrice : 성공건수에 대한 금액 곱하기
	671	+ BigDecimal eachPrice = new BigDecimal(t.getEachPrice());
	672	+ BigDecimal resultSValue = new BigDecimal(mjonMsgSWFDTO.getResultSValue());
	673	+ BigDecimal totalPrice = eachPrice.multiply(resultSValue);
	674	+ // 소수점 한 자리로 설정 (반올림)// totalPrice 값을 소수점 한 자리까지 반올림하여 roundedTotalPrice에 저장
	675	+ // RoundingMode.HALF_UP: 반올림 방식으로, 소수점 기준 5 이상이면 올림, 그렇지 않으면 내림
	676	+ BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP);
	677	+
	678	+ // roundedTotalPrice가 0인지 확인
	679	+ // BigDecimal.compareTo(BigDecimal.ZERO)는 값을 비교하는 메서드
	680	+ // 결과:
	681	+ // - 반환 값이 0이면 두 값이 같음
	682	+ // - 반환 값이 음수이면 roundedTotalPrice가 0보다 작음
	683	+ // - 반환 값이 양수이면 roundedTotalPrice가 0보다 큼
	684	+ if (roundedTotalPrice.compareTo(BigDecimal.ZERO) == 0) {
	685	+ // roundedTotalPrice 값이 0이면, "-" 문자열을 totPrice에 설정
	686	+ t.setTotPrice("-");
	687	+ } else {
	688	+ // roundedTotalPrice 값이 0이 아닌 경우
	689	+ // 반올림된 BigDecimal 값을 toPlainString()을 사용하여 문자열로 변환 후 totPrice에 설정
	690	+ // toPlainString(): 지수 표기법 없이 일반적인 문자열 형태로 반환
	691	+ t.setTotPrice(roundedTotalPrice.toPlainString());
	692	+ }
	693	+ });
	694	+ return resultList;
	695	+ }
	696	+
	697	+
373	698	}

...	...	@@ -4,6 +4,9 @@
4	4
5	5	import org.apache.commons.lang3.builder.ToStringBuilder;
6	6
	7	+import lombok.Getter;
	8	+import lombok.Setter;
	9	+
7	10	/**
8	11	* 사용자정보 VO클래스로서일반회원, 기업회원, 업무사용자의 비지니스로직 처리시 기타조건성 항을 구성한다.
9	12	* @author 공통서비스 개발팀 조재영
...	...	@@ -21,6 +24,8 @@
21	24	*
22	25	* </pre>
23	26	*/
	27	+@Getter
	28	+@Setter
24	29	public class UserDefaultVO implements Serializable {
25	30
26	31	/**
...	...	@@ -34,9 +39,19 @@
34	39	/** 검색조건-성별 (0, M, F)*/
35	40	private String searchSexdstn = "0";
36	41
37		- /** 검색조건 */
	42	+ /**
	43	+ * 검색조건
	44	+ * 20250122 이호영
	45	+ * 개선은 검색조건을 아래 세개만 사용하려고 함
	46	+ * */
38	47	private String searchCondition ;
	48	+ private String searchCondition01 ;
	49	+ private String searchCondition02 ;
39	50
	51	+
	52	+
	53	+ /** 검색조건 - 기존 */
	54	+// private String searchCondition ;
40	55	private String searchCondition_01 ;
41	56
42	57	private String searchConditionSite ;
...	...	@@ -173,45 +188,6 @@
173	188
174	189	private String searchDeleteType;
175	190
176		- public String getSearchDeleteType() {
177		- return searchDeleteType;
178		- }
179		-
180		- public void setSearchDeleteType(String searchDeleteType) {
181		- this.searchDeleteType = searchDeleteType;
182		- }
183		-
184		- public String getSearchHotlineAgentCode() {
185		- return searchHotlineAgentCode;
186		- }
187		-
188		- public void setSearchHotlineAgentCode(String searchHotlineAgentCode) {
189		- this.searchHotlineAgentCode = searchHotlineAgentCode;
190		- }
191		-
192		- public String getSearchExceptSpamYn() {
193		- return searchExceptSpamYn;
194		- }
195		-
196		- public void setSearchExceptSpamYn(String searchExceptSpamYn) {
197		- this.searchExceptSpamYn = searchExceptSpamYn;
198		- }
199		-
200		- public String getSearchSmishingYn() {
201		- return searchSmishingYn;
202		- }
203		-
204		- public void setSearchSmishingYn(String searchSmishingYn) {
205		- this.searchSmishingYn = searchSmishingYn;
206		- }
207		-
208		- public String getSearchDeptPrePayment() {
209		- return searchDeptPrePayment;
210		- }
211		-
212		- public void setSearchDeptPrePayment(String searchDeptPrePayment) {
213		- this.searchDeptPrePayment = searchDeptPrePayment;
214		- }
215	191
216	192	private String searchAdminSmsNoticeYn;
217	193
...	...	@@ -224,570 +200,5 @@
224	200	private String searchThrDptCategoryCode; //3뎁스(하위카테고리) 검색
225	201
226	202
227		- public String getEditMode() {
228		- return editMode;
229		- }
230		-
231		- public void setEditMode(String editMode) {
232		- this.editMode = editMode;
233		- }
234		-
235		- public String getSearchSmsSalePrice() {
236		- return searchSmsSalePrice;
237		- }
238		-
239		- public void setSearchSmsSalePrice(String searchSmsSalePrice) {
240		- this.searchSmsSalePrice = searchSmsSalePrice;
241		- }
242		-
243		- public String getSearchAdminSmsNoticeYn() {
244		- return searchAdminSmsNoticeYn;
245		- }
246		-
247		- public void setSearchAdminSmsNoticeYn(String searchAdminSmsNoticeYn) {
248		- this.searchAdminSmsNoticeYn = searchAdminSmsNoticeYn;
249		- }
250		-
251		- public String getSearchDept() {
252		- return searchDept;
253		- }
254		-
255		- public void setSearchDept(String searchDept) {
256		- this.searchDept = searchDept;
257		- }
258		-
259		- public String getAuthorCode() {
260		- return authorCode;
261		- }
262		-
263		- public void setAuthorCode(String authorCode) {
264		- this.authorCode = authorCode;
265		- }
266		-
267		- public String getSearchCategoryCode() {
268		- return searchCategoryCode;
269		- }
270		-
271		- public void setSearchCategoryCode(String searchCategoryCode) {
272		- this.searchCategoryCode = searchCategoryCode;
273		- }
274		-
275		- public String getSearchKeywordFrom() {
276		- return searchKeywordFrom;
277		- }
278		-
279		- public void setSearchKeywordFrom(String searchKeywordFrom) {
280		- this.searchKeywordFrom = searchKeywordFrom;
281		- }
282		-
283		- public String getSearchKeywordTo() {
284		- return searchKeywordTo;
285		- }
286		-
287		- public void setSearchKeywordTo(String searchKeywordTo) {
288		- this.searchKeywordTo = searchKeywordTo;
289		- }
290		-
291		- public String getFrstRegistPnttm() {
292		- return frstRegistPnttm;
293		- }
294		-
295		- public void setFrstRegistPnttm(String frstRegistPnttm) {
296		- this.frstRegistPnttm = frstRegistPnttm;
297		- }
298		-
299		- public String getFrstRegisterId() {
300		- return frstRegisterId;
301		- }
302		-
303		- public void setFrstRegisterId(String frstRegisterId) {
304		- this.frstRegisterId = frstRegisterId;
305		- }
306		-
307		- public String getLastUpdtPnttm() {
308		- return lastUpdtPnttm;
309		- }
310		-
311		- public void setLastUpdtPnttm(String lastUpdtPnttm) {
312		- this.lastUpdtPnttm = lastUpdtPnttm;
313		- }
314		-
315		- public String getLastUpdusrId() {
316		- return lastUpdusrId;
317		- }
318		-
319		- public void setLastUpdusrId(String lastUpdusrId) {
320		- this.lastUpdusrId = lastUpdusrId;
321		- }
322		-
323		- public int getTotCnt() {
324		- return totCnt;
325		- }
326		-
327		- public void setTotCnt(int totCnt) {
328		- this.totCnt = totCnt;
329		- }
330		-
331		- public String getUserTotailCount() {
332		- return userTotailCount;
333		- }
334		-
335		- public void setUserTotailCount(String userTotailCount) {
336		- this.userTotailCount = userTotailCount;
337		- }
338		-
339		- public String getUserNewCount() {
340		- return userNewCount;
341		- }
342		-
343		- public void setUserNewCount(String userNewCount) {
344		- this.userNewCount = userNewCount;
345		- }
346		-
347		- public String getUserDeleteCount() {
348		- return userDeleteCount;
349		- }
350		-
351		- public void setUserDeleteCount(String userDeleteCount) {
352		- this.userDeleteCount = userDeleteCount;
353		- }
354		-
355		- public String getUserNewBlock() {
356		- return userNewBlock;
357		- }
358		-
359		- public void setUserNewBlock(String userNewBlock) {
360		- this.userNewBlock = userNewBlock;
361		- }
362		-
363		- public String getSnsSiteId() {
364		- return snsSiteId;
365		- }
366		-
367		- public void setSnsSiteId(String snsSiteId) {
368		- this.snsSiteId = snsSiteId;
369		- }
370		-
371		- public String getSnsSiteName() {
372		- return snsSiteName;
373		- }
374		-
375		- public void setSnsSiteName(String snsSiteName) {
376		- this.snsSiteName = snsSiteName;
377		- }
378		-
379		- public String getSnsSite() {
380		- return snsSite;
381		- }
382		-
383		- public void setSnsSite(String snsSite) {
384		- this.snsSite = snsSite;
385		- }
386		-
387		- public String getSnsId() {
388		- return snsId;
389		- }
390		-
391		- public void setSnsId(String snsId) {
392		- this.snsId = snsId;
393		- }
394		-
395		- public String getSnsEmail() {
396		- return snsEmail;
397		- }
398		-
399		- public void setSnsEmail(String snsEmail) {
400		- this.snsEmail = snsEmail;
401		- }
402		-
403		- public static long getSerialversionuid() {
404		- return serialVersionUID;
405		- }
406		-
407		- /**
408		- * sbscrbSttus attribute 값을 리턴한다.
409		- * @return String
410		- */
411		- public String getSbscrbSttus() {
412		- return sbscrbSttus;
413		- }
414		-
415		- /**
416		- * sbscrbSttus attribute 값을 설정한다.
417		- * @param sbscrbSttus String
418		- */
419		- public void setSbscrbSttus(String sbscrbSttus) {
420		- this.sbscrbSttus = sbscrbSttus;
421		- }
422		-
423		- /**
424		- * searchCondition attribute 값을 리턴한다.
425		- * @return String
426		- */
427		- public String getSearchCondition() {
428		- return searchCondition;
429		- }
430		-
431		- /**
432		- * searchCondition attribute 값을 설정한다.
433		- * @param searchCondition String
434		- */
435		- public void setSearchCondition(String searchCondition) {
436		- this.searchCondition = searchCondition;
437		- }
438		-
439		- /**
440		- * searchKeyword attribute 값을 리턴한다.
441		- * @return String
442		- */
443		- public String getSearchKeyword() {
444		- return searchKeyword;
445		- }
446		-
447		- /**
448		- * searchKeyword attribute 값을 설정한다.
449		- * @param searchKeyword String
450		- */
451		- public void setSearchKeyword(String searchKeyword) {
452		- this.searchKeyword = searchKeyword;
453		- }
454		-
455		- /**
456		- * searchUseYn attribute 값을 리턴한다.
457		- * @return String
458		- */
459		- public String getSearchUseYn() {
460		- return searchUseYn;
461		- }
462		-
463		- /**
464		- * searchUseYn attribute 값을 설정한다.
465		- * @param searchUseYn String
466		- */
467		- public void setSearchUseYn(String searchUseYn) {
468		- this.searchUseYn = searchUseYn;
469		- }
470		-
471		- /**
472		- * pageIndex attribute 값을 리턴한다.
473		- * @return int
474		- */
475		- public int getPageIndex() {
476		- return pageIndex;
477		- }
478		-
479		- /**
480		- * pageIndex attribute 값을 설정한다.
481		- * @param pageIndex int
482		- */
483		- public void setPageIndex(int pageIndex) {
484		- this.pageIndex = pageIndex;
485		- }
486		-
487		- /**
488		- * pageUnit attribute 값을 리턴한다.
489		- * @return int
490		- */
491		- public int getPageUnit() {
492		- return pageUnit;
493		- }
494		-
495		- /**
496		- * pageUnit attribute 값을 설정한다.
497		- * @param pageUnit int
498		- */
499		- public void setPageUnit(int pageUnit) {
500		- this.pageUnit = pageUnit;
501		- }
502		-
503		- /**
504		- * pageSize attribute 값을 리턴한다.
505		- * @return int
506		- */
507		- public int getPageSize() {
508		- return pageSize;
509		- }
510		-
511		- /**
512		- * pageSize attribute 값을 설정한다.
513		- * @param pageSize int
514		- */
515		- public void setPageSize(int pageSize) {
516		- this.pageSize = pageSize;
517		- }
518		-
519		- /**
520		- * firstIndex attribute 값을 리턴한다.
521		- * @return int
522		- */
523		- public int getFirstIndex() {
524		- return firstIndex;
525		- }
526		-
527		- /**
528		- * firstIndex attribute 값을 설정한다.
529		- * @param firstIndex int
530		- */
531		- public void setFirstIndex(int firstIndex) {
532		- this.firstIndex = firstIndex;
533		- }
534		-
535		- /**
536		- * lastIndex attribute 값을 리턴한다.
537		- * @return int
538		- */
539		- public int getLastIndex() {
540		- return lastIndex;
541		- }
542		-
543		- /**
544		- * lastIndex attribute 값을 설정한다.
545		- * @param lastIndex int
546		- */
547		- public void setLastIndex(int lastIndex) {
548		- this.lastIndex = lastIndex;
549		- }
550		-
551		- /**
552		- * recordCountPerPage attribute 값을 리턴한다.
553		- * @return int
554		- */
555		- public int getRecordCountPerPage() {
556		- return recordCountPerPage;
557		- }
558		-
559		- /**
560		- * recordCountPerPage attribute 값을 설정한다.
561		- * @param recordCountPerPage int
562		- */
563		- public void setRecordCountPerPage(int recordCountPerPage) {
564		- this.recordCountPerPage = recordCountPerPage;
565		- }
566		-
567		- /성별조건 검색/
568		- public String getSearchSexdstn() {
569		- return searchSexdstn;
570		- }
571		-
572		- public void setSearchSexdstn(String searchSexdstn) {
573		- this.searchSexdstn = searchSexdstn;
574		- }
575		-
576		- /**
577		- * toString 메소드를 대치한다.
578		- */
579		- public String toString() {
580		- return ToStringBuilder.reflectionToString(this);
581		- }
582		-
583		- public String getSiteId() {
584		- return siteId;
585		- }
586		-
587		- public void setSiteId(String siteId) {
588		- this.siteId = siteId;
589		- }
590		-
591		- public String getSearchConditionSite() {
592		- return searchConditionSite;
593		- }
594		-
595		- public void setSearchConditionSite(String searchConditionSite) {
596		- this.searchConditionSite = searchConditionSite;
597		- }
598		-
599		- public String getAdminYn() {
600		- return adminYn;
601		- }
602		-
603		- public void setAdminYn(String adminYn) {
604		- this.adminYn = adminYn;
605		- }
606		-
607		- public String getGnrlUser() {
608		- return gnrlUser;
609		- }
610		-
611		- public void setGnrlUser(String gnrlUser) {
612		- this.gnrlUser = gnrlUser;
613		- }
614		-
615		-
616		- public String getEmplyrSttusCode() {
617		- return emplyrSttusCode;
618		- }
619		-
620		- public void setEmplyrSttusCode(String emplyrSttusCode) {
621		- this.emplyrSttusCode = emplyrSttusCode;
622		- }
623		-
624		- public String[] getEsntlIdNsttusCode() {
625		- return esntlIdNsttusCode;
626		- }
627		-
628		- public void setEsntlIdNsttusCode(String[] esntlIdNsttusCode) {
629		- this.esntlIdNsttusCode = esntlIdNsttusCode;
630		- }
631		-
632		- public String getEmplyrId() {
633		- return emplyrId;
634		- }
635		-
636		- public void setEmplyrId(String emplyrId) {
637		- this.emplyrId = emplyrId;
638		- }
639		-
640		- public String getSearchCondition_01() {
641		- return searchCondition_01;
642		- }
643		-
644		- public void setSearchCondition_01(String searchCondition_01) {
645		- this.searchCondition_01 = searchCondition_01;
646		- }
647		-
648		- public String getSearchSortCnd() {
649		- return searchSortCnd;
650		- }
651		-
652		- public void setSearchSortCnd(String searchSortCnd) {
653		- this.searchSortCnd = searchSortCnd;
654		- }
655		-
656		- public String getSearchSortOrd() {
657		- return searchSortOrd;
658		- }
659		-
660		- public void setSearchSortOrd(String searchSortOrd) {
661		- this.searchSortOrd = searchSortOrd;
662		- }
663		-
664		- public String getNiceFailUrl() {
665		- return niceFailUrl;
666		- }
667		-
668		- public void setNiceFailUrl(String niceFailUrl) {
669		- this.niceFailUrl = niceFailUrl;
670		- }
671		-
672		- public String getNiceSuccUrl() {
673		- return niceSuccUrl;
674		- }
675		-
676		- public void setNiceSuccUrl(String niceSuccUrl) {
677		- this.niceSuccUrl = niceSuccUrl;
678		- }
679		-
680		- public boolean isMobile() {
681		- return isMobile;
682		- }
683		-
684		- public void setMobile(boolean isMobile) {
685		- this.isMobile = isMobile;
686		- }
687		-
688		- public String getNiceMessage() {
689		- return niceMessage;
690		- }
691		-
692		- public void setNiceMessage(String niceMessage) {
693		- this.niceMessage = niceMessage;
694		- }
695		-
696		- public String getNiceNm() {
697		- return niceNm;
698		- }
699		-
700		- public void setNiceNm(String niceNm) {
701		- this.niceNm = niceNm;
702		- }
703		-
704		- public String getMblDn() {
705		- return mblDn;
706		- }
707		-
708		- public void setMblDn(String mblDn) {
709		- this.mblDn = mblDn;
710		- }
711		-
712		- public String getMberSttus() {
713		- return mberSttus;
714		- }
715		-
716		- public void setMberSttus(String mberSttus) {
717		- this.mberSttus = mberSttus;
718		- }
719		-
720		- public String getSearchStartDate() {
721		- return searchStartDate;
722		- }
723		-
724		- public void setSearchStartDate(String searchStartDate) {
725		- this.searchStartDate = searchStartDate;
726		- }
727		-
728		- public String getSearchEndDate() {
729		- return searchEndDate;
730		- }
731		-
732		- public void setSearchEndDate(String searchEndDate) {
733		- this.searchEndDate = searchEndDate;
734		- }
735		-
736		- public String getCandidateYn() {
737		- return candidateYn;
738		- }
739		-
740		- public void setCandidateYn(String candidateYn) {
741		- this.candidateYn = candidateYn;
742		- }
743		-
744		- public String getSearchBestCategory() {
745		- return searchBestCategory;
746		- }
747		-
748		- public void setSearchBestCategory(String searchBestCategory) {
749		- this.searchBestCategory = searchBestCategory;
750		- }
751		-
752		- public String getSearchDiv() {
753		- return searchDiv;
754		- }
755		-
756		- public void setSearchDiv(String searchDiv) {
757		- this.searchDiv = searchDiv;
758		- }
759		-
760		- public String getSearchTwoDptCategoryCode() {
761		- return searchTwoDptCategoryCode;
762		- }
763		-
764		- public void setSearchTwoDptCategoryCode(String searchTwoDptCategoryCode) {
765		- this.searchTwoDptCategoryCode = searchTwoDptCategoryCode;
766		- }
767		-
768		- public String getSearchThrDptCategoryCode() {
769		- return searchThrDptCategoryCode;
770		- }
771		-
772		- public void setSearchThrDptCategoryCode(String searchThrDptCategoryCode) {
773		- this.searchThrDptCategoryCode = searchThrDptCategoryCode;
774		- }
775		-
776		- public String getSearchStartDate2() {
777		- return searchStartDate2;
778		- }
779		-
780		- public void setSearchStartDate2(String searchStartDate2) {
781		- this.searchStartDate2 = searchStartDate2;
782		- }
783		-
784		- public String getSearchEndDate2() {
785		- return searchEndDate2;
786		- }
787		-
788		- public void setSearchEndDate2(String searchEndDate2) {
789		- this.searchEndDate2 = searchEndDate2;
790		- }
791		-
792	203
793	204	}

...	...	@@ -48,8 +48,8 @@
48	48	,'01','00') AS tab2
49	49	, if (A.MSG_TYPE= '6' AND B.MSG_TYPE= '6' AND B.FILE_CNT > '0'
50	50	,'01','00') AS tab3
51		-
52	51	<include refid="MjonMsgSentDAO.selectJoinQuery"/>
	52	+
53	53	AND A.USER_ID = #userId#
54	54	AND B.USER_ID = #userId#
55	55	<isNotEmpty property="ntceBgnde">
...	...	@@ -62,10 +62,6 @@
62	62	<isEmpty property="msgType">
63	63	AND A.MSG_TYPE IN ('4','6')
64	64	</isEmpty>
65		- AND B.RESERVE_C_YN = 'N'
66		- <![CDATA[
67		- AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
68		- ]]>
69	65	<isNotEmpty property="fileCnt">
70	66	<isEqual property="fileCnt" compareValue="0">
71	67	AND B.FILE_CNT = '0'
...	...	@@ -73,6 +69,16 @@
73	69	<isNotEqual property="fileCnt" compareValue="0">
74	70	<![CDATA[ AND B.FILE_CNT > '0' ]]>
75	71	</isNotEqual>
	72	+ </isNotEmpty>
	73	+ <isNotEmpty property="searchStartDate">
	74	+ <![CDATA[
	75	+ AND DATE_FORMAT(B.REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
	76	+ ]]>
	77	+ </isNotEmpty>
	78	+ <isNotEmpty property="searchEndDate">
	79	+ <![CDATA[
	80	+ AND DATE_FORMAT(B.REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')
	81	+ ]]>
76	82	</isNotEmpty>
77	83	) A0
78	84	GROUP BY
...	...	@@ -236,25 +242,6 @@
236	242	WHERE (B.DEL_FLAG = 'N' OR B.DEL_FLAG IS NULL)
237	243	AND A.DEL_FLAG = 'N'
238	244	AND B.USER_ID = #userId#
239		- AND B.RESERVE_C_YN = 'N'
240		- <![CDATA[
241		- AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
242		- ]]>
243		- <isNotEmpty property="searchMsgType">
244		- <isEqual property="searchMsgType" compareValue="S">
245		- AND B.MSG_TYPE = '4'
246		- </isEqual>
247		- <isEqual property="searchMsgType" compareValue="L">
248		- AND B.MSG_TYPE = '6'
249		- AND B.FILE_CNT = '0'
250		- </isEqual>
251		- <isEqual property="searchMsgType" compareValue="M">
252		- <![CDATA[
253		- AND B.MSG_TYPE = '6'
254		- AND B.FILE_CNT > '0'
255		- ]]>
256		- </isEqual>
257		- </isNotEmpty>
258	245	<isNotEmpty property="searchKeyword">
259	246	<isEqual property="searchCondition" compareValue="1" >
260	247	AND B.SUBJECT LIKE CONCAT('%', #searchKeyword#, '%')
...	...	@@ -263,22 +250,37 @@
263	250	AND B.CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%')
264	251	</isEqual>
265	252	<isEqual property="searchCondition" compareValue="3" >
266		- AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
	253	+ AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
267	254	</isEqual>
268	255	</isNotEmpty>
269		- <isNotEmpty property="searchCondition_01">
270		- AND sendKind = #searchCondition_01#
	256	+ <isNotEmpty property="searchCondition01">
	257	+ AND B.RESERVE_YN = #searchCondition01#
271	258	</isNotEmpty>
272		- <isNotEmpty property="startDate">
273		- <![CDATA[
274		- AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
275		- ]]>
276		- </isNotEmpty>
277		- <isNotEmpty property="endDate">
278		- <![CDATA[
279		- AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
280		- ]]>
281		- </isNotEmpty>
	259	+ <isNotEmpty property="searchCondition02">
	260	+ <isEqual property="searchCondition02" compareValue="S">
	261	+ AND B.MSG_TYPE = '4'
	262	+ </isEqual>
	263	+ <isEqual property="searchCondition02" compareValue="L">
	264	+ AND B.MSG_TYPE = '6'
	265	+ AND B.FILE_CNT = '0'
	266	+ </isEqual>
	267	+ <isEqual property="searchCondition02" compareValue="M">
	268	+ <![CDATA[
	269	+ AND B.MSG_TYPE = '6'
	270	+ AND B.FILE_CNT > '0'
	271	+ ]]>
	272	+ </isEqual>
	273	+ </isNotEmpty>
	274	+ <isNotEmpty property="searchStartDate">
	275	+ <![CDATA[
	276	+ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
	277	+ ]]>
	278	+ </isNotEmpty>
	279	+ <isNotEmpty property="searchEndDate">
	280	+ <![CDATA[
	281	+ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')
	282	+ ]]>
	283	+ </isNotEmpty>
282	284	</select>
283	285
284	286
...	...	@@ -288,7 +290,11 @@
288	290	select
289	291	SUM(IF(aa.result = 'S', 1, 0)) AS resultSValue,
290	292	SUM(IF(aa.result = 'W', 1, 0)) AS resultWValue,
291		- SUM(IF(aa.result = 'F', 1, 0)) AS resultFValue
	293	+ SUM(IF(aa.result = 'F', 1, 0)) AS resultFValue,
	294	+ CASE
	295	+ WHEN COUNT(DISTINCT REQ_DATE) > 1 THEN 'Y'
	296	+ ELSE 'N'
	297	+ END AS divideYN
292	298	from
293	299	(
294	300	select
...	...	@@ -331,6 +337,7 @@
331	337	and A.RSLT_DATE is null ) then 'W'
332	338	else 'F'
333	339	end as result /* common query */
	340	+ , A.REQ_DATE
334	341	from
335	342	MJ_MSG_DATA A
336	343	where
...	...	@@ -401,8 +408,8 @@
401	408
402	409	<!-- 전체 발송결과 조회 (전송사별)-->
403	410	<select id="MjonMsgSentDAO.selectAllMsgSentList_advc" parameterClass="mjonMsgSentVO" resultClass="mjonMsgSentVO">
404		-
405		-SELECT
	411	+ /* MjonMsgSentDAO.selectAllMsgSentList_advc */
	412	+ SELECT
406	413	B.USER_ID as userId
407	414	, B.MSG_GROUP_ID as msgGroupId
408	415	, B.MSG_GROUP_CNT as msgGroupCnt
...	...	@@ -429,52 +436,48 @@
429	436	, B.MSG_KIND as msgKind
430	437	, B.DELAY_YN as delayYn
431	438	, B.DELAY_COMPLETE_YN as delayCompleteYn
	439	+ , B.RESERVE_YN as reserveYn
	440	+ , B.RESERVE_C_YN as reserveCYn
	441	+ , TIMESTAMPDIFF(minute, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) as diffMin
432	442	FROM MJ_MSG_DATA A
433	443	JOIN MJ_MSG_GROUP_DATA B ON A.MSG_GROUP_ID = B.MSG_GROUP_ID
434	444	WHERE (B.DEL_FLAG = 'N' OR B.DEL_FLAG IS NULL)
435	445	AND A.DEL_FLAG = 'N'
436		- AND B.RESERVE_C_YN = 'N'
437	446	AND B.USER_ID = #userId#
438		- <![CDATA[
439		- AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
440		- ]]>
441		- <isNotEmpty property="searchMsgType">
442		- <isEqual property="searchMsgType" compareValue="S">
443		- AND B.MSG_TYPE = '4'
444		- </isEqual>
445		- <isEqual property="searchMsgType" compareValue="L">
446		- AND B.MSG_TYPE = '6'
447		- AND B.FILE_CNT = '0'
448		- </isEqual>
449		- <isEqual property="searchMsgType" compareValue="M">
450		- <![CDATA[
451		- AND B.MSG_TYPE = '6'
452		- AND B.FILE_CNT > '0'
453		- ]]>
454		- </isEqual>
455		- </isNotEmpty>
456		- <isNotEmpty property="searchKeyword">
457		- <isEqual property="searchCondition" compareValue="1" >
458		- AND B.SUBJECT LIKE CONCAT('%', #searchKeyword#, '%')
459		- </isEqual>
460		- <isEqual property="searchCondition" compareValue="2" >
461		- AND B.CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%')
462		- </isEqual>
463		- <isEqual property="searchCondition" compareValue="3" >
464		- AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
465		- </isEqual>
466		- </isNotEmpty>
467		- <isNotEmpty property="searchCondition_01">
468		- AND sendKind = #searchCondition_01#
469		- </isNotEmpty>
470		- <isNotEmpty property="startDate">
	447	+ <isNotEmpty property="searchKeyword">
	448	+ <isEqual property="searchCondition" compareValue="2" >
	449	+ AND B.CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%')
	450	+ </isEqual>
	451	+ <isEqual property="searchCondition" compareValue="3" >
	452	+ AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
	453	+ </isEqual>
	454	+ </isNotEmpty>
	455	+ <isNotEmpty property="searchCondition01">
	456	+ AND B.RESERVE_YN = #searchCondition01#
	457	+ </isNotEmpty>
	458	+ <isNotEmpty property="searchCondition02">
	459	+ <isEqual property="searchCondition02" compareValue="S">
	460	+ AND B.MSG_TYPE = '4'
	461	+ </isEqual>
	462	+ <isEqual property="searchCondition02" compareValue="L">
	463	+ AND B.MSG_TYPE = '6'
	464	+ AND B.FILE_CNT = '0'
	465	+ </isEqual>
	466	+ <isEqual property="searchCondition02" compareValue="M">
	467	+ <![CDATA[
	468	+ AND B.MSG_TYPE = '6'
	469	+ AND B.FILE_CNT > '0'
	470	+ ]]>
	471	+ </isEqual>
	472	+ </isNotEmpty>
	473	+ <isNotEmpty property="searchStartDate">
471	474	<![CDATA[
472		- AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
	475	+ AND DATE_FORMAT(B.REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
473	476	]]>
474	477	</isNotEmpty>
475		- <isNotEmpty property="endDate">
	478	+ <isNotEmpty property="searchEndDate">
476	479	<![CDATA[
477		- AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
	480	+ AND DATE_FORMAT(B.REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')
478	481	]]>
479	482	</isNotEmpty>
480	483	GROUP BY B.MSG_GROUP_ID

...	...	@@ -3,19 +3,22 @@
3	3	<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
4	4	<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
5	5	<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
	6	+<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
6	7	<%@ page import="itn.com.cmm.LoginVO" %>
7	8	<script src="/publish/js/content.js"></script>
8	9	<script src="/publish/js/popupLayer.js"></script>
9	10	<script type="text/javascript">
10	11	$(document).ready(function(){
11		- var startDate = '${startDate}';
12		- var endDate = '${endDate}';
	12	+// var searchStartDate = '${searchStartDate}';
	13	+// console.log('searchStartDate : ', searchStartDate);
	14	+// var searchEndDate = '${searchEndDate}';
	15	+// console.log('searchEndDate : ', searchEndDate);
13	16
14		- // DatePicker 값 수정
15		- var startDatePicker = $('#startDate').pickadate('picker');
16		- startDatePicker.set('select', startDate, { format: 'yyyy/mm/dd' });
17		- startDatePicker = $('#endDate').pickadate('picker');
18		- startDatePicker.set('select', endDate, { format: 'yyyy/mm/dd' });
	17	+// // DatePicker 값 수정
	18	+// var startDatePicker = $('#searchStartDate').pickadate('picker');
	19	+// startDatePicker.set('select', searchStartDate, { format: 'yyyy/mm/dd' });
	20	+// startDatePicker = $('#searchEndDate').pickadate('picker');
	21	+// startDatePicker.set('select', searchEndDate, { format: 'yyyy/mm/dd' });
19	22
20	23
21	24	/* 목록 정렬 항목 아이콘 표시 */
...	...	@@ -63,14 +66,82 @@
63	66
64	67	function fn_sentDetailView(msgGroupId) {
65	68	// msgGroupId 값을 form에 설정
66		- $("#detailForm #msgGroupId").val(msgGroupId);
	69	+ $("#searchForm #msgGroupId").val(msgGroupId);
67	70
68	71	// form을 해당 URL로 제출
69		- $("#detailForm").attr("action", "/web/mjon/msgsent/msgSentDetailView.do");
70		- $("#detailForm").submit();
	72	+ $("#searchForm").attr("action", "/web/mjon/msgsent/msgSentDetailView.do");
	73	+ $("#searchForm").submit();
71	74	}
72	75
73	76
	77	+// function fnReservCancel(msgGroupId, agentCode, msgType){
	78	+function fnReservCancel(msgGroupId){
	79	+
	80	+ var form = document.resCancelForm;
	81	+ var loginVO = '${LoginVO}';
	82	+
	83	+ form.msgGroupId.value = msgGroupId;
	84	+// form.agentCode.value = agentCode;
	85	+// form.msgType.value = msgType;
	86	+
	87	+ if(loginVO == "" \|\| loginVO == null){
	88	+
	89	+ alert("로그인 후 이용이 가능합니다.");
	90	+ return false;
	91	+
	92	+ }
	93	+ console.log('msgGroupId : ', msgGroupId);
	94	+ var data = new FormData(form);
	95	+ url = "/web/mjon/reservmsg/deleteReservMsgCancelDataAjax.do";
	96	+
	97	+ if(confirm("정말 예약을 취소하시겠습니까?")){
	98	+
	99	+ $.ajax({
	100	+ type: "POST",
	101	+ url: url,
	102	+ data: data,
	103	+ dataType:'json',
	104	+ async: true,
	105	+ processData: false,
	106	+ contentType: false,
	107	+ cache: false,
	108	+ success: function (returnData, status) {
	109	+ if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
	110	+ if("fail"==returnData.result){
	111	+
	112	+ alert(returnData.message);
	113	+ return false;
	114	+ }
	115	+
	116	+// var smsCnt = returnData.resultSts;
	117	+
	118	+ alert("예약 발송이 정상적으로 취소 되었습니다.");
	119	+
	120	+ //예약 관리 리스트 다시 불러오기
	121	+ linkPage(1);
	122	+ //현황도 갱신 필요하여 새로고침으로 변경
	123	+// location.reload(true);
	124	+
	125	+ } else if(status== 'fail'){
	126	+ alert(returnData.message);
	127	+ }
	128	+ },
	129	+ error: function (e) {
	130	+ alert("예약 취소에 실패하였습니다."); console.log("ERROR : ", e);
	131	+ },
	132	+ beforeSend : function(xmlHttpRequest) {
	133	+ //로딩창 show
	134	+ $('.loading_layer').addClass('active');
	135	+ },
	136	+ complete : function(xhr, textStatus) {
	137	+ //로딩창 hide
	138	+ $('.loading_layer').removeClass('active');
	139	+ }
	140	+ });
	141	+
	142	+ }
	143	+
	144	+}
74	145
75	146
76	147	</script>
...	...	@@ -118,22 +189,7 @@
118	189	<input type="button" class="sort sortBtn" id="sort_orderByCode">
119	190	</div>
120	191	</th>
121		- <!-- <th>발송방식
122		- <div class="sort_wrap">
123		- <input type="button" class="sort sortBtn" id="sort_sendKind">
124		- </div>
125		- </th> -->
126	192	<th rowspan="2">내용</th>
127		- <!-- <th>받는사람
128		- <div class="sort_wrap">
129		- <input type="button" class="sort sortBtn" id="sort_callTo">
130		- </div>
131		- </th> -->
132		- <!-- <th>발신번호
133		- <div class="sort_wrap">
134		- <input type="button" class="sort sortBtn" id="sort_callFrom">
135		- </div>
136		- </th> -->
137	193	<th rowspan="2">
138	194	발송건수
139	195	<div class="sort_wrap">
...	...	@@ -154,51 +210,51 @@
154	210	<tbody>
155	211	<c:choose>
156	212	<c:when test="${not empty resultAllSentList}">
157		- <c:forEach var="resultAllSentList" items="${resultAllSentList}" varStatus="status">
	213	+ <c:forEach var="result" items="${resultAllSentList}" varStatus="status">
158	214	<tr>
159	215	<td>
160	216	<label for="msgSentDel${status.count}" class="label">선택</label>
161	217	<c:choose>
162		- <c:when test="${resultAllSentList.curState == '0'}">
163		- <input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${resultAllSentList.msgGroupId}" disabled>
	218	+ <c:when test="${result.curState == '0'}">
	219	+ <input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${result.msgGroupId}" disabled>
164	220	</c:when>
165	221	<c:when test="${mjonMsgSentVO.listType == 'groupList'}">
166		- <input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${resultAllSentList.msgGroupId}">
	222	+ <input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${result.msgGroupId}">
167	223	</c:when>
168	224	</c:choose>
169	225
170	226	</td>
171	227	<td>
172	228	<c:choose>
173		- <c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
	229	+ <c:when test="${result.delayYn eq 'Y' && result.delayCompleteYn eq 'N'}">
174	230
175	231	<c:choose>
176		- <c:when test="${resultAllSentList.curState eq '0'}">
	232	+ <c:when test="${result.curState eq '0'}">
177	233	<%--
178	234	20240906 추가
179	235	발송 대기 상태일 때만 원래 발송시간을 보여주고, 발송이 완료되면 발송 처리 완료 시간(reqDate)을 보여준다.
180	236	30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌
181	237	--%>
182		- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>
	238	+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.delayOrgTime}" /></p>
183	239	</c:when>
184	240	<c:otherwise>
185		- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
	241	+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" /></p>
186	242	</c:otherwise>
187	243	</c:choose>
188	244
189	245	</c:when>
190	246	<c:otherwise>
191		- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
	247	+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" /></p>
192	248	</c:otherwise>
193	249	</c:choose>
194	250	</td>
195	251	<td>
196	252	<p>
197	253	<c:choose>
198		- <c:when test="${resultAllSentList.msgType eq '6' && resultAllSentList.fileCnt eq 0 }">
	254	+ <c:when test="${result.msgType eq '6' && result.fileCnt eq 0 }">
199	255	장문
200	256	</c:when>
201		- <c:when test="${resultAllSentList.msgType eq '6' && resultAllSentList.fileCnt ne 0 }">
	257	+ <c:when test="${result.msgType eq '6' && result.fileCnt ne 0 }">
202	258	그림
203	259	</c:when>
204	260	<c:otherwise>
...	...	@@ -208,34 +264,45 @@
208	264	</p>
209	265	</td>
210	266	<td class="result_cont">
211		-<%-- <a href="#none" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;"> --%>
212		-<%-- <button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button> --%>
213		-
214	267	<div class="icon_wrap">
215		- <span class="re">예약</span>
216		- <span class="di">분할</span>
217		- <a href="#none"onclick="fn_sentDetailView('${resultAllSentList.msgGroupId}')">
218		- <c:out value="${resultAllSentList.smsTxt}" />
	268	+ <c:if test="${result.reserveYn eq 'Y'}">
	269	+ <span class="re">예약</span>
	270	+ <!-- 예약일때만 분할이 있음 -->
	271	+ <c:if test="${result.divideYN eq 'Y'}">
	272	+ <span class="di">분할</span>
	273	+ </c:if>
	274	+ </c:if>
	275	+ <a href="#none"onclick="fn_sentDetailView('${result.msgGroupId}')">
	276	+ <c:out value="${result.smsTxt}" />
219	277	</a>
220	278	</div>
221	279	</td>
222	280	<td>
223		- <p><c:out value="${resultAllSentList.msgGroupCnt}"/> </p>
	281	+ <p><c:out value="${result.msgGroupCnt}"/> </p>
224	282	</td>
225	283	<td>
226		- <p><c:out value="${resultAllSentList.resultWValue}"/> </p>
	284	+ <p><c:out value="${result.resultWValue}"/> </p>
227	285	</td>
228	286	<td>
229		- <p class="c_002c9a"><c:out value="${resultAllSentList.resultSValue}"/> </p>
	287	+ <p class="c_002c9a"><c:out value="${result.resultSValue}"/> </p>
230	288	</td>
231	289	<td>
232		- <p class="c_e40000"><c:out value="${resultAllSentList.resultFValue}"/> </p>
	290	+ <p class="c_e40000"><c:out value="${result.resultFValue}"/> </p>
233	291	</td>
234	292	<td>
235		- <c:out value="${resultAllSentList.totPrice}"/>원
	293	+ <c:out value="${result.totPrice}"/>
236	294	</td>
237	295	<td>
238		- <p><button class="btnType btnType20">예약취소</button></p>
	296	+ <c:choose>
	297	+ <c:when test="${result.statusCd ne '03' }">
	298	+ <ec:code codeId="ITN057" code="${result.statusCd }" />
	299	+ </c:when>
	300	+ <c:otherwise>
	301	+ <p><button class="btnType btnType20" onClick="javascript:fnReservCancel('${result.msgGroupId}'); return false;">예약취소</button></p>
	302	+ </c:otherwise>
	303	+ </c:choose>
	304	+
	305	+ <!-- -->
239	306	</td>
240	307
241	308
...	...	@@ -244,7 +311,7 @@
244	311	</c:when>
245	312	<c:otherwise>
246	313	<tr>
247		- <td colspan="11">발송 내역이 없습니다.</td>
	314	+ <td colspan="10">발송 내역이 없습니다.</td>
248	315	</tr>
249	316	</c:otherwise>
250	317	</c:choose>
...	...	@@ -254,14 +321,14 @@
254	321	<div class="table_btn clearfix">
255	322	<div class="table_btn_left">
256	323	<!-- 2022.07.04 발송결과 화면에 리스트 선택삭제 기능 제거(카운팅 및 금액 합산 오류 관련) -->
257		-<!-- <button type="button" class="btnType btnType15" onClick="javascript:fnDelete(); return false;"><i class="remove_img"></i>선택삭제</button> -->
258		- <button type="button" data-tooltip="rev_popup02" class="btnType btnType15"><i class="add_img"></i>그룹등록</button>
259		- <button type="button" class="btnType btnType15" onClick="javascript:fnDeleteAddrNo('${mjonMsgSentVO.listType}'); return false;"><i class="remove_img"></i>주소록에서 번호 삭제</button>
260		- <button type="button" class="btnType btnType15" onClick="javascript:fnAddBlockNo('${mjonMsgSentVO.listType}'); return false;"></i>수신거부번호 등록</button>
	324	+ <button type="button" class="btnType btnType15" onClick="javascript:fnDelete(); return false;"><i class="remove_img"></i>선택삭제</button>
	325	+<!-- <button type="button" data-tooltip="rev_popup02" class="btnType btnType15"><i class="add_img"></i>그룹등록</button> -->
	326	+<%-- <button type="button" class="btnType btnType15" onClick="javascript:fnDeleteAddrNo('${mjonMsgSentVO.listType}'); return false;"><i class="remove_img"></i>주소록에서 번호 삭제</button> --%>
	327	+<%-- <button type="button" class="btnType btnType15" onClick="javascript:fnAddBlockNo('${mjonMsgSentVO.listType}'); return false;"></i>수신거부번호 등록</button> --%>
261	328	</div>
262	329	<div class="table_btn_right">
263		- <button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad('all','${mjonMsgSentVO.tabType}'); return false;"><i class="downroad"></i>엑셀 다운로드</button>
264		- <button type="button" class="print_btn btnType" onClick="javascript:fnShowPrintPopup('all','${mjonMsgSentVO.tabType}'); return false;"><i class="print_img"></i>발송결과 출력하기</button>
	330	+ <button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad(); return false;"><i class="downroad"></i>엑셀 다운로드</button>
	331	+<%-- <button type="button" class="print_btn btnType" onClick="javascript:fnShowPrintPopup('all','${mjonMsgSentVO.tabType}'); return false;"><i class="print_img"></i>발송결과 출력하기</button> --%>
265	332	</div>
266	333	</div>
267	334	<c:if test="${!empty resultAllSentList}">
...	...	@@ -273,3 +340,10 @@
273	340	<form name="detailForm" id="detailForm" method="post">
274	341	<input type="hidden" name="msgGroupId" id="msgGroupId" value=""/>
275	342	</form>
	343	+
	344	+
	345	+ <form id="resCancelForm" name="resCancelForm" method="post">
	346	+ <input type="hidden" id="msgGroupId" name="msgGroupId" value=""/>
	347	+<!-- <input type="hidden" id="agentCode" name="agentCode" value=""/> -->
	348	+<!-- <input type="hidden" id="msgType" name="msgType" value=""/> -->
	349	+ </form>

...	...	@@ -16,7 +16,7 @@
16	16	$tbDtailList = new Tabulator("#detailPopup", {
17	17	height: "255px",
18	18	width: "20%",
19		- layout: "fitColumns",
	19	+ layout: "fitDataStretch", // 데이터가 너비에 맞게 늘어나도록 설정
20	20	autoColumns: false,
21	21	headerHozAlign: "center",
22	22	validationMode: "highlight",
...	...	@@ -24,6 +24,13 @@
24	24	clipboardCopySelector: "table",
25	25	clipboardPasteAction: "insert", // insert, update, replace
26	26	columns: [
	27	+ {
	28	+ title: "이름",
	29	+ field: "addrNm",
	30	+ hozAlign: "center",
	31	+ headerHozAlign: "center",
	32	+ width: 140
	33	+ },
27	34	{
28	35	title: "휴대폰",
29	36	field: "phone",
...	...	@@ -43,12 +50,17 @@
43	50
44	51	fn_getDetailList();
45	52
46		- /*
47		-
48	53
49	54
	55	+ $('#goPageBtn').click(function(){
	56	+ $("#goList").submit();
	57	+ });
50	58
51		- */
	59	+
	60	+
	61	+
	62	+
	63	+
52	64
53	65	});
54	66
...	...	@@ -90,6 +102,7 @@
90	102	data.forEach((row, index) => {
91	103
92	104	resultData.push({
	105	+ // addrNm: row.addrNm, // 폰번호
93	106	phone: row.callTo, // 폰번호
94	107	result: row.statusTxt // 결과 메시지 추가
95	108	});
...	...	@@ -106,6 +119,17 @@
106	119
107	120	</script>
108	121	<div class="inner">
	122	+ <form id="goList" name="goList" method="post" action="/web/mjon/msgsent/selectMsgSentView.do">
	123	+ <input type="hidden" name="pageIndex" value="<c:out value="${searchVO.pageIndex}" />" />
	124	+ <input type="hidden" name="searchSortCnd" value="<c:out value='${searchVO.searchSortCnd }' />" />
	125	+ <input type="hidden" name="searchSortOrd" value="<c:out value='${searchVO.searchSortOrd }' />" />
	126	+ <input type="hidden" name="searchCondition01" value="<c:out value='${searchVO.searchCondition01 }' />" />
	127	+ <input type="hidden" name="searchCondition02" value="<c:out value='${searchVO.searchCondition02 }' />" />
	128	+ <input type="hidden" name="searchStartDate" value="<c:out value='${searchVO.searchStartDate }' />" />
	129	+ <input type="hidden" name="searchEndDate" value="<c:out value='${searchVO.searchEndDate }' />" />
	130	+ <input type="hidden" name="searchCondition" value="<c:out value='${searchVO.searchCondition }' />" />
	131	+ <input type="hidden" name="searchKeyword" value="<c:out value='${searchVO.searchKeyword }' />" />
	132	+ </form>
109	133	<input id="msgGroupId" name="msgGroupId" type="hidden" value="${result.msgGroupId}"/>
110	134	<!-- send top -->
111	135	<div class="send_top">
...	...	@@ -290,7 +314,7 @@
290	314	<!--// 발송결과 상세 및 미리보기-->
291	315	<!-- 목록-->
292	316	<div class="btn_list_type1">
293		- <button class="btnType btnType17">목록</button>
	317	+ <button class="btnType btnType17" id="goPageBtn">목록</button>
294	318	</div>
295	319	<!--// 목록-->
296	320

...	...	@@ -15,7 +15,12 @@
15	15	$(document).ready(function(){
16	16
17	17	//초기 전체 리스트 페이지 보여주기
18		- linkPage(1);
	18	+ linkPage($('#searchForm #pageIndex').val());
	19	+
	20	+
	21	+ fn_activateTab($('#searchForm #searchCondition01').val())
	22	+ fn_setActiveTab($('#searchForm #searchCondition02').val())
	23	+
19	24
20	25	var date = new Date() ;
21	26	//이전달 첫날/마지막날 조회
...	...	@@ -28,12 +33,14 @@
28	33	lastfuledday = lastfulstday + "/"+ new Date(date.getFullYear(), date.getMonth(), 0).getDate()+"" ;
29	34	lastfulstday += "/01" ;
30	35	}
	36	+ console.log('lastfulstday: ', lastfulstday);
31	37
32	38	//당월 첫날/마지막날 조회
33	39	thisfulstlday = date.getFullYear() + "/" ;
34	40	thisfulstlday += date.getMonth()+1 < 10 ? "0"+ (date.getMonth()+1) : date.getMonth()+1+"" ;
35	41	thisfuledtlday = thisfulstlday + "/"+ new Date(date.getFullYear(), date.getMonth()+1, 0).getDate()+"";
36	42	thisfulstlday += "/01" ;
	43	+ console.log('thisfulstlday: ', thisfulstlday);
37	44
38	45	//3개월 이전 날짜 구해오기
39	46
...	...	@@ -55,6 +62,19 @@
55	62	$(document).on('click', '.sort', function (){
56	63	listSortOrd(this);
57	64	});
	65	+
	66	+
	67	+ // 탭 :: 전체 , 즉시, 예약
	68	+ $(document).on('click', '.sendKindBtn', function (){
	69	+
	70	+ // 클릭된 버튼의 data-info 값을 전달하여 함수 호출
	71	+ fn_activateTab($(this).data('info'));
	72	+
	73	+ linkPage(1);
	74	+ });
	75	+
	76	+
	77	+
58	78
59	79	//목록 정렬 항목 클릭
60	80	function listSortOrd(obj){
...	...	@@ -98,7 +118,18 @@
98	118	});
99	119
100	120
101		-
	121	+//탭 활성화 처리 함수
	122	+function fn_activateTab(tabInfo) {
	123	+ // 1. data-info 값을 가진 버튼 요소 찾기
	124	+ var $button = $('.sendKindBtn[data-info="' + tabInfo + '"]');
	125	+
	126	+ // 2. 해당 버튼이 속한 탭 활성화 처리
	127	+ $button.closest('ul').find('.tab').removeClass('active');
	128	+ $button.closest('.tab').addClass('active');
	129	+
	130	+ // 3. hidden input 요소에 값 설정
	131	+ $('#searchCondition01').val(tabInfo);
	132	+}
102	133
103	134
104	135	//캘린더에 날짜 입력해 주기
...	...	@@ -107,13 +138,13 @@
107	138	}
108	139
109	140
110		-//검색 버튼 실행
	141	+//페이지 이동 실행
111	142	function linkPage(pageNo){
112	143
113	144	var form = document.searchForm;
114		- var stateType = form.stateType.value;
115	145	form.pageIndex.value = pageNo;
116		-
	146	+ console.log('form : ', form);
	147	+
117	148	var sendData = $(document.searchForm).serializeArray();
118	149	$(".msgSentAllLoad").html('<div class="list_info"><table class="tType4"><tbody><tr><td colspan="12">LOADING...</td></tr></tbody></table></div>');
119	150	$(".msgSentAllLoad").load("/web/mjon/msgsent/selectMsgSentListViewAjax.do", sendData ,function(response, status, xhr){
...	...	@@ -137,120 +168,73 @@
137	168	}
138	169	});
139	170
140		- if(msgId.length > 0){
	171	+ console.log('msgId : ', msgId);
	172	+
	173	+ if(msgId.length < 1){
	174	+ alert("삭제할 문자를 선택해 주세요.");
	175	+ return false;
	176	+ }
141	177
142	178	//22.04.25 구글 독스 alert 기준으로 이지우가 수정
143	179	/* if(confirm("선택한 발송문자를 삭제하시겠습니까? 삭제된 문자는 복구가 불가능 합니다.")) */
144		- if(confirm("선택한 목록을 삭제하시겠습니까?")){
	180	+ if(confirm("선택한 목록을 삭제하시겠습니까?\n삭제한 목록은 복구가 불가합니다.")){
145	181
146	182	document.searchForm.msgGroupIdList.value = msgId;
147	183	var sendData = $(document.searchForm).serializeArray();
148	184
149	185	$(".msgSentAllLoad").load("/web/mjon/msgsent/deleteMsgSentDataAjax.do", sendData ,function(response, status, xhr){
150	186	});
151		-
152		-// var form = document.searchForm;
153		-// form.action="/web/mjon/msgsent/selectMsgSentView.do";
154		-// form.submit();
	187	+
	188	+ alert("삭제되었습니다.");
	189	+ var form = document.searchForm;
	190	+ form.action="/web/mjon/msgsent/selectMsgSentView.do";
	191	+ form.submit();
155	192	}
156		-
157		- }else{
158		-
159		- alert("삭제할 문자를 선택해 주세요.");
160		- return false;
161		-
162		- }
163		-
164		-}
165		-
166		-//상세보기 버튼 실행
167		-function fnRevDetailPop(msgGroupId, msgId, fileCnt){
168		- document.resPopForm.msgGroupId.value = msgGroupId;
169		- document.resPopForm.msgId.value = msgId;
170		- var sendData = $(document.resPopForm).serializeArray();
171		-
172		- var form = document.searchForm;
173		- if (form.listType.value == "privateList") {
174		- $("#msgSentDetailPopLoad").load("/web/mjon/msgsent/selectMsgSentDetailData2Ajax.do", sendData ,function(response, status, xhr){
175		- });
176		- }
177		- else {
178		- $("#msgSentDetailPopLoad").load("/web/mjon/msgsent/selectMsgSentDetailDataAjax.do", sendData ,function(response, status, xhr){
179		- });
180		- }
181		-
182		-}
183		-
184		-function fnListLoad(pageType, tabNum){
185		-
186		- var form = document.searchForm;
187		- var $tab = $(".table_tab_wrap li").eq(tabNum); //
188		- $tab.addClass("active");
189		- $tab.find("button").attr("title", "선택됨");
190		- $tab.siblings("li.tab").removeClass("active");
191		- $tab.siblings("li.btn_tab").removeClass("active");
192		- $tab.siblings("li.tab").find("button").removeAttr("title");
193		-
194		- if(pageType == 'all'){
195		-
196		- form.stateType.value = "all";
197		- $(".tab_depth1").show();
198		-
199		- }else if(pageType == 'ready'){
200		-
201		- form.stateType.value = "ready";
202		- $(".tab_depth1").show();
203		-
204		- }else if(pageType == 'complete'){
205		-
206		- form.stateType.value = "complete";
207		- $(".tab_depth1").show();
208		-
209		- }else if(pageType == 'fail'){
210		- form.listType.value = "privateList";
211		- form.stateType.value = "fail";
212		- $(".tab_depth1").hide();
213		-
214		- }
215		-
216		- /* if(pageType == 'fail'){//발송실패의 경우 모두 개인별 건수를 보여준다.
217		-
218		- form.listType.value = 'privateList';
219		-
220		- } */
221		-
222		- linkPage(1);
223	193
224	194	}
225	195
226	196	// 전체/단문/장문/그림 탭 선택 처리
227		-function fnTabLoad(tabType, tabNum){
	197	+function fnTabLoad(tabType){
	198	+
	199	+ //즉시, 예약 탭은 전체로 바꿔야함
	200	+ fn_activateTab('');
	201	+
228	202
229	203	var form = document.searchForm;
230		-
231		- form.tabType.value = tabType;
232		-
233		- //해당 탭의 전체 리스트 내역으로 불러오기
234		- fnListLoad('all', '0');
235		- var n=tabNum+1;
236		-
237		- //탭 선택 CSS 처리
238		- var $tab = $(".list_tab_wrap2 li:nth-child("+n+")");
239		- var $tabPrev = $(".list_tab_wrap2 li:nth-child("+n+")").prev("li")
240		- $tab.addClass("active");
241		- $tab.find("button").attr("title", "선택됨");
242		- $tab.siblings("li.tab").removeClass("active");
243		- $tab.siblings("li.tab").find("button").removeAttr("title");
244	204
245		- $tab.siblings("li:not(li:last-child)").find("button").css("border-right","1px solid #e5e5e5");
246		- $tabPrev.find("button").css("border-right","0");
	205	+ // 탭 선택 CSS 처리
	206	+ fn_setActiveTab(tabType);
247	207
	208	+ linkPage(1);
248	209	}
249	210
	211	+//fnTabLoad 함수에 대한 탭 선택 CSS 처리 함수
	212	+function fn_setActiveTab(tabType) {
	213	+ var $tabs = $(".list_tab_wrap2 li"); // 전체 탭 리스트
	214	+ $tabs.removeClass("active").find("button").removeAttr("title"); // 모든 탭 초기화
	215	+
	216	+ // tabType에 해당하는 탭 찾기
	217	+ $tabs.each(function() {
	218	+ var buttonText = $(this).find("button").text();
	219	+ if ((tabType === '' && buttonText === "전체") \|\|
	220	+ (tabType === 'S' && buttonText === "단문(SMS)") \|\|
	221	+ (tabType === 'L' && buttonText === "장문(LMS)") \|\|
	222	+ (tabType === 'M' && buttonText === "그림(MMS)")) {
	223	+ $(this).addClass("active").find("button").attr("title", "선택됨");
	224	+ }
	225	+ });
	226	+
	227	+ $('#searchCondition02').val(tabType);
	228	+}
	229	+
	230	+
250	231	function fnSearch(pageNo){
251		- /* if(!fn_G_cmndataValueChk("startDate", "endDate", 3)){
	232	+ /* if(!fn_G_cmndataValueChk("searchStartDate", "searchEndDate", 3)){
252	233	return;
253	234	}; */
	235	+
	236	+ fn_activateTab('')
	237	+ fn_setActiveTab('')
254	238
255	239	console.log('fnSearch')
256	240	var form = document.searchForm;
...	...	@@ -274,27 +258,8 @@
274	258	function fnExcelDownLoad(pageType, tabType){
275	259
276	260	var form = document.searchForm;
277		- var loginVO = '${LoginVO}';
278		-
279		- form.stateType.value = pageType;
280		- form.tabType.value = tabType;
281		-
282		- if(loginVO == "" \|\| loginVO == null){
283		- alert("로그인 후 이용이 가능합니다.");
284		- return false;
285		- }
286	261
287	262	// 기간검색 유효성 검사
288		- if ($("#startDate").val() == "" \|\| $("#endDate").val() == "") {
289		- alert("기간 설정을 먼저해주세요. 최근 3개월까지만 다운로드 가능합니다.")
290		- return false;
291		- }
292		- else {
293		- if ($("#startDate").val() < prevMonth(3)) {
294		- alert("최근 3개월까지만 다운로드 가능합니다.")
295		- return false;
296		- }
297		- }
298	263
299	264	if(confirm("엑셀 다운로드를 하시겠습니까?")){
300	265
...	...	@@ -305,21 +270,6 @@
305	270
306	271	}
307	272
308		-$(document).on('click', '.msgGgoupList', function(){
309		-
310		- var form = document.searchForm;
311		- form.listType.value = "groupList";
312		- linkPage(1);
313		-
314		-});
315		-
316		-$(document).on('click', '.msgPrivateList', function(){
317		-
318		- var form = document.searchForm;
319		- form.listType.value = "privateList";
320		- linkPage(1);
321		-
322		-});
323	273
324	274
325	275	function fnDeleteAddrNo(listType){
...	...	@@ -537,7 +487,7 @@
537	487	}
538	488
539	489
540		-/* 사용내역서 클릭 시 내역서 새창 팝업 오픈 */
	490	+/* 사용내역서 클릭 시 내역서 새창 팝업 오픈
541	491	function fnShowPrintPopup(tabType, type) {
542	492	//만들려는 팝업의 크기
543	493	var popup_wid = '840';
...	...	@@ -553,7 +503,7 @@
553	503	$("#searchForm").attr({"action":"/web/mjon/msgsent/printMsgSentDataAjax.do", "method":"post"}).submit();
554	504
555	505	}
556		-
	506	+*/
557	507	function addrGroupDuplCnt() {
558	508	document.searchForm.addrGrpNm.value = $('#grpNm').val();
559	509
...	...	@@ -744,9 +694,10 @@
744	694	}
745	695
746	696	//발송결과 - 대기/성공/실패
747		-function subContent(p_content_no){
	697	+function subContent(){
748	698
749		- var sendData = $(document.listForm).serializeArray();
	699	+ var sendData = $(document.searchForm).serializeArray();
	700	+ console.log('sendData :: ', sendData);
750	701	var v_html_pre = '<table>'
751	702	+ '<caption>구분, 충전금액, 사용금액, 잔액 등 정보를 제공하는 표</caption>'
752	703	+ '<colgroup>'
...	...	@@ -891,15 +842,19 @@
891	842	</div>
892	843	</div>--%>
893	844	<form id="searchForm" name="searchForm" method="post">
894		- <input type="hidden" id="pageIndex" name="pageIndex" value="1"/>
	845	+<!-- <input type="hidden" id="pageIndex" name="pageIndex" value="1"/> -->
	846	+ <input type="hidden" id="pageIndex" name="pageIndex" value="<c:out value="${searchVO.pageIndex}" />" />
895	847	<input type="hidden" id="msgGroupIdList" name="msgGroupIdList" value=""/>
	848	+ <input type="hidden" id="msgGroupId" name="msgGroupId" value=""/>
896	849	<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
897	850	<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
898	851	<input type="hidden" id="tabType" name="tabType" value="all"/><!-- 탭 종류 -->
899	852	<input type="hidden" id="stateType" name="stateType" value="all"/><!-- 발송상태 종류 -->
900	853	<input type="hidden" id="listType" name="listType" value="groupList"/><!-- 리스트 종류 -->
901	854	<input type="hidden" id="addrGrpNm" name="addrGrpNm" value=""/><!-- 주소록 그룹 이름 -->
902		- <input type="hidden" id="mberId" name="mberId" value="${LoginVO.id}"/><!-- 주소록 그룹 이름 -->
	855	+ <input type="hidden" id="mberId" name="mberId" value="${LoginVO.id}"/>
	856	+ <input type="hidden" id="searchCondition01" name="searchCondition01" value="${searchVO.searchCondition01}"/>
	857	+ <input type="hidden" id="searchCondition02" name="searchCondition02" value="${searchVO.searchCondition02}"/>
903	858
904	859
905	860	<div class="rev_content" id="tab5_1">
...	...	@@ -917,36 +872,20 @@
917	872	<div class="btn_left">
918	873	<span class="cal_label">기간선택</span>
919	874	<div class="calendar_wrap">
920		- <input type="text" class="startDate inp calendar" title="검색 시작일" id="startDate" name="startDate" value="<c:out value='${mjonMsgSentVO.startDate}'/>" data-datecontrol="true">
	875	+ <input type="text" class="searchStartDate inp calendar" title="검색 시작일" id="searchStartDate" name="searchStartDate" value="<c:out value='${mjonMsgSentVO.searchStartDate}'/>" data-datecontrol="true">
921	876	<span class="dateEtc">~</span>
922		- <input type="text" class="endDate inp calendar" title="검색 종료일" id="endDate" name="endDate" value="<c:out value='${mjonMsgSentVO.endDate}'/>" data-datecontrol="true">
	877	+ <input type="text" class="searchEndDate inp calendar" title="검색 종료일" id="searchEndDate" name="searchEndDate" value="<c:out value='${mjonMsgSentVO.searchEndDate}'/>" data-datecontrol="true">
923	878	</div>
924		- <button type="button" onclick="setCalVal(lastfulstday,'startDate');setCalVal( lastfuledday,'endDate'); return false;" class="btnType btnType19">전월</button>
925		- <button type="button" onclick="setCalVal(thisfulstlday,'startDate');setCalVal( thisfuledtlday,'endDate'); return false;" class="btnType btnType19">당월</button>
926		- <button type="button" onclick="fn_G_getPrevMonth('startDate', 3);fn_G_getCurrDate('endDate'); return false;" class="btnType btnType19">3개월</button>
	879	+ <button type="button" onclick="setCalVal(lastfulstday,'searchStartDate');setCalVal( lastfuledday,'searchEndDate'); return false;" class="btnType btnType19">전월</button>
	880	+ <button type="button" onclick="setCalVal(thisfulstlday,'searchStartDate');setCalVal( thisfuledtlday,'searchEndDate'); return false;" class="btnType btnType19">당월</button>
	881	+ <button type="button" onclick="fn_G_getPrevMonth('searchStartDate', 3);fn_G_getCurrDate('searchEndDate'); return false;" class="btnType btnType19">3개월</button>
927	882	<button type="button" class="btnType6" onClick="javascript:fnSearch(1); return false;">조회</button>
928	883	</div>
929	884	<div class="btn_right">
930		- <%-- <label for="searchMsgType" class="label">문자형태 선택 == ${mjonMsgSentVO.searchMsgType}</label>
931		- <select name="searchMsgType" id="searchMsgType" class="selType2">
932		- <option value="">전체</option>
933		- <option value="S" <c:if test="${mjonMsgSentVO.searchMsgType == 'S'}">selected</c:if> >단문</option>
934		- <option value="L" <c:if test="${mjonMsgSentVO.searchMsgType == 'L'}">selected</c:if> >장문</option>
935		- <option value="M" <c:if test="${mjonMsgSentVO.searchMsgType == 'M'}">selected</c:if> >그림</option>
936		- </select> --%>
937		-
938		- <c:if test="${appMgmt }">
939		- <label for="searchCondition_01" class="label">발신방식 == ${mjonMsgSentVO.searchCondition}</label>
940		- <select name="searchCondition_01" id="searchCondition_01" class="selType2 select_all_btn">
941		- <option value="" <c:if test="${empty mjonMsgSentVO.searchCondition_01 }">selected</c:if> >발송방식 전체</option>
942		- <option value="H" <c:if test="${mjonMsgSentVO.searchCondition_01 == 'H'}">selected</c:if> >WEB</option>
943		- <option value="A" <c:if test="${mjonMsgSentVO.searchCondition_01 == 'A'}">selected</c:if> >API</option>
944		- </select>
945		- </c:if>
946		- <label for="searchCondition" class="label">발신번호 선택 == ${mjonMsgSentVO.searchCondition}</label>
	885	+ <label for="searchCondition" class="label">검색 조건: ${mjonMsgSentVO.searchCondition == '2' ? '발신번호' : '문자내용'}</label>
947	886	<select name="searchCondition" id="searchCondition" class="selType2 select_btn">
948	887	<option value="2" <c:if test="${mjonMsgSentVO.searchCondition == '2'}">selected</c:if> >발신번호</option>
949		- <option value="3" <c:if test="${mjonMsgSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option>
	888	+ <option value="3" <c:if test="${mjonMsgSentVO.searchCondition == '3'}">selected</c:if> >문자내용</option>
950	889	</select>
951	890	<div class="search">
952	891	<label for="id" class="label"></label>
...	...	@@ -962,10 +901,10 @@
962	901	<div class="list_tab_wrap2 type4">
963	902	<!-- tab button -->
964	903	<ul class="list_tab">
965		- <li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
966		- <li class="tab"><button type="button" onclick="fnTabLoad('S',1); return false;">단문(SMS)</button></li>
967		- <li class="tab"><button type="button" onclick="fnTabLoad('L',2); return false;">장문(LMS)</button></li>
968		- <li class="tab"><button type="button" onclick="fnTabLoad('M',3); return false;">그림(MMS)</button></li>
	904	+ <li class="tab active"><button type="button" onclick="fnTabLoad(''); return false;">전체</button></li>
	905	+ <li class="tab"><button type="button" onclick="fnTabLoad('S'); return false;">단문(SMS)</button></li>
	906	+ <li class="tab"><button type="button" onclick="fnTabLoad('L'); return false;">장문(LMS)</button></li>
	907	+ <li class="tab"><button type="button" onclick="fnTabLoad('M'); return false;">그림(MMS)</button></li>
969	908	</ul><!--// tab button -->
970	909	</div>
971	910	<!-- 예약관리 > 전체 -->
...	...	@@ -983,9 +922,15 @@
983	922
984	923	<!-- tab button -->
985	924	<ul>
986		- <li class="tab active"><button type="button">전체</button></li>
987		- <li class="tab"><button type="button">즉시</button></li>
988		- <li class="tab"><button type="button">예약</button></li>
	925	+ <li class="tab ${empty searchVO.searchCondition_01 ? 'active' : ''}">
	926	+ <button type="button" class="sendKindBtn" data-info="">전체</button>
	927	+ </li>
	928	+ <li class="tab ${searchVO.searchCondition_01 == '0' ? 'active' : ''}">
	929	+ <button type="button" class="sendKindBtn" data-info="N">즉시</button>
	930	+ </li>
	931	+ <li class="tab ${searchVO.searchCondition_01 == '1' ? 'active' : ''}">
	932	+ <button type="button" class="sendKindBtn" data-info="Y">예약</button>
	933	+ </li>
989	934	</ul>
990	935	<!--// tab button -->
991	936

Delete comment