diff --git a/src/main/java/seed/com/user/login/service/DisputeResolutionCommitteeVO.java b/src/main/java/seed/com/user/login/service/DisputeResolutionCommitteeVO.java index ad6a0591..853f97a3 100644 --- a/src/main/java/seed/com/user/login/service/DisputeResolutionCommitteeVO.java +++ b/src/main/java/seed/com/user/login/service/DisputeResolutionCommitteeVO.java @@ -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; + } } diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml index 860694cc..56e43f43 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml @@ -1024,7 +1024,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 diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp index 4ae0235a..1550a029 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp @@ -287,7 +287,15 @@ function loadChamData(){ } else { html += ''; } - + /* 동의여부,일시 처리 */ + var agreeYn = ""; + var agreeDt = ""; + if(v.agreeCheck == "Y"){ + agreeYn = "O"; + agreeDt = v.agreeDt + } + html += ''+agreeYn+''; + html += ''+agreeDt+''; html += ''; list.push(v.memberNo); }); @@ -295,7 +303,7 @@ function loadChamData(){ $("#arrListcham").val(list); }else{ html += ''; - html += '선택된 참여위원이 없습니다.'; + html += '선택된 참여위원이 없습니다.'; html += ''; $("#cham").html(html); } @@ -2119,7 +2127,7 @@ function nanumCallTest(no, nanumSubject, officeGubun, officeDept){ - + @@ -2127,16 +2135,18 @@ function nanumCallTest(no, nanumSubject, officeGubun, officeDept){ + + - + - diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp index 10ca59b2..cdeb9f0e 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp @@ -274,7 +274,15 @@ function loadChamData(){ } else { html += ''; } - + /* 동의여부,일시 처리 */ + var agreeYn = ""; + var agreeDt = ""; + if(v.agreeCheck == "Y"){ + agreeYn = "O"; + agreeDt = v.agreeDt + } + html += ''; + html += ''; html += ''; list.push(v.memberNo); }); @@ -1651,7 +1659,7 @@ function nanumCallGeneral(p_jobID, nanumSubject){
참여위원참여위원
분류위원명 위원기수 참석여부동의여부동의일시
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+
'+agreeYn+''+agreeDt+'
- + @@ -1659,16 +1667,18 @@ function nanumCallGeneral(p_jobID, nanumSubject){ + + - + - diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp index 0f689268..ce9d16ea 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp @@ -361,7 +361,6 @@ function loadChamData(){ html += ''; var atTxt = ""; - if(v.attendCheck == 'Y') { if(cnt3 != 0) { coms = ","; @@ -374,6 +373,16 @@ function loadChamData(){ } html += ''; + + /* 동의여부,일시 처리 */ + var agreeYn = ""; + var agreeDt = ""; + if(v.agreeCheck == "Y"){ + agreeYn = "O"; + agreeDt = v.agreeDt + } + html += ''; + html += ''; html += ''; list.push(v.memberNo); }); @@ -673,6 +682,8 @@ function setData(parentId){ html += ''; html += ''; html += ''; + html += ''; + html += ''; if(idxs != 0) { coms = ","; @@ -2853,10 +2864,12 @@ function delCfrnc(){ + + - + @@ -2865,16 +2878,18 @@ function delCfrnc(){ + + - + - '; } - + /* 동의여부,일시 처리 */ + var agreeYn = ""; + var agreeDt = ""; + if(v.agreeCheck == "Y"){ + agreeYn = "O"; + agreeDt = v.agreeDt + } + html += ''; + html += ''; html += ''; list.push(v.memberNo); }); @@ -1288,7 +1296,7 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
참여위원참여위원
분류위원명 위원기수 참석여부동의여부동의일시
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+
'+v.memberUnit+''+agreeYn+''+agreeDt+'
'+v.memberName+''+v.memberUnit+'
참여위원참여위원
회의자료위원명 위원기수 참석여부동의여부동의일시
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp index 8cdb22ce..0db68292 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp @@ -299,7 +299,15 @@ function loadChamData(){ } else { html += '		'+agreeYn+''+agreeDt+'
- + @@ -1296,16 +1304,18 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, + + - + - diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp index d0d90b16..9db539e7 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp @@ -416,6 +416,16 @@ function loadChamData(){ } html += ''; + + /* 동의여부,일시 처리 */ + var agreeYn = ""; + var agreeDt = ""; + if(v.agreeCheck == "Y"){ + agreeYn = "O"; + agreeDt = v.agreeDt + } + html += ''; + html += ''; html += ''; list.push(v.memberNo); }); @@ -683,6 +693,8 @@ function setData(parentId){ html += ''; html += ''; html += ''; + html += ''; + html += ''; if(idxs != 0) { coms = ","; @@ -3752,7 +3764,7 @@ function nanumHisDel(){
참여위원참여위원
분야위원명 위원기수 참석여부동의여부동의일시
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+
'+agreeYn+''+agreeDt+'
'+v.memberName+''+v.memberUnit+'
- + @@ -3760,16 +3772,18 @@ function nanumHisDel(){ + + - + - diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp index 7b33a13e..5f5a70fa 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp @@ -293,7 +293,15 @@ function loadChamData(){ } else { html += ''; } - + /* 동의여부,일시 처리 */ + var agreeYn = ""; + var agreeDt = ""; + if(v.agreeCheck == "Y"){ + agreeYn = "O"; + agreeDt = v.agreeDt + } + html += ''; + html += ''; html += ''; list.push(v.memberNo); }); @@ -824,7 +832,7 @@ function resultGo(){
참여위원참여위원
분야위원명 위원기수 참석여부동의여부동의일시
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+
'+agreeYn+''+agreeDt+'
- + @@ -832,16 +840,18 @@ function resultGo(){ + + - + -
참여위원참여위원
분류위원명 위원기수 참석여부동의여부동의일시
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+