diff --git a/src/main/java/go/kr/project/biz/minwon/init/service/impl/MinwonInitServiceImpl.java b/src/main/java/go/kr/project/biz/minwon/init/service/impl/MinwonInitServiceImpl.java index baa236a..865579d 100644 --- a/src/main/java/go/kr/project/biz/minwon/init/service/impl/MinwonInitServiceImpl.java +++ b/src/main/java/go/kr/project/biz/minwon/init/service/impl/MinwonInitServiceImpl.java @@ -18,8 +18,6 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class MinwonInitServiceImpl implements MinwonInitService { - private final CpMainRepository cpMainRepository; - private final CpAnswerRepository cpAnswerRepository; private final MinwonInitQueryDslRepository minwonInitQueryDslRepository; @Override @@ -30,6 +28,7 @@ public class MinwonInitServiceImpl implements MinwonInitService { // Enum Desc 변환 result.forEach(item -> { item.setMmDlgb(MmDlgbEnum.getDescByCode(item.getMmDlgb())); + //item. (MmDlgbEnum.getDescByCode(item.getMmDlgb())); }); diff --git a/src/main/java/go/kr/project/biz/minwon/wait/controller/MinwonWaitController.java b/src/main/java/go/kr/project/biz/minwon/wait/controller/MinwonWaitController.java index 2566647..910dcea 100644 --- a/src/main/java/go/kr/project/biz/minwon/wait/controller/MinwonWaitController.java +++ b/src/main/java/go/kr/project/biz/minwon/wait/controller/MinwonWaitController.java @@ -2,6 +2,7 @@ package go.kr.project.biz.minwon.wait.controller; import egovframework.constant.TilesConstants; +import egovframework.util.ApiResponseUtil; import go.kr.project.biz.minwon.wait.dto.MinwonWaitDto; import go.kr.project.biz.minwon.wait.service.MinwonWaitService; import io.swagger.v3.oas.annotations.Operation; @@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -40,11 +42,17 @@ public class MinwonWaitController { } @PostMapping("/minwon/wait/minwonwait-myBatis.ajax") - public ResponseEntity minwonwaitAjaxMybatis(@RequestBody MinwonWaitDto.Request.Search waitDto, String searchKeyword) { + public ResponseEntity minwonwaitAjaxMybatis(@ModelAttribute MinwonWaitDto.Request.Search waitDto, String searchKeyword) { + // 총 게시물 수 조회 + int totalCount = 0; + waitDto.setTotalCount(totalCount); - List result = minwonWaitService.findminwonwaitMybatis(waitDto); + // 페이징 처리를 위한 설정 + waitDto.setPagingYn("N"); - return ResponseEntity.ok(result); + List result = minwonWaitService.findminwonwaitSearchMybatis(waitDto, searchKeyword); + + return ApiResponseUtil.successWithGrid(result, waitDto); } } diff --git a/src/main/java/go/kr/project/biz/minwon/wait/dto/MinwonWaitDto.java b/src/main/java/go/kr/project/biz/minwon/wait/dto/MinwonWaitDto.java index 09c3076..c83d09a 100644 --- a/src/main/java/go/kr/project/biz/minwon/wait/dto/MinwonWaitDto.java +++ b/src/main/java/go/kr/project/biz/minwon/wait/dto/MinwonWaitDto.java @@ -1,6 +1,7 @@ package go.kr.project.biz.minwon.wait.dto; +import go.kr.project.system.common.model.PagingVO; import lombok.Getter; import lombok.Setter; @@ -9,8 +10,8 @@ public class MinwonWaitDto { @Getter @Setter - public static class Search { - private String mmRegse; + public static class Search extends PagingVO { + private String mmDlgb; } } @@ -30,6 +31,9 @@ public class MinwonWaitDto { private String asJsno; private String mmCarno; private String ccCause; + private String asIngb; + private String mmText; + private String asText; } } } diff --git a/src/main/java/go/kr/project/biz/minwon/wait/mapper/MinwonWaitMapper.java b/src/main/java/go/kr/project/biz/minwon/wait/mapper/MinwonWaitMapper.java index 6c12abc..4ac0e25 100644 --- a/src/main/java/go/kr/project/biz/minwon/wait/mapper/MinwonWaitMapper.java +++ b/src/main/java/go/kr/project/biz/minwon/wait/mapper/MinwonWaitMapper.java @@ -7,7 +7,5 @@ import java.util.List; @Mapper public interface MinwonWaitMapper { - List findminwonwaitMybatis(MinwonWaitDto.Request.Search waitDto); - List findminwonwaitSearchMybatis(MinwonWaitDto.Request.Search waitDto, String searchKeyword); } diff --git a/src/main/java/go/kr/project/biz/minwon/wait/service/MinwonWaitService.java b/src/main/java/go/kr/project/biz/minwon/wait/service/MinwonWaitService.java index 39b040c..591134b 100644 --- a/src/main/java/go/kr/project/biz/minwon/wait/service/MinwonWaitService.java +++ b/src/main/java/go/kr/project/biz/minwon/wait/service/MinwonWaitService.java @@ -7,7 +7,5 @@ import java.util.List; public interface MinwonWaitService { - List findminwonwaitMybatis(MinwonWaitDto.Request.Search waitDto); - List findminwonwaitSearchMybatis(MinwonWaitDto.Request.Search waitDto, String searchKeyword); } diff --git a/src/main/java/go/kr/project/biz/minwon/wait/service/impl/MinwonWaitServiceImpl.java b/src/main/java/go/kr/project/biz/minwon/wait/service/impl/MinwonWaitServiceImpl.java index ec61381..50b9434 100644 --- a/src/main/java/go/kr/project/biz/minwon/wait/service/impl/MinwonWaitServiceImpl.java +++ b/src/main/java/go/kr/project/biz/minwon/wait/service/impl/MinwonWaitServiceImpl.java @@ -6,6 +6,8 @@ import go.kr.project.biz.minwon.wait.mapper.MinwonWaitMapper; import go.kr.project.biz.minwon.wait.service.MinwonWaitService; import go.kr.project.domain.repo.cp.CpAnswerRepository; import go.kr.project.domain.repo.cp.CpMainRepository; +import go.kr.project.vo.code.AsIngbEnum; +import go.kr.project.vo.code.MmDlgbEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -22,15 +24,16 @@ public class MinwonWaitServiceImpl implements MinwonWaitService { // private final MinwonWaitQueryDsRepository minwonWaitQueryDsRepository; private final MinwonWaitMapper minwonWaitMapper; - @Override - public List findminwonwaitMybatis(MinwonWaitDto.Request.Search waitDto) { - List result = minwonWaitMapper.findminwonwaitMybatis(waitDto); - return result; - } - @Override public List findminwonwaitSearchMybatis(MinwonWaitDto.Request.Search waitDto, String searchKeyword) { List result = minwonWaitMapper.findminwonwaitSearchMybatis(waitDto, searchKeyword); + + result.forEach(item -> { + item.setMmDlgb(MmDlgbEnum.getDescByCode(item.getMmDlgb())); + item.setAsIngb(AsIngbEnum.getDescByCode(item.getAsIngb())); + }); + + return result; } diff --git a/src/main/java/go/kr/project/vo/code/AsIngbEnum.java b/src/main/java/go/kr/project/vo/code/AsIngbEnum.java index e21d36e..8bb1968 100644 --- a/src/main/java/go/kr/project/vo/code/AsIngbEnum.java +++ b/src/main/java/go/kr/project/vo/code/AsIngbEnum.java @@ -8,21 +8,21 @@ import java.util.Map; @Getter public enum AsIngbEnum { // APP(110, "생활불편신고"), // 안전신문고(120)으로 통합됨. - SMG_SEAL(120, "안전신문고"), - POLICE(130, "경찰청"), - SMG(183, "국민신문고"), - ETC(181, "기타"); + SMG_SEAL("120", "안전신문고"), + POLICE("130", "경찰청"), + SMG("183", "국민신문고"), + ETC("181", "기타"); - private int code; + private String code; private String desc; - AsIngbEnum(int code, String desc) { + AsIngbEnum(String code, String desc) { this.code = code; this.desc = desc; } - private static final Map CODE_MAP = new HashMap<>(); + private static final Map CODE_MAP = new HashMap<>(); private static final Map DESC_MAP = new HashMap<>(); static { @@ -33,19 +33,19 @@ public enum AsIngbEnum { } // code → desc - public static String getDescByCode(int code) { + public static String getDescByCode(String code) { AsIngbEnum e = CODE_MAP.get(code); return e != null ? e.desc : null; } // desc → code - public static Integer getCodeByDesc(String desc) { + public static String getCodeByDesc(String desc) { AsIngbEnum e = DESC_MAP.get(desc); return e != null ? e.code : null; } // code → enum - public static AsIngbEnum fromCode(int code) { + public static AsIngbEnum fromCode(String code) { return CODE_MAP.get(code); } diff --git a/src/main/resources/mybatis/mapper/biz/minwon/MinwonWaitMapper_maria.xml b/src/main/resources/mybatis/mapper/biz/minwon/MinwonWaitMapper_maria.xml index 15ccf2a..51f5626 100644 --- a/src/main/resources/mybatis/mapper/biz/minwon/MinwonWaitMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/biz/minwon/MinwonWaitMapper_maria.xml @@ -5,45 +5,33 @@ - - diff --git a/src/main/webapp/WEB-INF/views/biz/minwon/wait/wait.jsp b/src/main/webapp/WEB-INF/views/biz/minwon/wait/wait.jsp index d91c964..0ef3fc3 100644 --- a/src/main/webapp/WEB-INF/views/biz/minwon/wait/wait.jsp +++ b/src/main/webapp/WEB-INF/views/biz/minwon/wait/wait.jsp @@ -7,39 +7,31 @@
-
+
+
    +    +    +
+
    -
  • 검색구분
  • -
  • - -
  • -
  • 검색어
  • -
  • -
  • 담당자지정
  • -
  • -
  • 사용여부
  • +
  • 등록구분
  • - + + + + + + + +
  • -
  • 접수일자 지정
  • -
  • - ~ - -
  • @@ -47,8 +39,8 @@
    • / Pages @@ -68,76 +60,99 @@
+