diff --git a/list.txt b/list.txt index 0fa9149f..22ca2219 100644 --- a/list.txt +++ b/list.txt @@ -1,9 +1,15 @@ -src\main\resources\egovframework\egovProps\globals.properties +#src\main\resources\egovframework\egovProps\globals.properties #src\main\java\geoinfo\regi\manageList\ManageExcelUploadProc01Controller.java #src\main\webapp\WEB-INF\views\web\input\excel_step00.jsp #src\main\webapp\WEB-INF\views\web\input\excel_step31.jsp #src\main\webapp\com\css\common.v2.0.css #src\main\webapp\com\css\common.v2.0.css.map -src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp +#src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp src\main\webapp\js\map\main\map.js +src\main\webapp\WEB-INF\views\drilling\common\includeTopMenu.jsp +src\main\webapp\WEB-INF\views\drilling\home\drilling_index.jsp +src\main\webapp\com\css\common.v2.0.css +src\main\webapp\com\css\common.v2.0.css.map +src\main\webapp\com\img\drilling\maps\dokdo_active_alone.svg +src\main\webapp\com\img\drilling\maps\uleungdo_active_alone.svg \ No newline at end of file diff --git a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java index 07235a26..7619e76b 100644 --- a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java +++ b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java @@ -139,10 +139,10 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { projectStateCodeName = "검수 중"; break; case 4: - projectStateCodeName = "수정 요청"; + projectStateCodeName = "수정 요청_"; break; case 5: - projectStateCodeName = "검수 완료"; + projectStateCodeName = "수정 요청"; break; case 6: projectStateCodeName = "등록 완료"; diff --git a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp index 9329ef99..d6fe2316 100644 --- a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp @@ -26,14 +26,16 @@
-
- -
-
    -
  • -
-
-