From c6016ded17864ece215fa7202082f00cde7079eb Mon Sep 17 00:00:00 2001 From: JIWOO Date: Tue, 7 Jan 2025 18:33:05 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=ED=98=91=EC=9D=98=ED=9A=8C=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20>=20=EC=B0=B8=EC=97=AC=EC=9C=84=EC=9B=90=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B0=8F=20=EC=A1=B0=ED=9A=8C=20=ED=95=AD=EB=AA=A9=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trublcfrncmng/trublcfrncmng_sql.xml | 23 ++- .../_extra/gtm/trublcfrncmng/endNticeEdit.jsp | 14 +- .../_extra/gtm/trublcfrncmng/redyEdit.jsp | 14 +- .../_extra/gtm/trublcfrncmng/redyWrite.jsp | 10 +- .../_extra/gtm/trublcfrncmng/redyWritePop.jsp | 164 +++++++++++++----- .../_extra/gtm/trublcfrncmng/reportEdit.jsp | 12 +- 6 files changed, 175 insertions(+), 62 deletions(-) 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 6dd08a93..c7b1b7af 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} || '%' + @@ -1041,7 +1058,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 += ''; - html += '선택된 참여위원이 없습니다.'; + html += '선택된 참여위원이 없습니다.'; html += ''; $("#cham").html(html); } @@ -2127,12 +2129,14 @@ function nanumCallTest(no, nanumSubject, officeGubun, officeDept){ - + - + + + @@ -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 += ''; html += ''; html += ''; html += ''; + html += ''; html += ''; var atTxt = ""; @@ -677,9 +679,11 @@ function setData(parentId){ html += ''; html += ''; html += ''; + html += ''; html += ''; html += ''; html += ''; + html += ''; html += ''; html += ''; html += ''; @@ -3460,17 +3464,21 @@ function nanumApiView(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, + + - + + + @@ -3479,12 +3487,12 @@ function nanumApiView(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, - + - '; + html += ''; html += ''; html += ''; html += ''; + html += ''; html += ''; html += ''; @@ -674,25 +676,27 @@ function fn_checkList() {
참여위원참여위원
분류협의회분야 소속 위원명직책 위원기수 참석여부 동의여부
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+
'+v.caseGubunName+''+v.caseFieldName+''+v.memberCompany+''+v.memberName+''+v.memberPosit+''+v.memberUnit+''+v.caseGubunName+''+v.caseFieldName+''+v.memberCompany+''+v.memberName+''+v.memberPosit+''+v.memberUnit+'
참여위원참여위원
회의자료협의회 분야 소속 위원명직책 위원기수 참석여부 동의여부
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp index d3e47cda..928bf8c0 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp @@ -151,9 +151,11 @@ function setData(parentId){ html += ''; html += ''; html += '		'+v.caseGubunName+''+v.caseFieldName+''+v.memberCompany+''+v.memberName+''+v.memberPosit+''+v.memberUnit+'
- + + + - + - '; + html += ''; html += ''; html += ''; html += ''; + html += ''; html += ''; var atTxt = ""; @@ -688,9 +690,11 @@ function setData(parentId){ html += ''; if(parentId == 'cham'){ //참여위원 + html += ''; html += ''; html += ''; html += ''; + html += ''; html += ''; html += ''; html += ''; @@ -3780,12 +3784,14 @@ function nanumHisDel(){
참여위원참여위원
회의자료협의회 분야 소속 위원명직책 위원기수 참석여부
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWritePop.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWritePop.jsp index bd808eff..2ee32778 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWritePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWritePop.jsp @@ -29,6 +29,7 @@ + @@ -58,23 +59,22 @@ @@ -247,10 +286,26 @@ -
전체 : 0건 + +
+
+
+ + + +
+
+
+
@@ -268,9 +323,12 @@ - - - + + + + + + @@ -287,9 +345,11 @@ + + @@ -299,6 +359,7 @@ +
순번협의회 분야 소속 위원명직책 위원기수
검색된 결과가 없습니다.
@@ -307,6 +368,17 @@ + + +
+ + + + + + +
+
 \ No newline at end of file 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 69f3156d..2ae0f926 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 @@ -397,9 +397,11 @@ function loadChamData(){ $.each(r.data, function(k,v) { cnt++; html += '
'+v.caseGubunName+''+v.caseFieldName+''+v.memberCompany+''+v.memberName+''+v.memberPosit+''+v.memberUnit+'
'+v.caseGubunName+''+v.caseFieldName+''+v.memberCompany+''+v.memberName+''+v.memberPosit+''+v.memberUnit+'
- + + + @@ -3794,12 +3800,12 @@ function nanumHisDel(){ - + -
참여위원참여위원
협의회 분야 소속 위원명직책 위원기수 참석여부 동의여부
선택된 참여위원이 없습니다.선택된 참여위원이 없습니다.
+