Merge branch 'JIWOO'

This commit is contained in:
jiwoo 2023-06-22 10:53:03 +09:00
commit 6f440eda2c
5 changed files with 150 additions and 0 deletions

View File

@ -1,10 +1,12 @@
package kcc.kccadr.adjcclt.web;
import java.text.SimpleDateFormat;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.TextStyle;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@ -59,6 +61,7 @@ import kcc.kccadr.cmm.RestResponse;
import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
import kcc.kccadr.ojct.service.OjctService;
import kcc.kccadr.ojct.service.OjctVO;
import kcc.kccadr.sch.service.SchduleManageService;
import kcc.let.utl.fcc.service.EgovCryptoUtil;
/**
@ -126,6 +129,8 @@ public class AdjstConciliatorController {
@Resource(name="adrHstryMgrService")
private AdrHstryMgrService adrHstryMgrService;
@Resource(name = "schduleManageService")
private SchduleManageService schduleManageService;
/**
* 조정위원 대시보드 화면
*/
@ -1038,6 +1043,57 @@ public class AdjstConciliatorController {
return "/web/kccadr/adjcclt/popup/adjstOjctDetail";
}
@RequestMapping("/kccadr/adjcclt/ai/insertschMgrAjax.do")
public ModelAndView insertschMgrAjax( @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
try {
String tilte = adjstConciliatorVO.getAdrNo()+" "+adjstConciliatorVO.getAdrSn()+"차 기일";
String id = adjstConciliatorVO.getAdrAdmId();
String dntDay = adjstConciliatorVO.getAppDe();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date formatDate = simpleDateFormat.parse(dntDay);
dntDay = simpleDateFormat.format(formatDate);
schduleManageService.insertSchManageByDnt(tilte, dntDay, id);
} catch (Exception e) {
System.out.println(e.getMessage());
}
modelAndView.addObject("result", "SUCCESS");
return modelAndView;
}
@RequestMapping("/kccadr/adjcclt/ai/insertschMgrChgAjax.do")
public ModelAndView insertschMgrChgAjax( @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
try {
String tilte = adjstConciliatorVO.getAdrNo()+" "+adjstConciliatorVO.getAdrSn()+"차 기일 변경";
String id = adjstConciliatorVO.getAdrAdmId();
String dntDay = adjstConciliatorVO.getAppDe();
dntDay = dntDay.replaceAll("/", "-");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date formatDate = simpleDateFormat.parse(dntDay);
dntDay = simpleDateFormat.format(formatDate);
schduleManageService.insertSchManageByDnt(tilte, dntDay, id);
} catch (Exception e) {
System.out.println(e.getMessage());
}
modelAndView.addObject("result", "SUCCESS");
return modelAndView;
}
public void decryptInfomation(List<AdjstConciliatorVO> list, AdjstConciliatorVO info) {
if (CollectionUtils.isNotEmpty(list)) {
for (AdjstConciliatorVO model : list) {

View File

@ -19,5 +19,6 @@ public interface SchduleManageService {
List<SchduleManageVO> selectSchManageStatusList(SchduleManageVO schduleManageVO) throws Exception;
void insertSchManageByDnt(String title, String dntDay, String Id) throws Exception;
}

View File

@ -3,6 +3,9 @@ package kcc.kccadr.sch.service.impl;
import kcc.kccadr.sch.service.SchduleManageService;
import kcc.kccadr.sch.service.SchduleManageVO;
import org.springframework.stereotype.Service;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import javax.annotation.Resource;
import java.util.List;
@ -11,6 +14,9 @@ public class SchduleManageServiceImpl implements SchduleManageService {
@Resource(name="schduleManageDAO")
private SchduleManageDAO schduleManageDAO;
@Resource(name="egovSchManageGnrService")
private EgovIdGnrService idgenService;
@Override
public void insertSchManage(SchduleManageVO schduleManageVO) throws Exception {
@ -46,4 +52,22 @@ public class SchduleManageServiceImpl implements SchduleManageService {
public List<SchduleManageVO> selectSchManageStatusList(SchduleManageVO schduleManageVO) throws Exception {
return schduleManageDAO.selectSchManageStatusList(schduleManageVO);
}
@Override
public void insertSchManageByDnt(String title, String dntDay, String Id) throws Exception {
SchduleManageVO schduleManageVO = new SchduleManageVO();
schduleManageVO.setSchSeq(idgenService.getNextStringId()); //스케줄 순번
schduleManageVO.setType("BA"); //타입 - 기본
schduleManageVO.setTitle(title); //제목
schduleManageVO.setContent(title); //내용
schduleManageVO.setStart(dntDay); //시작날짜
schduleManageVO.setEnd(dntDay); //종료날짜
schduleManageVO.setUrl(""); //url
schduleManageVO.setColor("#00ffff"); //
schduleManageVO.setTextColor("#00ffff"); //글자색
schduleManageVO.setFrstRegisterId(Id); //등록자 ID - 조정부사관
schduleManageDAO.insertSchManage(schduleManageVO);
}
}

View File

@ -420,6 +420,7 @@
exportUrl = "/kccadr/adjPgrMgr/dnt/dntOzExportAjax.do";
ozExportReport(exportUrl);
schMgr()
alert("승인되었습니다.");
}
location.reload();
@ -486,6 +487,32 @@
}
function schMgr(){
$('#appDe').val($('#appDeDay').val() + " " + $('#appDeTime').val())
var schdata = new FormData(document.getElementById("scrMgrForm"));
$.ajax({
type: "POST",
url: "/kccadr/adjcclt/ai/insertschMgrChgAjax.do",
data: schdata,
dataType:'json',
async: false,
processData: false,
contentType: false,
cache: false,
success: function (returnData, status) {
console.log(returnData.result);
//alert(returnData.result);
if(returnData.result == 'SUCCESS'){
}else{
alert(returnData.message);
}
},
error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); }
});
}
</script>
</head>
<body>
@ -509,6 +536,13 @@
<input type="hidden" name="statCd" id="statCd" value="<c:out value='${info.statCd}'/>"/>
<input type="hidden" name="closeDocTy" id="closeDocTy" value=""/>
</form:form>
<form:form id="scrMgrForm" name="scrMgrForm">
<input type="hidden" name="adrNo" id="adrNo" value="<c:out value='${info.adrNo}'/>"/>
<input type="hidden" name="adrSn" id="adrSn" value="<c:out value='${info.adrSn}'/>"/>
<input type="hidden" name="appDe" id="appDe" value=""/>
<input type="hidden" name="adrAdmId" id="adrAdmId" value="<c:out value='${info.adrAdmId}'/>"/>
</form:form>
<form id="dlvpop" name="dlvpop" method="post">
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />

View File

@ -413,6 +413,7 @@
exportUrl = "/kccadr/adjPgrMgr/dnt/dntOzExportAjax.do";
ozExportReport(exportUrl);
schMgr()
alert("승인되었습니다.");
}
location.reload();
@ -479,6 +480,33 @@
});
}
function schMgr(){
$('#appDe').val($('#appDeDay').val() + " " + $('#appDeTime').val())
var schdata = new FormData(document.getElementById("scrMgrForm"));
$.ajax({
type: "POST",
url: "/kccadr/adjcclt/ai/insertschMgrAjax.do",
data: schdata,
dataType:'json',
async: false,
processData: false,
contentType: false,
cache: false,
success: function (returnData, status) {
console.log(returnData.result);
//alert(returnData.result);
if(returnData.result == 'SUCCESS'){
}else{
alert(returnData.message);
}
},
error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); }
});
}
</script>
</head>
<body>
@ -503,6 +531,13 @@
<input type="hidden" name="closeDocTy" id="closeDocTy" value=""/>
</form:form>
<form:form id="scrMgrForm" name="scrMgrForm">
<input type="hidden" name="adrNo" id="adrNo" value="<c:out value='${info.adrNo}'/>"/>
<input type="hidden" name="adrSn" id="adrSn" value="<c:out value='${info.adrSn}'/>"/>
<input type="hidden" name="appDe" id="appDe" value=""/>
<input type="hidden" name="adrAdmId" id="adrAdmId" value="<c:out value='${info.adrAdmId}'/>"/>
</form:form>
<form id="dlvpop" name="dlvpop" method="post">
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<input type="hidden" id="regNm" name="regNm" />