From fdab55778d7237c4a0dfb54087b31a6c2643699d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EB=9D=BD=EC=B6=98?= Date: Tue, 25 Nov 2025 17:22:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20=EB=AF=BC=EC=9B=90=EC=A0=91?= =?UTF-8?q?=EC=88=98=20=EB=8C=80=EA=B8=B0=EC=9E=90=EB=A3=8C=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/minwon/init/dto/SampleDto.java | 3 +- .../wait/controller/MinwonWaitController.java | 50 +++ .../biz/minwon/wait/dto/MinwonWaitDto.java | 35 ++ .../minwon/wait/mapper/MinwonWaitMapper.java | 13 + .../MinwonWaitQueryDsRepository.java | 178 ++++++++++ .../wait/service/MinwonWaitService.java | 13 + .../service/impl/MinwonWaitServiceImpl.java | 37 +++ .../biz/minwon/MinwonWaitMapper_maria.xml | 50 +++ .../WEB-INF/views/biz/minwon/wait/wait.jsp | 313 ++++++++++++++++++ 9 files changed, 691 insertions(+), 1 deletion(-) create mode 100644 src/main/java/go/kr/project/biz/minwon/wait/controller/MinwonWaitController.java create mode 100644 src/main/java/go/kr/project/biz/minwon/wait/dto/MinwonWaitDto.java create mode 100644 src/main/java/go/kr/project/biz/minwon/wait/mapper/MinwonWaitMapper.java create mode 100644 src/main/java/go/kr/project/biz/minwon/wait/repository/MinwonWaitQueryDsRepository.java create mode 100644 src/main/java/go/kr/project/biz/minwon/wait/service/MinwonWaitService.java create mode 100644 src/main/java/go/kr/project/biz/minwon/wait/service/impl/MinwonWaitServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/biz/minwon/MinwonWaitMapper_maria.xml create mode 100644 src/main/webapp/WEB-INF/views/biz/minwon/wait/wait.jsp diff --git a/src/main/java/go/kr/project/biz/minwon/init/dto/SampleDto.java b/src/main/java/go/kr/project/biz/minwon/init/dto/SampleDto.java index 95075f6..31bd082 100644 --- a/src/main/java/go/kr/project/biz/minwon/init/dto/SampleDto.java +++ b/src/main/java/go/kr/project/biz/minwon/init/dto/SampleDto.java @@ -3,7 +3,8 @@ package go.kr.project.biz.minwon.init.dto; import lombok.Getter; import lombok.Setter; -public class SampleDto { +public class +SampleDto { // 요즘 트렌드에 맞춰 이너클레스를 사용한다. // Request(파라미터를 받을 형식 객체) 와 Response(응답해줄 형식 객체)로 나눠서 관리한다. 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 new file mode 100644 index 0000000..2566647 --- /dev/null +++ b/src/main/java/go/kr/project/biz/minwon/wait/controller/MinwonWaitController.java @@ -0,0 +1,50 @@ +package go.kr.project.biz.minwon.wait.controller; + + +import egovframework.constant.TilesConstants; +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; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import lombok.RequiredArgsConstructor; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +@Controller +@Slf4j +@RequiredArgsConstructor + +public class MinwonWaitController { + + private final MinwonWaitService minwonWaitService; + + /** + * 민원접수 대기자료 목록 페이지 + * @return 뷰 경로 + */ + @GetMapping("/minwon/wait/wait.do") + @Operation(summary = "민원접수 대기자료", description="민원접수 대기자료 목록 페이지를 조회합니다.") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "조회 성공") + }) + public String minwonWaitView(){ + + return "biz/minwon/wait/wait" + TilesConstants.BASE; + } + + @PostMapping("/minwon/wait/minwonwait-myBatis.ajax") + public ResponseEntity minwonwaitAjaxMybatis(@RequestBody MinwonWaitDto.Request.Search waitDto, String searchKeyword) { + + List result = minwonWaitService.findminwonwaitMybatis(waitDto); + + return ResponseEntity.ok(result); + } + +} 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 new file mode 100644 index 0000000..09c3076 --- /dev/null +++ b/src/main/java/go/kr/project/biz/minwon/wait/dto/MinwonWaitDto.java @@ -0,0 +1,35 @@ +package go.kr.project.biz.minwon.wait.dto; + + +import lombok.Getter; +import lombok.Setter; + +public class MinwonWaitDto { + public static class Request { + + @Getter + @Setter + public static class Search { + private String mmRegse; + } + + } + + public static class Response { + @Getter + @Setter + public static class cpMainAnswerCancel{ + private String mmCode; + private String mmDlgb; + private String asBbsNo; + private String mmSgnm; + private String mmSgtel; + private String mmDate; + private String asLimitDt; + private String mmIndt; + private String asJsno; + private String mmCarno; + private String ccCause; + } + } +} 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 new file mode 100644 index 0000000..6c12abc --- /dev/null +++ b/src/main/java/go/kr/project/biz/minwon/wait/mapper/MinwonWaitMapper.java @@ -0,0 +1,13 @@ +package go.kr.project.biz.minwon.wait.mapper; + +import go.kr.project.biz.minwon.wait.dto.MinwonWaitDto; +import org.apache.ibatis.annotations.Mapper; + +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/repository/MinwonWaitQueryDsRepository.java b/src/main/java/go/kr/project/biz/minwon/wait/repository/MinwonWaitQueryDsRepository.java new file mode 100644 index 0000000..eeb8fbe --- /dev/null +++ b/src/main/java/go/kr/project/biz/minwon/wait/repository/MinwonWaitQueryDsRepository.java @@ -0,0 +1,178 @@ +//package go.kr.project.biz.minwon.wait.repository; +// +//import com.querydsl.core.types.Projections; +//import com.querydsl.jpa.impl.JPAQueryFactory; +//import lombok.RequiredArgsConstructor; +//import org.springframework.stereotype.Repository; +// +//import java.util.List; +// +//import static go.kr.project.domain.entity.QCpAnswer.cpAnswer; +//import static go.kr.project.domain.entity.QCpMain.cpMain; +// +//@Repository +//@RequiredArgsConstructor +//public class MinwonWaitQueryDsRepository { +// +// private final JPAQueryFactory queryFactory; +// +// public List findWaitAnswers(MinwonWaitDto.Request.SearchMinwonWaitList dto) { +// +// List result = queryFactory +// .select( +// Projections.fields( +// MinwonWaitDto.Response.WaitAnswers.class, +// cpAnswer.asJsdate, +// cpAnswer.asJsno, +// cpAnswer.asJsnoM, +// cpAnswer.asState, +// cpAnswer.asPostCd, +// cpAnswer.asLimitDt, +// cpAnswer.asPostDt, +// cpMain.mmCarno +// ) +// ) +// .from(cpMain) +// .innerJoin(cpAnswer).on(cpMain.mmCode.eq(cpAnswer.asMmcode)) +// .where( +// //cpAnswer.asState.eq("01") +// cpMain.mmState.eq("01"), +// cpAnswer.asState.eq("0") +// ) +// .fetch(); +// return result; +// } +// +// public List findWaitAnswersSearch(MinwonWaitDto.Request.SearchMinwonWaitList dto, String searchCondition, String searchKeyword, String searchStartDt, String searchEndDt) { +// +// if (searchCondition.equals("jsdate")) { +// List result = queryFactory +// .select( +// Projections.fields( +// MinwonWaitDto.Response.WaitAnswers.class, +// cpAnswer.asJsdate, +// cpAnswer.asJsno, +// cpAnswer.asJsnoM, +// cpAnswer.asState, +// cpAnswer.asPostCd, +// cpAnswer.asLimitDt, +// cpAnswer.asPostDt, +// cpMain.mmCarno +// ) +// ) +// .from(cpMain) +// .innerJoin(cpAnswer).on(cpMain.mmCode.eq(cpAnswer.asMmcode)) +// .where( +// cpMain.mmState.eq("01"), +//// cpAnswer.asState.eq("0"), +// cpAnswer.asJsdate.between(searchStartDt, searchEndDt) +// ) +// .fetch(); +// return result; +// +// } else if (searchCondition.equals("jsno")) { +// List result = queryFactory +// .select( +// Projections.fields( +// MinwonWaitDto.Response.WaitAnswers.class, +// cpAnswer.asJsdate, +// cpAnswer.asJsno, +// cpAnswer.asJsnoM, +// cpAnswer.asState, +// cpAnswer.asPostCd, +// cpAnswer.asLimitDt, +// cpAnswer.asPostDt, +// cpMain.mmCarno +// ) +// ) +// .from(cpMain) +// .innerJoin(cpAnswer).on(cpMain.mmCode.eq(cpAnswer.asMmcode)) +// .where( +// cpMain.mmState.eq("01"), +//// cpAnswer.asState.eq("0"), +// cpAnswer.asJsno.like("%" + searchKeyword + "%") +// ) +// .fetch(); +// return result; +// +// } else if (searchCondition.equals("iimitdt")) { +// List result = queryFactory +// .select( +// Projections.fields( +// MinwonWaitDto.Response.WaitAnswers.class, +// cpAnswer.asJsdate, +// cpAnswer.asJsno, +// cpAnswer.asJsnoM, +// cpAnswer.asState, +// cpAnswer.asPostCd, +// cpAnswer.asLimitDt, +// cpAnswer.asPostDt, +// cpMain.mmCarno +// ) +// ) +// .from(cpMain) +// .innerJoin(cpAnswer).on(cpMain.mmCode.eq(cpAnswer.asMmcode)) +// .where( +// cpMain.mmState.eq("01"), +//// cpAnswer.asState.eq("0"), +// cpAnswer.asLimitDt.between(searchStartDt, searchEndDt) +// ) +// .fetch(); +// return result; +// +// } else { +// List result = queryFactory +// .select( +// Projections.fields( +// MinwonWaitDto.Response.WaitAnswers.class, +// cpAnswer.asJsdate, +// cpAnswer.asJsno, +// cpAnswer.asJsnoM, +// cpAnswer.asState, +// cpAnswer.asPostCd, +// cpAnswer.asLimitDt, +// cpAnswer.asPostDt, +// cpMain.mmCarno +// ) +// ) +// .from(cpMain) +// .innerJoin(cpAnswer).on(cpMain.mmCode.eq(cpAnswer.asMmcode)) +// .where( +// cpMain.mmState.eq("01"), +//// cpAnswer.asState.eq("0") +// cpAnswer.asJsno.like("%" +searchKeyword + "%") +// ) +// .fetch(); +// return result; +// } +// +// +///* +// List result = queryFactory +// .select( +// Projections.fields( +// MinwonWaitDto.Response.WaitAnswers.class, +// cpAnswer.asJsdate, +// cpAnswer.asJsno, +// cpAnswer.asJsnoM, +// cpAnswer.asState, +// cpAnswer.asPostCd, +// cpAnswer.asLimitDt, +// cpAnswer.asPostDt, +// cpMain.mmCarno +// ) +// ) +// .from(cpMain) +// .innerJoin(cpAnswer).on(cpMain.mmCode.eq(cpAnswer.asMmcode)) +// .where( +// cpMain.mmState.eq("01"), +//// cpAnswer.asState.eq("0"), +// cpAnswer.asJsno.like("%" + searchKeyword + "%") +// ) +// .fetch(); +// return result; +// +// */ +// +// } +//} 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 new file mode 100644 index 0000000..39b040c --- /dev/null +++ b/src/main/java/go/kr/project/biz/minwon/wait/service/MinwonWaitService.java @@ -0,0 +1,13 @@ +package go.kr.project.biz.minwon.wait.service; + + +import go.kr.project.biz.minwon.wait.dto.MinwonWaitDto; + +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 new file mode 100644 index 0000000..ec61381 --- /dev/null +++ b/src/main/java/go/kr/project/biz/minwon/wait/service/impl/MinwonWaitServiceImpl.java @@ -0,0 +1,37 @@ +package go.kr.project.biz.minwon.wait.service.impl; + + +import go.kr.project.biz.minwon.wait.dto.MinwonWaitDto; +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 lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +@RequiredArgsConstructor +public class MinwonWaitServiceImpl implements MinwonWaitService { + + private final CpMainRepository cpMainRepository; + private final CpAnswerRepository cpAnswerRepository; +// 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); + return result; + } + +} diff --git a/src/main/resources/mybatis/mapper/biz/minwon/MinwonWaitMapper_maria.xml b/src/main/resources/mybatis/mapper/biz/minwon/MinwonWaitMapper_maria.xml new file mode 100644 index 0000000..15ccf2a --- /dev/null +++ b/src/main/resources/mybatis/mapper/biz/minwon/MinwonWaitMapper_maria.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + 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 new file mode 100644 index 0000000..d91c964 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/biz/minwon/wait/wait.jsp @@ -0,0 +1,313 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + +
+
+
+
+
+ +
+
+
+
+
+
    +
  • 검색구분
    • +
  • + +
    • +
  • 검색어
    • +
    • +
  • 담당자지정
    • +
    • +
  • 사용여부
    • +
  • + +
    • +
  • 접수일자 지정
    • +
  • + ~ + +
    • +
  • + +
    • +
+
    +
  • + + / Pages +
    • +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + From 0cfd177f5c092f2a91a904694f14795432440cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EB=9D=BD=EC=B6=98?= Date: Thu, 27 Nov 2025 17:33:43 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat=20:=201.=20=EB=AF=BC=EC=9B=90=EC=A0=91?= =?UTF-8?q?=EC=88=98=20=EB=8C=80=EA=B8=B0=EC=9E=90=EB=A3=8C=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=A4=91=202.=20AsIngbEnum=20code=20Type=20Int=20->?= =?UTF-8?q?=20String?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MinwonInitServiceImpl.java | 3 +- .../wait/controller/MinwonWaitController.java | 14 +- .../biz/minwon/wait/dto/MinwonWaitDto.java | 8 +- .../minwon/wait/mapper/MinwonWaitMapper.java | 2 - .../wait/service/MinwonWaitService.java | 2 - .../service/impl/MinwonWaitServiceImpl.java | 15 +- .../go/kr/project/vo/code/AsIngbEnum.java | 20 +- .../biz/minwon/MinwonWaitMapper_maria.xml | 60 ++-- .../WEB-INF/views/biz/minwon/wait/wait.jsp | 305 +++++++++--------- 9 files changed, 211 insertions(+), 218 deletions(-) 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 @@
+