From 617fbfd2124758875688f10b695cdde7548775c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 10 May 2023 10:48:11 +0900 Subject: [PATCH] =?UTF-8?q?requestLog=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.=20=EB=B6=88=EB=B2=95=EC=A1=B0=EC=97=85=20=EC=99=B8?= =?UTF-8?q?=EA=B5=AD=EC=96=B4=EC=84=A0=20=EC=B2=98=EB=A6=AC=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EB=8F=99?= =?UTF-8?q?=EC=9E=91=20=EC=88=98=EC=A0=95.=20=ED=86=B5=EC=97=AD=EC=9D=B8?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20=EB=8F=99=EC=9E=91=20=EC=88=98=EC=A0=95?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbnt/faisp/config/FaispInterceptor.java | 22 +- .../ProcessResultController.java | 218 +++---- .../mapper/ProcessResultMapper.java | 6 +- .../model/processResult/ProcessResult.java | 2 +- .../service/ProcessResultService.java | 4 + .../main/translator/model/Translator.java | 2 + .../repository/TranslatorRepository.java | 5 + .../translator/service/TranslatorService.java | 4 +- .../mybatisMapper/CrackdownStatusMapper.xml | 1 + .../mybatisMapper/ProcessResultMapper.xml | 149 ++--- .../mybatisMapper/TranslatorMapper.xml | 563 +++++++++--------- 11 files changed, 506 insertions(+), 470 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java b/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java index b5fbdc30..ce7fb3c7 100644 --- a/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java +++ b/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java @@ -41,15 +41,17 @@ public class FaispInterceptor implements HandlerInterceptor { @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { //페이지 렌더링 후 실행. - String uri = request.getRequestURI(); - UserRequestLog log = new UserRequestLog(); - log.setContactIp(Utils.getClientIP(request)); - log.setRequestUrl(uri); - log.setRequestMethod(request.getMethod()); - log.setSearchParams(request.getQueryString()); - log.setHandlerDescription(((HandlerMethod) handler).toString()); - log.setUserOrgan((String) request.getSession().getAttribute("userOrgan")); - log.setUserBelong((String) request.getSession().getAttribute("belongValue")); - userLogService.saveRequestLog(log); + if(handler instanceof HandlerMethod){ + String uri = request.getRequestURI(); + UserRequestLog log = new UserRequestLog(); + log.setContactIp(Utils.getClientIP(request)); + log.setRequestUrl(uri); + log.setRequestMethod(request.getMethod()); + log.setSearchParams(request.getQueryString()); + log.setHandlerDescription(((HandlerMethod) handler).toString()); + log.setUserOrgan((String) request.getSession().getAttribute("userOrgan")); + log.setUserBelong((String) request.getSession().getAttribute("belongValue")); + userLogService.saveRequestLog(log); + } } } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java index ab6959bf..582afa47 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java @@ -21,132 +21,140 @@ import java.util.List; @RequestMapping("/faStatistics") public class ProcessResultController { - private final AuthMgtService authMgtService; - private final ProcessResultService processResultService; - private final ViolationRepository violationRepository; - private final CrackdownStatusRepository crackdownStatusRepository; - private final FishingBoatRepository fishingBoatRepository; - private final ProcessResultRepository processResultRepository; + private final AuthMgtService authMgtService; + private final ProcessResultService processResultService; + private final ViolationRepository violationRepository; + private final CrackdownStatusRepository crackdownStatusRepository; + private final FishingBoatRepository fishingBoatRepository; + private final ProcessResultRepository processResultRepository; - @RequestMapping("/processResult") - public ModelAndView processResult(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult) { - ModelAndView mav = new ModelAndView("faStatistics/processResult/processResult"); + @RequestMapping("/processResult") + public ModelAndView processResult(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult) { + ModelAndView mav = new ModelAndView("faStatistics/processResult/processResult"); - //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/processResult").get(0).getAccessAuth(); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/processResult").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); + mav.addObject("accessAuth", accessAuth); - processResult.setQueryInfo(); - List processResultList = processResultService.selectProcessResultList(processResult); - - for (ProcessResult pr:processResultList) { - pr.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(pr.getCdsKey()).orElse(null)); - pr.setFishingBoat(fishingBoatRepository.findByCdsKey(pr.getCdsKey()).orElse(null)); - pr.setViolationList(violationRepository.findByFbKey(pr.getFishingBoat().getFbKey())); - } - - mav.addObject("processResultList", processResultList); - mav.addObject("searchParams", processResult); - return mav; + processResult.setQueryInfo(); + if(processResult.getYear()==null){ + processResult.setYear(LocalDateTime.now().getYear()); + } + List yearList = processResultService.selectProcessResultYearParam(processResult); + if(!yearList.contains(processResult.getYear())){ + yearList.add(processResult.getYear()); } - @GetMapping("/processResult/processResultViewModal") - public ModelAndView processResultViewModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ - ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultViewModal"); - processResult = processResultService.selectProcessResult(processResult.getPrKey()); - processResult.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); - processResult.setFbKey(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getFbKey()); - processResult.setBoatNameKr(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getBoatNameKr()); - processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey())); + List processResultList = processResultService.selectProcessResultList(processResult); - mav.addObject("processResult", processResult); - mav.addObject("userSeq",loginUser.getUserSeq()); - //메뉴권한 확인 - mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/processResult").get(0).getAccessAuth()); - return mav; + for (ProcessResult pr:processResultList) { + pr.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(pr.getCdsKey()).orElse(null)); + pr.setFishingBoat(fishingBoatRepository.findByCdsKey(pr.getCdsKey()).orElse(null)); + pr.setViolationList(violationRepository.findByFbKey(pr.getFishingBoat().getFbKey())); } - @GetMapping("/processResult/processResultEditModal") - public ModelAndView crackdownStatusEditModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ - ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultEditModal"); - if(processResult.getPrKey()!=null){ - processResult = processResultService.selectProcessResult(processResult.getPrKey()); - processResult.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); - processResult.setFbKey(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getFbKey()); - processResult.setBoatNameKr(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getBoatNameKr()); - processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey())); - }else{ - processResult.setWrtOrgan(loginUser.getOgCd()); - processResult.setWrtPart(loginUser.getOfcCd()); - processResult.setWrtUserGrd(loginUser.getGroupCd()); - processResult.setWrtUserNm(loginUser.getUserNm()); - processResult.setWrtDt(LocalDateTime.now()); - } - mav.addObject("processResult", processResult); - return mav; + mav.addObject("processResultList", processResultList); + mav.addObject("searchParams", processResult); + return mav; + } + + @GetMapping("/processResult/processResultViewModal") + public ModelAndView processResultViewModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ + ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultViewModal"); + processResult = processResultService.selectProcessResult(processResult.getPrKey()); + processResult.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); + processResult.setFbKey(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getFbKey()); + processResult.setBoatNameKr(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getBoatNameKr()); + processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey())); + + mav.addObject("processResult", processResult); + mav.addObject("userSeq",loginUser.getUserSeq()); + //메뉴권한 확인 + mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/processResult").get(0).getAccessAuth()); + return mav; + } + + @GetMapping("/processResult/processResultEditModal") + public ModelAndView crackdownStatusEditModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ + ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultEditModal"); + if(processResult.getPrKey()!=null){ + processResult = processResultService.selectProcessResult(processResult.getPrKey()); + processResult.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); + processResult.setFbKey(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getFbKey()); + processResult.setBoatNameKr(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getBoatNameKr()); + processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey())); + }else{ + processResult.setWrtOrgan(loginUser.getOgCd()); + processResult.setWrtPart(loginUser.getOfcCd()); + processResult.setWrtUserGrd(loginUser.getGroupCd()); + processResult.setWrtUserNm(loginUser.getUserNm()); + processResult.setWrtDt(LocalDateTime.now()); } + mav.addObject("processResult", processResult); + return mav; + } - @GetMapping("/processResult/processResultHistoryViewModal") - public ModelAndView processResultHistoryViewModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ - ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultHistoryViewModal"); - List processReulstVersionList = processResultService.selectProcessResultVersionList(processResult.getPrKey()); + @GetMapping("/processResult/processResultHistoryViewModal") + public ModelAndView processResultHistoryViewModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ + ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultHistoryViewModal"); + List processReulstVersionList = processResultService.selectProcessResultVersionList(processResult.getPrKey()); - mav.addObject("processReulstVersionList", processReulstVersionList); - mav.addObject("processResult", processResult); - return mav; - } + mav.addObject("processReulstVersionList", processReulstVersionList); + mav.addObject("processResult", processResult); + return mav; + } - @GetMapping("/processResult/processResultHistoryDetail") - public ModelAndView processResultHistoryDetail(@AuthenticationPrincipal UserInfo loginUser, ProcessResultVersion processResultVersion){ - ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultHistoryDetail"); + @GetMapping("/processResult/processResultHistoryDetail") + public ModelAndView processResultHistoryDetail(@AuthenticationPrincipal UserInfo loginUser, ProcessResultVersion processResultVersion){ + ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultHistoryDetail"); - Integer cdsKey = processResultVersion.getCdsKey(); - Integer fbKey = processResultVersion.getFbKey(); + Integer cdsKey = processResultVersion.getCdsKey(); + Integer fbKey = processResultVersion.getFbKey(); - processResultVersion = processResultService.selectProcessResultVersion(processResultVersion.getVersionNo(), processResultVersion.getPrKey()); - processResultVersion.setFishingBoat(fishingBoatRepository.findByFbKey(fbKey).orElse(null)); - processResultVersion.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(cdsKey).orElse(null)); - processResultVersion.setViolationList(violationRepository.findByFbKey(fbKey)); + processResultVersion = processResultService.selectProcessResultVersion(processResultVersion.getVersionNo(), processResultVersion.getPrKey()); + processResultVersion.setFishingBoat(fishingBoatRepository.findByFbKey(fbKey).orElse(null)); + processResultVersion.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(cdsKey).orElse(null)); + processResultVersion.setViolationList(violationRepository.findByFbKey(fbKey)); - mav.addObject("processResultVersion", processResultVersion); - return mav; - } + mav.addObject("processResultVersion", processResultVersion); + return mav; + } - @GetMapping("/processResult/processResultAddModal") - public ModelAndView sailorAddModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ - ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultAddModal"); + @GetMapping("/processResult/processResultAddModal") + public ModelAndView sailorAddModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ + ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultAddModal"); - processResult.setCrackdownStatusList(crackdownStatusRepository.findAll()); + processResult.setCrackdownStatusList(crackdownStatusRepository.findAll()); - processResult.setWrtOrgan(loginUser.getOgCd()); - processResult.setWrtUserNm(loginUser.getUserNm()); - processResult.setWrtDt(LocalDateTime.now()); + processResult.setWrtOrgan(loginUser.getOgCd()); + processResult.setWrtUserNm(loginUser.getUserNm()); + processResult.setWrtDt(LocalDateTime.now()); - mav.addObject("processResult", processResult); - return mav; - } + mav.addObject("processResult", processResult); + return mav; + } - @PostMapping("/processResult/getProcessResult") - public ProcessResult getProcessResult(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ - processResult = processResultRepository.findByCdsKey(processResult.getCdsKey()).orElse(null); - processResult.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); - processResult.setFishingBoat(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); + @PostMapping("/processResult/getProcessResult") + public ProcessResult getProcessResult(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ + processResult = processResultRepository.findByCdsKey(processResult.getCdsKey()).orElse(null); + processResult.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); + processResult.setFishingBoat(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); - processResult.setWrtOrgan(loginUser.getOgCd()); - processResult.setWrtUserNm(loginUser.getUserNm()); - processResult.setWrtDt(LocalDateTime.now()); - return processResult; - } + processResult.setWrtOrgan(loginUser.getOgCd()); + processResult.setWrtUserNm(loginUser.getUserNm()); + processResult.setWrtDt(LocalDateTime.now()); + return processResult; + } - @PostMapping("/processResult/saveProcessResult") - public Integer saveProcessResult(@AuthenticationPrincipal UserInfo loginUser, - CrackdownStatus crackdownStatus, - FishingBoat fishingBoat, - ProcessResult processResult){ - processResult.setWrtUserSeq(loginUser.getUserSeq()); - processResult.setFishingBoat(fishingBoat); - processResult.setCrackdownStatus(crackdownStatus); - return processResultService.saveProcessResult(processResult); - } + @PostMapping("/processResult/saveProcessResult") + public Integer saveProcessResult(@AuthenticationPrincipal UserInfo loginUser, + CrackdownStatus crackdownStatus, + FishingBoat fishingBoat, + ProcessResult processResult){ + processResult.setWrtUserSeq(loginUser.getUserSeq()); + processResult.setFishingBoat(fishingBoat); + processResult.setCrackdownStatus(crackdownStatus); + return processResultService.saveProcessResult(processResult); + } } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/ProcessResultMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/ProcessResultMapper.java index e6dc1d6c..eb3fce0d 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/ProcessResultMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/ProcessResultMapper.java @@ -7,6 +7,8 @@ import java.util.List; @Mapper public interface ProcessResultMapper { - List selectProcessResultList(ProcessResult processResult); - Integer selectProcessResultListCnt(ProcessResult processResult); + List selectProcessResultList(ProcessResult processResult); + Integer selectProcessResultListCnt(ProcessResult processResult); + + List selectProcessResultYearParam(ProcessResult processResult); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java index 6247b336..d53923d0 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java @@ -62,7 +62,7 @@ public class ProcessResult extends ProcessResultBaseEntity { @Transient private String crackdownPolice; @Transient - private String year; + private Integer year; @Transient private String violation; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java index a52cf558..bb29a26c 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java @@ -102,4 +102,8 @@ public class ProcessResultService extends BaseService { processResultVersionRepository.save(processResultVersion); } } + + public List selectProcessResultYearParam(ProcessResult processResult) { + return processResultMapper.selectProcessResultYearParam(processResult); + } } diff --git a/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java b/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java index 04bc0f6e..8a961945 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java +++ b/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java @@ -82,6 +82,8 @@ public class Translator extends BaseModel implements Serializable{ private String naturalization; @Column(name = "info_share_chk") private String infoShareChk; + @Column(name = "status") + private String status; @Transient private List translatorFileList = new ArrayList<>(); diff --git a/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java index 78c8ba2e..1ccd2fff 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java +++ b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.main.translator.repository; import com.dbnt.faisp.main.translator.model.Translator; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -22,4 +23,8 @@ public interface TranslatorRepository extends JpaRepository findByTranslatorKeyOrderByVersionNoDesc(Integer translatorKey); Optional findTop1ByTranslatorKeyOrderByVersionNoDesc(Integer translatorKey); + + @Modifying(clearAutomatically = true) + @Query("update Translator set status = :status where translatorKey = :trKey") + void bulkModifyingByTrKeyToStatus(int trKey, String status); } diff --git a/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java b/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java index 550fdc6f..e99391a1 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java +++ b/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java @@ -34,6 +34,7 @@ public class TranslatorService extends BaseService { @Transactional public void saveTranslatorInfo(Translator translator) { + translator.setStatus("DST007"); if(translator.getTranslatorKey()==null){ Translator dbTranslator = translatorRepository.findFirstByOrderByTranslatorKeyDesc().orElse(null); translator.setTranslatorKey(dbTranslator == null?1:(dbTranslator.getTranslatorKey()+1)); @@ -157,8 +158,7 @@ public class TranslatorService extends BaseService { @Transactional public void deleteTranslatorInfo(int trKey) { - translatorCareerRepository.deleteByTranslatorKey(trKey); - translatorRepository.deleteByTranslatorKey(trKey); + translatorRepository.bulkModifyingByTrKeyToStatus(trKey, "DST008"); } public TranslatorFile selectTranslatorFile(Integer translatorKey, Integer versionNo, Integer fileSeq) { diff --git a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml index cc8f0607..32a8515c 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml +++ b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml @@ -6,6 +6,7 @@ + c.status <> 'DST008' and extract(year from a.napo_dt) = #{year}::numeric diff --git a/src/main/resources/mybatisMapper/ProcessResultMapper.xml b/src/main/resources/mybatisMapper/ProcessResultMapper.xml index bc7d2841..8b70750a 100644 --- a/src/main/resources/mybatisMapper/ProcessResultMapper.xml +++ b/src/main/resources/mybatisMapper/ProcessResultMapper.xml @@ -4,84 +4,91 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - And EXTRACT(YEAR FROM pr.wrt_dt) = EXTRACT(YEAR FROM CAST(#{year} AS DATE)::TIMESTAMP) - - - AND caseNum = #{caseNum} - - - AND crackdown_police = #{crackdownPolice} - - - AND boat_name_kr LIKE CONCAT('%', #{boatNameKr}, '%') - - - AND violation = #{violation} - - - AND sentencing_court LIKE CONCAT('%', #{sentencingCourt}, '%') - - - AND sentencing_detail LIKE CONCAT('%', #{sentencingDetail}, '%') - - - AND execution_detail = #{executionDetail} - - - AND return_dt = #{returnDt}::DATE - - - AND consignment_start_dt = #{consignmentStartDt}::DATE - - - AND consignment_end_dt = #{consignmentEndDt}::DATE - - - AND confiscation_dt = #{confiscationDt}::DATE - - - AND boat_disposal_dt = #{boatDisposalDt}::DATE - - - + + + fb.status <> 'DST008' + + And EXTRACT(YEAR FROM pr.wrt_dt) = ${year} + + + AND caseNum = #{caseNum} + + + AND crackdown_police = #{crackdownPolice} + + + AND boat_name_kr LIKE CONCAT('%', #{boatNameKr}, '%') + + + AND violation = #{violation} + + + AND sentencing_court LIKE CONCAT('%', #{sentencingCourt}, '%') + + + AND sentencing_detail LIKE CONCAT('%', #{sentencingDetail}, '%') + + + AND execution_detail = #{executionDetail} + + + AND return_dt = #{returnDt}::DATE + + + AND consignment_start_dt = #{consignmentStartDt}::DATE + + + AND consignment_end_dt = #{consignmentEndDt}::DATE + + + AND confiscation_dt = #{confiscationDt}::DATE + + + AND boat_disposal_dt = #{boatDisposalDt}::DATE + + + - SELECT DISTINCT - pr.pr_key - , cs.cds_key - , cs.case_num - , cs.napo_sea_point_lon - , cs.napo_sea_point_lat - , cs.napo_sea_point_detail - , fb.boat_name_kr - , pr.sentencing_court - , pr.sentencing_detail - , pr.execution_detail - , pr.return_dt - , pr.consignment_start_dt - , pr.consignment_end_dt - , pr.confiscation_dt - , pr.boat_disposal_dt - , pr.wrt_dt - , prv.upd_dt AS updDt + pr.pr_key + , cs.cds_key + , cs.case_num + , cs.napo_sea_point_lon + , cs.napo_sea_point_lat + , cs.napo_sea_point_detail + , fb.boat_name_kr + , pr.sentencing_court + , pr.sentencing_detail + , pr.execution_detail + , pr.return_dt + , pr.consignment_start_dt + , pr.consignment_end_dt + , pr.confiscation_dt + , pr.boat_disposal_dt + , pr.wrt_dt + , prv.upd_dt AS updDt FROM process_result pr - INNER JOIN crackdown_status cs - ON pr.cds_key = cs.cds_key - INNER JOIN fishing_boat fb - ON pr.cds_key = fb.cds_key - LEFT JOIN violation v - ON fb.fb_key = v.fb_key - INNER JOIN ( + INNER JOIN crackdown_status cs + ON pr.cds_key = cs.cds_key + INNER JOIN fishing_boat fb + ON pr.cds_key = fb.cds_key + LEFT JOIN violation v + ON fb.fb_key = v.fb_key + INNER JOIN ( SELECT pr_key ,MAX(wrt_dt) AS upd_dt FROM process_result_version GROUP BY pr_key - ) prv - ON pr.pr_key = prv.pr_key + ) prv + ON pr.pr_key = prv.pr_key ORDER BY pr.pr_key DESC LIMIT #{rowCnt} OFFSET #{firstIndex} - + + + \ No newline at end of file diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml index b9563118..5b1221e6 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -4,307 +4,312 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - ogdp1 in - - #{item} - - - and tr_lang = #{trLang} - - - and ogdp1 = #{ogdp1} - - - and tr_name = #{trName} - - - and tr_nny = #{trNny} - - - and tr_visa = #{trVisa} - - - and apt_dt >= #{startDate}::date - - - and apt_dt <= #{endDate}::date+1 - - - and dml_yn = #{dmlYn} - - - - + select a.translator_key, + version_no, + c.item_value as ogdp1, + d.item_value as tr_lang, + tr_career, + tr_name, + e.item_value as tr_sex, + tr_age, + f.item_value as tr_nny, + g.item_value as tr_edu, + tr_cft, + h.item_value as tr_visa, + dml_yn, + apt_dt, + tr_phone from translator_info a - inner join (select translator_key, max(version_no) as lastVer - from translator_info - group by translator_key) b - on a.translator_key =b.translator_key and a.version_no = b.lastVer - left outer join code_mgt c on a.ogdp1 = c.item_cd - left outer join code_mgt d on a.tr_lang = d.item_cd - left outer join code_mgt e on a.tr_sex = e.item_cd - left outer join code_mgt f on a.tr_nny = f.item_cd - left outer join code_mgt g on a.tr_edu = g.item_cd - left outer join code_mgt h on a.tr_visa = h.item_cd + inner join (select translator_key, max(version_no) as lastVer + from translator_info + group by translator_key) b + on a.translator_key =b.translator_key and a.version_no = b.lastVer + left outer join code_mgt c on a.ogdp1 = c.item_cd + left outer join code_mgt d on a.tr_lang = d.item_cd + left outer join code_mgt e on a.tr_sex = e.item_cd + left outer join code_mgt f on a.tr_nny = f.item_cd + left outer join code_mgt g on a.tr_edu = g.item_cd + left outer join code_mgt h on a.tr_visa = h.item_cd - order by translator_key desc + order by translator_key desc limit #{rowCnt} offset #{firstIndex} - + - + - + - + - + - + - + - + \ No newline at end of file