Merge branch 'tolag3'

보완요구 알림톡 발송 수정
This commit is contained in:
leejunho 2025-01-14 16:51:39 +09:00
parent dd1e108885
commit a75e952134

View File

@ -7509,34 +7509,34 @@ v_ret = this.receiverHeader();
*5?11000000 = 종료보고서 *5?11000000 = 종료보고서
*5?12000000 = 조사보고서 *5?12000000 = 조사보고서
*/ */
//http://pms.iten.co.kr:9999/issues/4894 요청으로 주석 처리
try { // try {
SendSmsVO sendSmsVO = sendService.selectSendSet(); // SendSmsVO sendSmsVO = sendService.selectSendSet();
if("Y".equals(sendSmsVO.getAtYn())) { // if("Y".equals(sendSmsVO.getAtYn())) {
//
//치환 // //치환
EgovMap resultMap = sendService.selectTEMPLATE_APP_BAEJUNG(params); // EgovMap resultMap = sendService.selectTEMPLATE_APP_BAEJUNG(params);
params.put("rceptNo", resultMap.get("rceptNo").toString()); // params.put("rceptNo", resultMap.get("rceptNo").toString());
//
//신청인 // //신청인
// List <Map <String, Object>> list = service2.selectApplcnt(params); //// List <Map <String, Object>> list = service2.selectApplcnt(params);
List <EgovMap> list = sendService.selectTEMPLATE_BOTH_CHULSUK(params); // List <EgovMap> list = sendService.selectTEMPLATE_BOTH_CHULSUK(params);
list.stream().forEach(t -> { // list.stream().forEach(t -> {
try { // try {
Map<String, String> chihwan = new HashMap<String, String>(); // Map<String, String> chihwan = new HashMap<String, String>();
chihwan.put("caseNo", resultMap.get("caseNo") == null ? "" : resultMap.get("caseNo").toString()); // chihwan.put("caseNo", resultMap.get("caseNo") == null ? "" : resultMap.get("caseNo").toString());
chihwan.put("cfrnc", resultMap.get("conferenceNames") == null ? "" : resultMap.get("conferenceNames").toString()); // chihwan.put("cfrnc", resultMap.get("conferenceNames") == null ? "" : resultMap.get("conferenceNames").toString());
chihwan.put("tel", resultMap.get("memberTel") == null ? "" : resultMap.get("memberTel").toString()); // chihwan.put("tel", resultMap.get("memberTel") == null ? "" : resultMap.get("memberTel").toString());
chihwan.put("email", resultMap.get("memberEmail") == null ? "" : resultMap.get("memberEmail").toString()); // chihwan.put("email", resultMap.get("memberEmail") == null ? "" : resultMap.get("memberEmail").toString());
//
sendService.sendAt(t.get("tel").toString().replaceAll("-", ""),"TEMPLATE_BOTH_SANGJUNG", chihwan); // sendService.sendAt(t.get("tel").toString().replaceAll("-", ""),"TEMPLATE_BOTH_SANGJUNG", chihwan);
} catch (Exception e) { // } catch (Exception e) {
} // }
}); // });
} // }
} catch (Exception e) { // } catch (Exception e) {
System.out.println("알림 발송 실패"); // System.out.println("알림 발송 실패");
} // }
} }
if(emap2.get("mediationEndDt") == null || SeedUtils.setReplaceNull(emap2.get("mediationEndDt")).equals("")){ if(emap2.get("mediationEndDt") == null || SeedUtils.setReplaceNull(emap2.get("mediationEndDt")).equals("")){
@ -7617,32 +7617,32 @@ v_ret = this.receiverHeader();
params.put("sql", "nanumMasterEndUpdt"); params.put("sql", "nanumMasterEndUpdt");
bservice.update(params); bservice.update(params);
/*[조정원]당사자 통지문서 결재 완료시*/ /*[조정원]당사자 통지문서 결재 완료시*/
//http://pms.iten.co.kr:9999/issues/4894 요청으로 주석 처리
try { // try {
SendSmsVO sendSmsVO = sendService.selectSendSet(); // SendSmsVO sendSmsVO = sendService.selectSendSet();
if("Y".equals(sendSmsVO.getAtYn())) { // if("Y".equals(sendSmsVO.getAtYn())) {
//
//치환 // //치환
EgovMap resultMap = sendService.selectTEMPLATE_APP_BAEJUNG(params); // EgovMap resultMap = sendService.selectTEMPLATE_APP_BAEJUNG(params);
params.put("rceptNo", resultMap.get("rceptNo").toString()); // params.put("rceptNo", resultMap.get("rceptNo").toString());
//
//신청인 // //신청인
// List <Map <String, Object>> list = service2.selectApplcnt(params); //// List <Map <String, Object>> list = service2.selectApplcnt(params);
List <EgovMap> list = sendService.selectTEMPLATE_BOTH_CHULSUK(params); // List <EgovMap> list = sendService.selectTEMPLATE_BOTH_CHULSUK(params);
list.stream().forEach(t -> { // list.stream().forEach(t -> {
try { // try {
Map<String, String> chihwan = new HashMap<String, String>(); // Map<String, String> chihwan = new HashMap<String, String>();
chihwan.put("caseNo", resultMap.get("caseNo") == null ? "" : resultMap.get("caseNo").toString()); // chihwan.put("caseNo", resultMap.get("caseNo") == null ? "" : resultMap.get("caseNo").toString());
chihwan.put("cfrnc", resultMap.get("conferenceNames") == null ? "" : resultMap.get("conferenceNames").toString()); // chihwan.put("cfrnc", resultMap.get("conferenceNames") == null ? "" : resultMap.get("conferenceNames").toString());
//
sendService.sendAt(t.get("tel").toString().replaceAll("-", ""),"TEMPLATE_BOTH_TONGJI", chihwan); // sendService.sendAt(t.get("tel").toString().replaceAll("-", ""),"TEMPLATE_BOTH_TONGJI", chihwan);
} catch (Exception e) { // } catch (Exception e) {
} // }
}); // });
} // }
} catch (Exception e) { // } catch (Exception e) {
System.out.println("알림 발송 실패"); // System.out.println("알림 발송 실패");
} // }
}else if("5204000000".equals(emap.get("codeNo")) || "5304000000".equals(emap.get("codeNo")) }else if("5204000000".equals(emap.get("codeNo")) || "5304000000".equals(emap.get("codeNo"))
|| "5404000000".equals(emap.get("codeNo")) || "5504000000".equals(emap.get("codeNo")) || "5404000000".equals(emap.get("codeNo")) || "5504000000".equals(emap.get("codeNo"))
@ -7684,16 +7684,39 @@ v_ret = this.receiverHeader();
chihwan.put("caseNo", emap.get("caseNo").toString()); chihwan.put("caseNo", emap.get("caseNo").toString());
String ncha = "1"; String ncha = "1";
String codeNo = emap.get("codeNo").toString();
//보완요구 1차 //보완요구 1차
if("5404000000".equals(emap.get("codeNo"))) { if(
"5204000000".equals(codeNo)
|| "5304000000".equals(codeNo)
|| "5404000000".equals(codeNo)
|| "5504000000".equals(codeNo)
|| "5604000000".equals(codeNo)
|| "5804000000".equals(codeNo)
) {
ncha = "1"; ncha = "1";
} }
//보완요구 2차 //보완요구 2차
else if("5409000000".equals(emap.get("codeNo"))) { else if(
"5209000000".equals(codeNo)
|| "5309000000".equals(codeNo)
|| "5409000000".equals(codeNo)
|| "5509000000".equals(codeNo)
|| "5609000000".equals(codeNo)
|| "5809000000".equals(codeNo)
) {
ncha = "2"; ncha = "2";
} }
//보완요구 3차 //보완요구 3차
else if("5434000000".equals(emap.get("codeNo"))) { else if(
"5227000000".equals(codeNo)
|| "5327000000".equals(codeNo)
|| "5434000000".equals(codeNo)
|| "5527000000".equals(codeNo)
|| "5627000000".equals(codeNo)
|| "5827000000".equals(codeNo)
) {
ncha = "3"; ncha = "3";
} }
@ -7735,39 +7758,40 @@ v_ret = this.receiverHeader();
bservice.insert(params); bservice.insert(params);
/*[조정원]출석요구공문 그룹웨어 결재 완료시 /*[조정원]출석요구공문 그룹웨어 결재 완료시
* 타겟 컬럼은 있지만 미사용*/ * 타겟 컬럼은 있지만 미사용*/
try { //http://pms.iten.co.kr:9999/issues/4894 요청으로 주석 처리
SendSmsVO sendSmsVO = sendService.selectSendSet(); // try {
if("Y".equals(sendSmsVO.getAtYn())) { // SendSmsVO sendSmsVO = sendService.selectSendSet();
// if("Y".equals(sendSmsVO.getAtYn())) {
//치환 //
Map<String, String> chihwan = new HashMap<String, String>(); // //치환
// Map<String, String> chihwan = new HashMap<String, String>();
chihwan.put("caseNo", emap.get("caseNo").toString()); //
String ncha = "1"; // chihwan.put("caseNo", emap.get("caseNo").toString());
// String ncha = "1";
//출석요구 1차 //
if("5407000000".equals(emap.get("codeNo"))) { // //출석요구 1차
ncha = "1"; // if("5407000000".equals(emap.get("codeNo"))) {
} // ncha = "1";
//출석요구 2차 // }
else if("5408000000".equals(emap.get("codeNo"))) { // //출석요구 2차
ncha = "2"; // else if("5408000000".equals(emap.get("codeNo"))) {
} // ncha = "2";
chihwan.put("nCha", ncha); // }
// chihwan.put("nCha", ncha);
List <EgovMap> list = sendService.selectTEMPLATE_BOTH_CHULSUK(params); //
if(list != null) { // List <EgovMap> list = sendService.selectTEMPLATE_BOTH_CHULSUK(params);
for(EgovMap map : list) { // if(list != null) {
if(map.get("tel") != null && "".equals(map.get("tel"))) { // for(EgovMap map : list) {
sendService.sendAt(map.get("tel").toString().replaceAll("-", ""),"TEMPLATE_BOTH_CHULSUK", chihwan); // if(map.get("tel") != null && "".equals(map.get("tel"))) {
} // sendService.sendAt(map.get("tel").toString().replaceAll("-", ""),"TEMPLATE_BOTH_CHULSUK", chihwan);
} // }
// }
} //
} // }
} catch (Exception e) { // }
System.out.println("알림 발송 실패"); // } catch (Exception e) {
} // System.out.println("알림 발송 실패");
// }
} }
//}else if("returned".equals(params.get("status"))){ //deleted 변경 //}else if("returned".equals(params.get("status"))){ //deleted 변경
}else if("deleted".equals(params.get("status"))){ }else if("deleted".equals(params.get("status"))){