diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml index 7aa8d7fe..4d796730 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml @@ -32,7 +32,10 @@ DECODE(A.STATE,'4','delete','') AS DEL, DECODE(A.STATE,'5','true','false') AS CURSOR, B.SMS_MSG, - ST.MODIFY_ITEM + ST.MODIFY_ITEM, + tcsi.CID, + tcsi.CRT_USERID, + tcsi.CONST_USERID FROM TEMP_PROJECT_INFO A LEFT JOIN (SELECT * FROM (SELECT L.* @@ -41,7 +44,7 @@ WHERE RN = 1) B ON A.PROJECT_CODE = B.PROJECT_CODE LEFT JOIN TEMP_MANAGE_STATE ST ON ST.PROJECT_CODE = A.PROJECT_CODE AND ST.STATE = '5' - + LEFT JOIN TEMP_CONSTRUCT_SITE_INFO tcsi ON tcsi.PROJECT_CODE = A.PROJECT_CODE WHERE NVL(A.USE_YN,' ') <> 'N' AND A.USERID = #{userId} ]]> diff --git a/src/main/webapp/WEB-INF/views/web/index.jsp b/src/main/webapp/WEB-INF/views/web/index.jsp index a95bd04f..a00107a6 100644 --- a/src/main/webapp/WEB-INF/views/web/index.jsp +++ b/src/main/webapp/WEB-INF/views/web/index.jsp @@ -171,7 +171,11 @@ function kendoGrid() { title: "프로젝트명", template: function(data){ var param = "'"+data.reportType+"','"+data.projectCode+"','"+data.state+"'"; - var url = "" + data.projectName + ""; + let myStyle = ""; + if( data.cid && data.cid !== "" ) { // 발주기관 프로젝트와 연결된 프로젝트는 다른 색으로 표출한다. + myStyle = "style='color: #001dff; font-weight: 400;' "; + } + var url = "" + data.projectName +""; return url; }, attributes: { style:"text-align: left" } diff --git a/src/main/webapp/WEB-INF/views/web/input/geoLogging/density.jsp b/src/main/webapp/WEB-INF/views/web/input/geoLogging/density.jsp index ada38cc5..a5da92a9 100644 --- a/src/main/webapp/WEB-INF/views/web/input/geoLogging/density.jsp +++ b/src/main/webapp/WEB-INF/views/web/input/geoLogging/density.jsp @@ -673,7 +673,7 @@ function fn_grid_refresh(){

- ※ 모두 필수 입력입니다. 값을 입력할 수 없는 경우 -(하이픈)을 기입해주세요. + ※ 조사자, 공사시작일, 공사종료일 외 모두 필수 입력입니다. 값을 입력할 수 없는 경우 -(하이픈)을 기입해주세요.