tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://subsub8729@vcs.iten.co.kr:9999/itnAdmin/fairnet

Browse Source
This commit is contained in:
subsub 2024-12-23 15:10:32 +09:00
commit e943bc7d6a
9 changed files with 138 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/seed/com/user/login/service/DisputeResolutionCommitteeVO.java
View File

@ -45,6 +45,7 @@ public class DisputeResolutionCommitteeVO implements Serializable{
String delYn;
String memberIp;
String agreeCheck;
String agreeDt;
public String getMemberNo() {
return memberNo;
@ -280,5 +281,11 @@ public class DisputeResolutionCommitteeVO implements Serializable{
public void setAgreeCheck(String agreeCheck) {
this.agreeCheck = agreeCheck;
}
public String getAgreeDt() {
return agreeDt;
}
public void setAgreeDt(String agreeDt) {
this.agreeDt = agreeDt;
}
}

21
src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml
View File

@ -201,7 +201,8 @@
</if>
AND DEL_YN = 'N'
</where>
ORDER BY CFRNC_NO DESC
<!-- ORDER BY CFRNC_NO DESC -->
ORDER BY REG_DT DESC
<include refid="bottom2"/>
</select>
@ -649,6 +650,20 @@
CFRNC_NO = ${cfrncNo}
</where>
</delete>
<!-- 참여위원 동의기록 삭제 -->
<delete id="trublcfrncmngChamAgreeDel" parameterType="egovMap">
DELETE FROM C_CFRNCATNDNC_AGREE
<where>
CFRNC_NO = ${cfrncNo}
<if test='arrList neq "" and arrList neq null'>
AND MEMBER_NO NOT IN
<foreach collection="arrList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
</delete>
<!-- 경비정산 삭제 -->
<delete id="trublcfrncmngCfrncexpensDel" parameterType="egovMap">
@ -1024,7 +1039,9 @@
NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEMBER_UNIT), '-') AS MEMBER_UNIT,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_FIELD ) AS CASE_FIELD_NAME,
(SELECT CHK FROM C_CFRNCATNDNC CC WHERE CC.CFRNC_NO = #{cfrncNo} AND CC.MEMBER_NO = CT.MEMBER_NO) AS CHK,
(SELECT ATTEND_CHECK FROM C_CFRNCATNDNC DC WHERE DC.CFRNC_NO = #{cfrncNo} AND DC.MEMBER_NO = CT.MEMBER_NO) AS ATTEND_CHECK
(SELECT ATTEND_CHECK FROM C_CFRNCATNDNC DC WHERE DC.CFRNC_NO = #{cfrncNo} AND DC.MEMBER_NO = CT.MEMBER_NO) AS ATTEND_CHECK,
(SELECT AGREE_CHECK FROM C_CFRNCATNDNC_AGREE CCA WHERE CCA.CFRNC_NO = #{cfrncNo} AND CCA.MEMBER_NO = CT.MEMBER_NO) AS AGREE_CHECK,
(SELECT TO_CHAR(REG_DT,'YYYY-MM-DD HH24:MI') FROM C_CFRNCATNDNC_AGREE CDA WHERE CDA.CFRNC_NO = #{cfrncNo} AND CDA.MEMBER_NO = CT.MEMBER_NO) AS AGREE_DT
FROM C_TRUBLMFCMM CT
WHERE MEMBER_NO IN (SELECT MEMBER_NO FROM C_CFRNCATNDNC WHERE CFRNC_NO = #{cfrncNo})
ORDER BY CASE_FIELD, MEMBER_POSIT DESC

2
src/main/webapp/WEB-INF/jsp/_extra/user/trublcfrncmng/trublcfrncmngView.jsp
View File

@ -524,7 +524,7 @@ function fn_callScheduleData(startDt, endDt){
}
});
if(calEvent.chk !=""){
if(calEvent.chk !="" && calEvent.chk != null){
//추가회의자료
url = "/user/case/disputeResolutionCommittee/ajax/FileCheck2.do";
XHR2(url, param, function(r){

20
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp
View File

@ -287,7 +287,15 @@ function loadChamData(){
} else {
html += '<td></td>';
}
/* 동의여부,일시 처리 */
var agreeYn = "";
var agreeDt = "";
if(v.agreeCheck == "Y"){
agreeYn = "O";
agreeDt = v.agreeDt
}
html += '<td>'+agreeYn+'</td>';
html += '<td>'+agreeDt+'</td>';
html += '</tr>';
list.push(v.memberNo);
});
@ -295,7 +303,7 @@ function loadChamData(){
$("#arrListcham").val(list);
}else{
html += '<tr>';
html += '<td colspan="5">선택된 참여위원이 없습니다.</td>';
html += '<td colspan="7">선택된 참여위원이 없습니다.</td>';
html += '</tr>';
$("#cham").html(html);
}
@ -2119,7 +2127,7 @@ function nanumCallTest(no, nanumSubject, officeGubun, officeDept){
<table>
<thead>
<tr>
<th colspan="5">참여위원</th>
<th colspan="7">참여위원</th>
</tr>
<tr>
<th>분류</th>
@ -2127,16 +2135,18 @@ function nanumCallTest(no, nanumSubject, officeGubun, officeDept){
<th>위원명</th>
<th>위원기수</th>
<th>참석여부</th>
<th>동의여부</th>
<th>동의일시</th>
</tr>
</thead>
<tbody id="cham">
<tr>
<td colspan="5">선택된 참여위원이 없습니다.</td>
<td colspan="7">선택된 참여위원이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="5">
<td colspan="7">
<!-- <button type="button" class="btn-default fr" id="chamAdd">추가</button> -->
</td>
</tr>

18
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp
View File

@ -274,7 +274,15 @@ function loadChamData(){
} else {
html += '<td></td>';
}
/* 동의여부,일시 처리 */
var agreeYn = "";
var agreeDt = "";
if(v.agreeCheck == "Y"){
agreeYn = "O";
agreeDt = v.agreeDt
}
html += '<td>'+agreeYn+'</td>';
html += '<td>'+agreeDt+'</td>';
html += '</tr>';
list.push(v.memberNo);
});
@ -1651,7 +1659,7 @@ function nanumCallGeneral(p_jobID, nanumSubject){
<table>
<thead>
<tr>
<th colspan="5">참여위원</th>
<th colspan="7">참여위원</th>
</tr>
<tr>
<th>분류</th>
@ -1659,16 +1667,18 @@ function nanumCallGeneral(p_jobID, nanumSubject){
<th>위원명</th>
<th>위원기수</th>
<th>참석여부</th>
<th>동의여부</th>
<th>동의일시</th>
</tr>
</thead>
<tbody id="cham">
<tr>
<td colspan="5">선택된 참여위원이 없습니다.</td>
<td colspan="7">선택된 참여위원이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="5">
<td colspan="7">
<!-- <button type="button" class="btn-default fr" id="chamAdd">추가</button> -->
</td>
</tr>

36
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp
View File

@ -361,7 +361,6 @@ function loadChamData(){
html += '<td>'+v.memberUnit+'</td>';
var atTxt = "";
if(v.attendCheck == 'Y') {
if(cnt3 != 0) {
coms = ",";
@ -374,6 +373,16 @@ function loadChamData(){
}
html += '<td><input type="checkbox" name="signYnNo" value="' + v.memberNo + '" onchange="fn_checkList()" ' + atTxt + ' /></td>';
/* 동의여부,일시 처리 */
var agreeYn = "";
var agreeDt = "";
if(v.agreeCheck == "Y"){
agreeYn = "O";
agreeDt = v.agreeDt
}
html += '<td>'+agreeYn+'</td>';
html += '<td>'+agreeDt+'</td>';
html += '</tr>';
list.push(v.memberNo);
});
@ -673,6 +682,8 @@ function setData(parentId){
html += '<td>'+v.memberName+'</td>';
html += '<td>'+v.memberUnit+'</td>';
html += '<td><input type="checkbox" name="signYnNo" value="' + v.memberNo + '" onchange="fn_checkList()" /></td>';
html += '<td></td>';
html += '<td></td>';
if(idxs != 0) {
coms = ",";
@ -918,13 +929,18 @@ function regData(){
var param = jQuery('#frm').serialize();
url = "/gtm/case/trublcfrncmng/ajax/ChamDel.do";
XHR2(url, param, function(r){
var url = "";
$("#type").val("I");
$("#arrList").val($("#arrListcham").val());
var param = jQuery('#frm').serialize();
url = "/gtm/case/trublcfrncmng/ajax/CfrncatndncInsert.do";
url = "/gtm/case/trublcfrncmng/ajax/ChamAgreeDel.do"
XHR2(url, param, function(r){
var url = "";
$("#type").val("I");
/* $("#arrList").val($("#arrListcham").val()); */
var param = jQuery('#frm').serialize();
url = "/gtm/case/trublcfrncmng/ajax/CfrncatndncInsert.do";
XHR2(url, param, function(r){
});
});
});
}
@ -2853,10 +2869,12 @@ function delCfrnc(){
<col style="width:auto;"/>
<col style="width:auto;"/>
<col style="width:80px;"/>
<col style="width:80px;"/>
<col style="width:auto;"/>
</colgroup>
<thead>
<tr>
<th colspan="6">참여위원</th>
<th colspan="8">참여위원</th>
</tr>
<tr>
<th>회의자료</th>
@ -2865,16 +2883,18 @@ function delCfrnc(){
<th>위원명</th>
<th>위원기수</th>
<th>참석여부</th>
<th>동의여부</th>
<th>동의일시</th>
</tr>
</thead>
<tbody id="cham">
<tr>
<td colspan="6">선택된 참여위원이 없습니다.</td>
<td colspan="8">선택된 참여위원이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="6">
<td colspan="8">
<div class="btn_wrap right mb5 mt5">
<button type="button" class="btn-default btn btn_text btn_30 blue_border" id="chamAdd">추가</button>
</div>

18
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp
View File

@ -299,7 +299,15 @@ function loadChamData(){
} else {
html += '<td></td>';
}
/* 동의여부,일시 처리 */
var agreeYn = "";
var agreeDt = "";
if(v.agreeCheck == "Y"){
agreeYn = "O";
agreeDt = v.agreeDt
}
html += '<td>'+agreeYn+'</td>';
html += '<td>'+agreeDt+'</td>';
html += '</tr>';
list.push(v.memberNo);
});
@ -1288,7 +1296,7 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
<table>
<thead>
<tr>
<th colspan="5">참여위원</th>
<th colspan="7">참여위원</th>
</tr>
<tr>
<th>분야</th>
@ -1296,16 +1304,18 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
<th>위원명</th>
<th>위원기수</th>
<th>참석여부</th>
<th>동의여부</th>
<th>동의일시</th>
</tr>
</thead>
<tbody id="cham">
<tr>
<td colspan="5">선택된 참여위원이 없습니다.</td>
<td colspan="7">선택된 참여위원이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="5">
<td colspan="7">
<!-- <button type="button" class="btn-default fr" id="chamAdd">추가</button> -->
</td>
</tr>

33
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp
View File

@ -416,6 +416,16 @@ function loadChamData(){
}
html += '<td><input type="checkbox" name="signYnNo" value="' + v.memberNo + '" onchange="fn_checkList()" ' + atTxt + ' /></td>';
/* 동의여부,일시 처리 */
var agreeYn = "";
var agreeDt = "";
if(v.agreeCheck == "Y"){
agreeYn = "O";
agreeDt = v.agreeDt
}
html += '<td>'+agreeYn+'</td>';
html += '<td>'+agreeDt+'</td>';
html += '</tr>';
list.push(v.memberNo);
});
@ -683,6 +693,8 @@ function setData(parentId){
html += '<td>'+v.memberName+'</td>';
html += '<td>'+v.memberUnit+'</td>';
html += '<td><input type="checkbox" name="signYnNo" value="' + v.memberNo + '" onchange="fn_checkList()" /></td>';
html += '<td></td>';
html += '<td></td>';
if(idxs != 0) {
coms = ",";
@ -864,13 +876,18 @@ function regData(){
var param = jQuery('#frm').serialize();
url = "/gtm/case/trublcfrncmng/ajax/ChamDel.do";
XHR2(url, param, function(r){
var url = "";
$("#type").val("I");
$("#arrList").val($("#arrListcham").val());
var param = jQuery('#frm').serialize();
url = "/gtm/case/trublcfrncmng/ajax/CfrncatndncInsert.do";
url = "/gtm/case/trublcfrncmng/ajax/ChamAgreeDel.do"
XHR2(url, param, function(r){
var url = "";
$("#type").val("I");
/* $("#arrList").val($("#arrListcham").val()); */
var param = jQuery('#frm').serialize();
url = "/gtm/case/trublcfrncmng/ajax/CfrncatndncInsert.do";
XHR2(url, param, function(r){
});
});
});
}
@ -3752,7 +3769,7 @@ function nanumHisDel(){
<table>
<thead>
<tr>
<th colspan="5">참여위원</th>
<th colspan="7">참여위원</th>
</tr>
<tr>
<th>분야</th>
@ -3760,16 +3777,18 @@ function nanumHisDel(){
<th>위원명</th>
<th>위원기수</th>
<th>참석여부</th>
<th>동의여부</th>
<th>동의일시</th>
</tr>
</thead>
<tbody id="cham">
<tr>
<td colspan="5">선택된 참여위원이 없습니다.</td>
<td colspan="7">선택된 참여위원이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="5">
<td colspan="7">
<button type="button" class="btn-default fr" id="chamAdd">변경</button>
</td>
</tr>

18
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp
View File

@ -293,7 +293,15 @@ function loadChamData(){
} else {
html += '<td></td>';
}
/* 동의여부,일시 처리 */
var agreeYn = "";
var agreeDt = "";
if(v.agreeCheck == "Y"){
agreeYn = "O";
agreeDt = v.agreeDt
}
html += '<td>'+agreeYn+'</td>';
html += '<td>'+agreeDt+'</td>';
html += '</tr>';
list.push(v.memberNo);
});
@ -824,7 +832,7 @@ function resultGo(){
<table>
<thead>
<tr>
<th colspan="5">참여위원</th>
<th colspan="7">참여위원</th>
</tr>
<tr>
<th>분류</th>
@ -832,16 +840,18 @@ function resultGo(){
<th>위원명</th>
<th>위원기수</th>
<th>참석여부</th>
<th>동의여부</th>
<th>동의일시</th>
</tr>
</thead>
<tbody id="cham">
<tr>
<td colspan="5">선택된 참여위원이 없습니다.</td>
<td colspan="7">선택된 참여위원이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="5">
<td colspan="7">
<!-- <button type="button" class="btn-default fr" id="chamAdd">추가</button> -->
</td>
</tr>