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 d69a45f5..7889a75f 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
@@ -347,7 +347,9 @@
NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEMBER_POSIT), '-') AS MEMBER_POSIT,
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,
- CASE_FIELD
+ CASE_FIELD,
+ (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN ) AS CASE_GUBUN_NAME,
+ CASE_GUBUN
FROM C_TRUBLMFCMM
USE_CHECK = 'Y'
@@ -381,6 +383,21 @@
#{item}
+
+ AND MEMBER_COMPANY LIKE '%' || #{searchVal} || '%'
+
+
+ AND (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEMBER_POSIT) = #{searchVal}
+
+
+ AND MEMBER_NAME LIKE '%' || #{searchVal} || '%'
+
+
+ AND (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN ) LIKE '%' || #{searchVal} || '%'
+
+
+ AND (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_FIELD ) LIKE '%' || #{searchVal} || '%'
+
@@ -1049,7 +1066,9 @@
(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 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
+ (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,
+ (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN ) AS CASE_GUBUN_NAME,
+ CASE_GUBUN
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 82bc0db8..6bee62ab 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
@@ -277,9 +277,11 @@ function loadChamData(){
$.each(r.data, function(k,v) {
cnt++;
html += '
';
+ html += '
'+v.caseGubunName+'
';
html += '
'+v.caseFieldName+'
';
html += '
'+v.memberCompany+'
';
html += '
'+v.memberName+'
';
+ html += '
'+v.memberPosit+'
';
html += '
'+v.memberUnit+'
';
if(v.attendCheck == 'Y') {
@@ -303,7 +305,7 @@ function loadChamData(){
$("#arrListcham").val(list);
}else{
html += '
@@ -2141,12 +2145,12 @@ function nanumCallTest(no, nanumSubject, officeGubun, officeDept){
-
선택된 참여위원이 없습니다.
+
선택된 참여위원이 없습니다.
-
+
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 437ca2af..5a1adaa2 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
@@ -355,9 +355,11 @@ function loadChamData(){
html += '';
html += '';
html += '';
+ html += '
'+v.caseGubunName+'
';
html += '
'+v.caseFieldName+'
';
html += '
'+v.memberCompany+'
';
html += '
'+v.memberName+'
';
+ html += '
'+v.memberPosit+'
';
html += '
'+v.memberUnit+'
';
var atTxt = "";
@@ -677,9 +679,11 @@ function setData(parentId){
html += '';
html += '';
html += '';
+ html += '