diff --git a/src/main/java/geoinfo/regi/manageList/ManageListController.java b/src/main/java/geoinfo/regi/manageList/ManageListController.java index dbd9a528..fccf4aaf 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageListController.java +++ b/src/main/java/geoinfo/regi/manageList/ManageListController.java @@ -275,18 +275,22 @@ public class ManageListController { strUtil sUtil = new strUtil(); String widthSize = sUtil.checkNull((String)params.get("width")); - String heightSize = "395"; + String heightSize = "665"; String PROJECT_CODE = sUtil.checkNull((String)params.get("PROJECT_CODE")); String PROC = sUtil.checkNull((String)params.get("PROC")); - + ArrayList MODI_ITEM_LIST = new ArrayList<>(); // "수정요청 대상" 체크 할 항목 조회 + String MODEIFY_CALL_REASON = ""; if ("view".equals(PROC)) { EgovMap result = masterService.getModeifyCallReason(params); if (result != null) { MODEIFY_CALL_REASON = (sUtil.checkNull(result.get("modeifyCallReason").toString())).replaceAll("\n","
"); } + } else { + MODI_ITEM_LIST = masterService.selectModifyItem(params); } resultList.put("modeifyCallReason", MODEIFY_CALL_REASON); + resultList.put("modiItemList", MODI_ITEM_LIST); resultList.put("heightSize", heightSize); resultList.put("widthSize", widthSize); resultList.put("projectCode", PROJECT_CODE); diff --git a/src/main/java/geoinfo/regi/manageList/service/ManageListMapper.java b/src/main/java/geoinfo/regi/manageList/service/ManageListMapper.java index 05828753..616283b7 100644 --- a/src/main/java/geoinfo/regi/manageList/service/ManageListMapper.java +++ b/src/main/java/geoinfo/regi/manageList/service/ManageListMapper.java @@ -24,5 +24,9 @@ public interface ManageListMapper { public EgovMap updateModeifyTbl(HashMap params) throws Exception; public EgovMap updateModeifyUser(HashMap params) throws Exception; + + public ArrayList selectModifyItem(HashMap params) throws Exception; + + public ArrayList selectModifyItemBitmask(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/manageList/service/ManageListService.java b/src/main/java/geoinfo/regi/manageList/service/ManageListService.java index c3493d34..ee533930 100644 --- a/src/main/java/geoinfo/regi/manageList/service/ManageListService.java +++ b/src/main/java/geoinfo/regi/manageList/service/ManageListService.java @@ -23,4 +23,8 @@ public interface ManageListService { public EgovMap updateModeifyTbl(HashMap params) throws Exception; public EgovMap updateModeifyUser(HashMap params) throws Exception; + + public ArrayList selectModifyItem(HashMap params) throws Exception; + + public ArrayList selectModifyItemBitmask(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/manageList/service/impl/ManageListServiceImpl.java b/src/main/java/geoinfo/regi/manageList/service/impl/ManageListServiceImpl.java index 5c9cfe42..ca73f384 100644 --- a/src/main/java/geoinfo/regi/manageList/service/impl/ManageListServiceImpl.java +++ b/src/main/java/geoinfo/regi/manageList/service/impl/ManageListServiceImpl.java @@ -57,4 +57,14 @@ public class ManageListServiceImpl implements ManageListService { return manageListMapper.updateModeifyUser(params); } + @Override + public ArrayList selectModifyItem(HashMap params) throws Exception { + return manageListMapper.selectModifyItem(params); + } + + @Override + public ArrayList selectModifyItemBitmask(HashMap params) throws Exception { + return manageListMapper.selectModifyItemBitmask(params); + } + } diff --git a/src/main/java/geoinfo/regi/status/RegiController.java b/src/main/java/geoinfo/regi/status/RegiController.java index 40a793ec..cf1f515f 100644 --- a/src/main/java/geoinfo/regi/status/RegiController.java +++ b/src/main/java/geoinfo/regi/status/RegiController.java @@ -374,6 +374,7 @@ public class RegiController { String PROJECT_CODE = files[k].toString();// 확인필요..데이터이름이 제대로 들어오는가????? String PROC = sUtil.checkNull(String.valueOf(params.get("PROC"))); String MODEIFY_CALL_REASON = sUtil.checkNull(String.valueOf(params.get("MODEIFY_CALL_REASON"))); + String MODIFY_ITEM = sUtil.checkNull(String.valueOf(params.get("MODIFY_ITEM"))); params.put("PROJECT_CODE", PROJECT_CODE); params.put("USERID", request.getSession().getAttribute("USERID"));//userid는 param 값 가져오는 지 확인. try { @@ -553,7 +554,7 @@ public class RegiController { // TEMP_MANAGE_STATE INSERT params.put("STATE", "5");// 수정요청으로 변경 params.put("MODEIFY_CALL_REASON", MODEIFY_CALL_REASON);// 수정요청으로 - // 변경 + params.put("MODIFY_ITEM", MODIFY_ITEM); // 변경 affectRow += masterService.mergeStateInsertModeify(params); // ------------------------------------------------------- @@ -608,6 +609,7 @@ public class RegiController { String PROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("PROJECT_CODE"))); String PROC = sUtil.checkNull(String.valueOf(params.get("PROC"))); String MODEIFY_CALL_REASON = sUtil.checkNull(String.valueOf(params.get("MODEIFY_CALL_REASON"))); + String MODIFY_ITEM = sUtil.checkNull(String.valueOf(params.get("MODIFY_ITEM"))); params.put("PROJECT_CODE", PROJECT_CODE); params.put("USERID", request.getSession().getAttribute("USERID")); try { @@ -768,7 +770,8 @@ public class RegiController { // TEMP_MANAGE_STATE INSERT params.put("STATE", "5");// 수정요청으로 변경 params.put("MODEIFY_CALL_REASON", MODEIFY_CALL_REASON);// 수정요청으로 - // 변경 + params.put("MODIFY_ITEM", MODIFY_ITEM); // 변경 + affectRow += masterService.mergeStateInsertModeify(params); // ------------------------------------------------------- diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml index 1b442736..72b8b530 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml @@ -395,4 +395,16 @@ ]]> + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml index e46e2acb..de3164c9 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml @@ -314,8 +314,8 @@ - @@ -82,6 +135,7 @@ function fn_smsGetResult(returnValue) {
+
@@ -91,15 +145,92 @@ function fn_smsGetResult(returnValue) { -
${resultList.modeifyCallReason}
+
${resultList.modeifyCallReason}
 -
-
저장
+
+ +
+
수정요청 대상
+
+ +
    + + + + + +
+ + + +
  • + ${item.GRP_NAME} +
      + + +
    • + +
      • + + + + +
    +
    • + + +<%--
  • 시험 데이터 미입력/그래프 누락 +
      +
      • +
      • +
    +
    • +
  • 프로젝트 기본 정보 미기재 +
      +
      • +
      • +
      • +
      • + +
    +
    • +
  • 파일 누락·단위 오류 등 +
      +
      • +
      • +
      • +
    +
    • +
  • 첨부 파일 요청 +
      +
      • +
      • +
    +
    • +
  • 정밀 품질 보정 요청 +
      +
      • +
      • +
      • +
    +
    • --%> + +
    +
    + + + +
    저장
    +     +