diff --git a/src/main/java/go/kr/project/biz/common/controller/CommonContorller.java b/src/main/java/go/kr/project/biz/common/controller/CommonContorller.java new file mode 100644 index 0000000..8be3b61 --- /dev/null +++ b/src/main/java/go/kr/project/biz/common/controller/CommonContorller.java @@ -0,0 +1,52 @@ +package go.kr.project.biz.common.controller; + +import go.kr.project.biz.common.dto.CommonDto; +import go.kr.project.biz.common.service.CommonService; +import lombok.RequiredArgsConstructor; +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 java.util.List; + +@Controller +@RequiredArgsConstructor +public class CommonContorller { + + private final CommonService commonService; + + /** + * 디비에서 관리되는 코드 조회 + */ + @GetMapping("/common/code/find.ajax") + public ResponseEntity getCode(@ModelAttribute CommonDto.Request commonDto) { + + CommonDto.Response.CodeResult result = commonService.findCode(commonDto); + + + return ResponseEntity.ok(result); + } + + /** + * 차적조회 + */ + @GetMapping("/common/car/info/find.ajax") + public ResponseEntity findCarInfo() { + + return ResponseEntity.ok("aaa"); + } + + /** + * 표지조회 + */ + @GetMapping("/cover/info/find.ajax") + public ResponseEntity findCoverInfo() { + + return ResponseEntity.ok("aaa"); + } + + + + +} diff --git a/src/main/java/go/kr/project/biz/common/dto/CommonDto.java b/src/main/java/go/kr/project/biz/common/dto/CommonDto.java new file mode 100644 index 0000000..9891758 --- /dev/null +++ b/src/main/java/go/kr/project/biz/common/dto/CommonDto.java @@ -0,0 +1,45 @@ +package go.kr.project.biz.common.dto; + +import go.kr.project.domain.entity.CpBdong; +import go.kr.project.domain.entity.CpViolation; +import go.kr.project.vo.CpBdongVO; +import go.kr.project.vo.CpViolationVO; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +public class CommonDto { + + @Getter + @Setter + public static class Request { + + private String sggCode; + private String jobGroup; + private String code; + + + } + + + + + + + public static class Response { + + + @Getter + @Setter + @Builder + public static class CodeResult { + private List cpViolation; + private List cpBdong; + } + + + + } +} diff --git a/src/main/java/go/kr/project/biz/common/repository/CommonRepository.java b/src/main/java/go/kr/project/biz/common/repository/CommonRepository.java new file mode 100644 index 0000000..44e4c7a --- /dev/null +++ b/src/main/java/go/kr/project/biz/common/repository/CommonRepository.java @@ -0,0 +1,80 @@ +package go.kr.project.biz.common.repository; + +import com.querydsl.core.types.Projections; +import com.querydsl.jpa.impl.JPAQueryFactory; +import go.kr.project.biz.common.dto.CommonDto; +import go.kr.project.domain.entity.CpBdong; +import go.kr.project.domain.entity.CpViolation; +import go.kr.project.vo.CpBdongVO; +import go.kr.project.vo.CpViolationVO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; + +import static go.kr.project.domain.entity.QCpBdong.cpBdong; +import static go.kr.project.domain.entity.QCpViolation.cpViolation; + +@Repository +@RequiredArgsConstructor +public class CommonRepository { + + + private final JPAQueryFactory queryFactory; + + + public List findViolationCode(CommonDto.Request commonDto) { + + commonDto.setSggCode("41590"); + commonDto.setJobGroup("1"); + + List result = queryFactory + .select( + Projections.fields( + CpViolationVO.class, + cpViolation.id.vlCode, + cpViolation.id.vlJobgroup, + cpViolation.id.vlSggcode, + cpViolation.vlId, + cpViolation.vlAnswer, + cpViolation.vlEnable, + cpViolation.vlKeum, + cpViolation.vlLaw1, + cpViolation.vlLaw2, + cpViolation.vlLaw3, + cpViolation.vlSemok1, + cpViolation.vlSemok2, + cpViolation.vlSemok3 + ) + ) + .from(cpViolation) + .where( + cpViolation.id.vlJobgroup.eq(commonDto.getJobGroup()), + cpViolation.id.vlSggcode.eq(commonDto.getSggCode()) + ) + .fetch(); + + return result; + } + + public List findBdongCode() { + List result = queryFactory + .select( + Projections.fields( + CpBdongVO.class, + cpBdong.bdCode, + cpBdong.bdDongName, + cpBdong.bdSggName + ) + ) + .from(cpBdong) + .where(cpBdong.bdEnable.eq("1")) + .fetch(); + + return result; + } + + + + +} diff --git a/src/main/java/go/kr/project/biz/common/service/CommonService.java b/src/main/java/go/kr/project/biz/common/service/CommonService.java new file mode 100644 index 0000000..1465b60 --- /dev/null +++ b/src/main/java/go/kr/project/biz/common/service/CommonService.java @@ -0,0 +1,10 @@ +package go.kr.project.biz.common.service; + +import go.kr.project.biz.common.dto.CommonDto; +import org.springframework.stereotype.Service; + +import java.util.List; + +public interface CommonService { + CommonDto.Response.CodeResult findCode(CommonDto.Request commonDto); +} diff --git a/src/main/java/go/kr/project/biz/common/service/impl/CommonServiceImpl.java b/src/main/java/go/kr/project/biz/common/service/impl/CommonServiceImpl.java new file mode 100644 index 0000000..016e5f4 --- /dev/null +++ b/src/main/java/go/kr/project/biz/common/service/impl/CommonServiceImpl.java @@ -0,0 +1,34 @@ +package go.kr.project.biz.common.service.impl; + +import go.kr.project.biz.common.dto.CommonDto; +import go.kr.project.biz.common.repository.CommonRepository; +import go.kr.project.biz.common.service.CommonService; +import go.kr.project.vo.mapper.EntityVoMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class CommonServiceImpl implements CommonService { + + private final EntityVoMapper mapper; + private final CommonRepository commonRepository; + + @Override + public CommonDto.Response.CodeResult findCode(CommonDto.Request commonDto) { + + return CommonDto.Response.CodeResult.builder() + .cpViolation(commonRepository.findViolationCode(commonDto)) + .cpBdong(commonRepository.findBdongCode()) + .build(); + } + + + + + +} diff --git a/src/main/java/go/kr/project/biz/post/notice/status/controller/NoticeStatusController.java b/src/main/java/go/kr/project/biz/post/notice/status/controller/NoticeStatusController.java index 0e7b5b0..03fd56e 100644 --- a/src/main/java/go/kr/project/biz/post/notice/status/controller/NoticeStatusController.java +++ b/src/main/java/go/kr/project/biz/post/notice/status/controller/NoticeStatusController.java @@ -43,8 +43,8 @@ public class NoticeStatusController { dto.setPagingYn("N"); // 리스트 조회 - List result = preNoticeSendTargetService.findPreNoticeSendTarget(); +// List result = preNoticeSendTargetService.findPreNoticeSendTarget(); - return ApiResponseUtil.successWithGrid(result, dto); + return ApiResponseUtil.successWithGrid(null, dto); } } diff --git a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/controller/PreNoticeSendTargetController.java b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/controller/PreNoticeSendTargetController.java index 3ecd92d..0331d9e 100644 --- a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/controller/PreNoticeSendTargetController.java +++ b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/controller/PreNoticeSendTargetController.java @@ -32,6 +32,8 @@ public class PreNoticeSendTargetController { } + + @PostMapping("/post/preNotice/sendTarget/sendTargetList.ajax") public ResponseEntity getPreNoticeSendTargetistAjax(@ModelAttribute PreNoticeSendTargetDto.Request.Search dto) { @@ -43,7 +45,7 @@ public class PreNoticeSendTargetController { dto.setPagingYn("N"); // 리스트 조회 - List result = preNoticeSendTargetService.findPreNoticeSendTarget(); + List result = preNoticeSendTargetService.findPreNoticeSendTarget(dto); return ApiResponseUtil.successWithGrid(result, dto); } diff --git a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/dto/PreNoticeSendTargetDto.java b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/dto/PreNoticeSendTargetDto.java index d843a5e..31d07ab 100644 --- a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/dto/PreNoticeSendTargetDto.java +++ b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/dto/PreNoticeSendTargetDto.java @@ -15,8 +15,11 @@ public class PreNoticeSendTargetDto { public static class Request { + @Getter + @Setter public static class Search extends PagingVO { - + private String mmSggcode; + private String searchLawgb; } } diff --git a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/repository/PreNoticeSendTargetQueryDslRepository.java b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/repository/PreNoticeSendTargetQueryDslRepository.java index ed7fd64..7a08114 100644 --- a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/repository/PreNoticeSendTargetQueryDslRepository.java +++ b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/repository/PreNoticeSendTargetQueryDslRepository.java @@ -3,6 +3,7 @@ package go.kr.project.biz.post.preNotice.sendTarget.repository; import com.querydsl.core.types.Projections; import com.querydsl.jpa.impl.JPAQueryFactory; import go.kr.project.biz.post.preNotice.sendTarget.dto.PreNoticeSendTargetDto; +import go.kr.project.vo.code.MmStateEnum; import go.kr.project.vo.mapper.EntityVoMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -20,11 +21,10 @@ public class PreNoticeSendTargetQueryDslRepository { private final JPAQueryFactory queryFactory; - public List findPreNoticeSendTarget() { - String aaa = null; - String bbb = null; - String ccc = null; + + public List findPreNoticeSendTarget(PreNoticeSendTargetDto.Request.Search dto) { + List result = queryFactory .select( @@ -40,10 +40,10 @@ public class PreNoticeSendTargetQueryDslRepository { .leftJoin(cpUser).on(cpAnswer.asReuser.eq(cpUser.umCode)) .leftJoin(cpOwner).on(cpMain.mmOmcode.eq(cpOwner.omCode)) .where( - cpMain.mmSggcode.eq(aaa), - cpMain.mmState.eq(bbb), +// cpMain.mmSggcode.eq(dto.getMmSggcode()), + cpMain.mmState.eq(MmStateEnum.VEHICLE_CHECKED.getCode()), cpAnswer.asState.ne("0").or(cpAnswer.asState.isNull()), - cpMain.mmLawgb.eq(ccc) + cpMain.mmLawgb.eq(dto.getSearchLawgb()) ) .orderBy(cpMain.mmCarno.asc(), cpMain.mmDate.asc(), cpMain.mmTime.asc()) .fetch(); diff --git a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/service/PreNoticeSendTargetService.java b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/service/PreNoticeSendTargetService.java index 4c832c6..7c6441d 100644 --- a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/service/PreNoticeSendTargetService.java +++ b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/service/PreNoticeSendTargetService.java @@ -5,5 +5,5 @@ import go.kr.project.biz.post.preNotice.sendTarget.dto.PreNoticeSendTargetDto; import java.util.List; public interface PreNoticeSendTargetService { - List findPreNoticeSendTarget(); + List findPreNoticeSendTarget(PreNoticeSendTargetDto.Request.Search dto); } diff --git a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/service/impl/PreNoticeSendTargetServiceImpl.java b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/service/impl/PreNoticeSendTargetServiceImpl.java index 00cbcf7..99ff1fc 100644 --- a/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/service/impl/PreNoticeSendTargetServiceImpl.java +++ b/src/main/java/go/kr/project/biz/post/preNotice/sendTarget/service/impl/PreNoticeSendTargetServiceImpl.java @@ -19,18 +19,19 @@ public class PreNoticeSendTargetServiceImpl implements PreNoticeSendTargetServic private final PreNoticeSendTargetQueryDslRepository preNoticeSendTargetQueryDslRepository; @Override - public List findPreNoticeSendTarget() { + public List findPreNoticeSendTarget(PreNoticeSendTargetDto.Request.Search dto) { - List list = preNoticeSendTargetQueryDslRepository.findPreNoticeSendTarget(); + List list = preNoticeSendTargetQueryDslRepository.findPreNoticeSendTarget(dto); - list.stream().map(e -> - PreNoticeSendTargetDto.Response.PreNoticeSendTarget.builder() - .cpMain(mapper.toCpMainVO(e.getCpMain())) - .cpAnswer(mapper.toCpAnswerVO(e.getCpAnswer())) - .cpOwner(mapper.toCpOwnerVO(e.getCpOwner())) - .build() - ).collect(Collectors.toList()); + List result = + list.stream().map(e -> + PreNoticeSendTargetDto.Response.PreNoticeSendTarget.builder() + .cpMain(mapper.toCpMainVO(e.getCpMain())) + .cpAnswer(mapper.toCpAnswerVO(e.getCpAnswer())) + .cpOwner(mapper.toCpOwnerVO(e.getCpOwner())) + .build() + ).collect(Collectors.toList()); - return null; + return result; } } diff --git a/src/main/java/go/kr/project/biz/totalInfo/controller/TotalInfoController.java b/src/main/java/go/kr/project/biz/totalInfo/controller/TotalInfoController.java index adc1149..38ade26 100644 --- a/src/main/java/go/kr/project/biz/totalInfo/controller/TotalInfoController.java +++ b/src/main/java/go/kr/project/biz/totalInfo/controller/TotalInfoController.java @@ -31,6 +31,7 @@ public class TotalInfoController { return "biz/totalInfo/totalInfo_popup" + TilesConstants.POPUP; } + @GetMapping("/total/info/{mmCode}/info.ajax") @ResponseBody public ResponseEntity findTotalInfo(@PathVariable String mmCode) { diff --git a/src/main/webapp/WEB-INF/views/biz/minwon/init/init.jsp b/src/main/webapp/WEB-INF/views/biz/minwon/init/init.jsp index 2138483..7ad88b9 100644 --- a/src/main/webapp/WEB-INF/views/biz/minwon/init/init.jsp +++ b/src/main/webapp/WEB-INF/views/biz/minwon/init/init.jsp @@ -156,6 +156,7 @@ pagination.setItemsPerPage($('#perPageSelect').val()); pagination.reset(TuiGrid.instance.getRowCount()); pagination.movePageTo(1); + console.log(TuiGrid.instance) TuiGrid.instance.readData(1); }); diff --git a/src/main/webapp/WEB-INF/views/biz/post/preNotice/sendTarget/preNoticeSendTarget.jsp b/src/main/webapp/WEB-INF/views/biz/post/preNotice/sendTarget/preNoticeSendTarget.jsp index ebdbf70..377ccb3 100644 --- a/src/main/webapp/WEB-INF/views/biz/post/preNotice/sendTarget/preNoticeSendTarget.jsp +++ b/src/main/webapp/WEB-INF/views/biz/post/preNotice/sendTarget/preNoticeSendTarget.jsp @@ -55,6 +55,18 @@ + +
+
    +<%--
  • 답변완료(부과)
  • --%> +<%--
  • 답변완료(계도)
  • --%> +<%--
  • 답변완료(미부과)
  • --%> +<%--
  • 답변완료(수기)
  • --%> +<%--
  • 답변실패
  • --%> +<%--
  • 답변미대상
  • --%> +
+
+
@@ -72,8 +84,9 @@