diff --git a/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java b/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java index d1647af1..dc9c5684 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java +++ b/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java @@ -94,22 +94,16 @@ public class BudgetService { //예산편성 - 항목추가 @Transactional public void insertBudgetingList(UserInfo loginUser, BudgetDto.BudgetingInsertReqeust requestDto){ -// System.out.println(requestDto.getYear()); -// System.out.println(requestDto.getNameL1()); -// System.out.println(requestDto.getNameL2()); -// System.out.println(requestDto.getNameL3()); -// UpdateResult result = budgetRepository.callSpAddBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin"); - BudgetParams params = new BudgetParams(); - params.setYear(requestDto.getYear()); - params.setCode1(requestDto.getNameL1()); - params.setCode2(requestDto.getNameL2()); - params.setCode3(requestDto.getNameL3()); - params.setOrg("OG001"); - params.setId("admin"); - UpdateResult result = budgetMapper.callSpAddBudgetPlanCodeName(params); -// System.out.println(result.getErrorMessage()); -// System.out.println(result.getResultCode()); -// System.out.println(result.getResultCount()); + UpdateResult result = budgetRepository.callSpAddBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin"); +// BudgetParams params = new BudgetParams(); +// params.setYear(requestDto.getYear()); +// params.setCode1(requestDto.getNameL1()); +// params.setCode2(requestDto.getNameL2()); +// params.setCode3(requestDto.getNameL3()); +// params.setOrg("OG001"); +// params.setId("admin"); +// UpdateResult result = budgetMapper.callSpAddBudgetPlanCodeName(params); + if(result.getResultCode().equals("100")) { return; } else { diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java index 5763c90f..86ab0cc1 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java @@ -23,6 +23,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Objects; @RestController @RequiredArgsConstructor @@ -46,8 +47,9 @@ public class InternationalCrimeArrestController { }else{ icaStatistics.setOrgan(loginUser.getOgCd()); } + Integer nowYear = LocalDate.now().getYear(); if(Utils.isEmpty(icaStatistics.getYear())){ - icaStatistics.setYear(LocalDate.now().getYear()); + icaStatistics.setYear(nowYear); } List icaStatisticsList = internationalCrimeArrestService.selectIcaStatistics(icaStatistics); mav.addObject("total", internationalCrimeArrestService.getIcaStatisticsTotal(icaStatisticsList)); @@ -55,6 +57,17 @@ public class InternationalCrimeArrestController { List yearList = internationalCrimeArrestService.selectYearOptionList(icaStatistics.getOrgan()); if(yearList.size()==0){ yearList.add(icaStatistics.getYear()); + }else{ + boolean yearFlag = false; + for(Integer dbYear: yearList){ + if (dbYear.equals(nowYear)) { + yearFlag = true; + break; + } + } + if(!yearFlag){ + yearList.add(nowYear); + } } mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/icaStatistics")); mav.addObject("accessAuth", accessAuth); diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java index ea2778a7..9986cebc 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java @@ -37,6 +37,7 @@ public class UnlawfulFishingController { mav.addObject("menuKey", accessConfig.getMenuKey()); mav.addObject("accessAuth", accessConfig.getAccessAuth()); params.setAccessAuth(accessConfig.getAccessAuth()); + params.setViewUserSeq(loginUser.getUserSeq()); if(accessConfig.getAccessAuth().equals("ACC003")){ params.setDownOrganCdList(loginUser.getDownOrganCdList()); }else{ @@ -130,6 +131,7 @@ public class UnlawfulFishingController { mav.addObject("menuKey", accessConfig.getMenuKey()); mav.addObject("accessAuth", accessConfig.getAccessAuth()); params.setAccessAuth(accessConfig.getAccessAuth()); + params.setViewUserSeq(loginUser.getUserSeq()); if(accessConfig.getAccessAuth().equals("ACC003")){ params.setDownOrganCdList(loginUser.getDownOrganCdList()); }else{ @@ -219,6 +221,7 @@ public class UnlawfulFishingController { mav.addObject("menuKey", accessConfig.getMenuKey()); mav.addObject("accessAuth", accessConfig.getAccessAuth()); params.setAccessAuth(accessConfig.getAccessAuth()); + params.setViewUserSeq(loginUser.getUserSeq()); if(accessConfig.getAccessAuth().equals("ACC003")){ params.setDownOrganCdList(loginUser.getDownOrganCdList()); }else{ @@ -295,6 +298,7 @@ public class UnlawfulFishingController { mav.addObject("menuKey", accessConfig.getMenuKey()); mav.addObject("accessAuth", accessConfig.getAccessAuth()); params.setAccessAuth(accessConfig.getAccessAuth()); + params.setViewUserSeq(loginUser.getUserSeq()); if(accessConfig.getAccessAuth().equals("ACC003")){ params.setDownOrganCdList(loginUser.getDownOrganCdList()); }else{ diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java index 9be17d75..ddd89333 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java @@ -15,6 +15,7 @@ import java.util.List; @NoArgsConstructor public class UnlawfulFishingParam extends BaseModel { /*공통*/ + private Integer viewUserSeq; private String viewOrgan; /*단속현황*/ private String caseAgency; diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml index 4e5f6773..7d71ca9a 100644 --- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml +++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml @@ -147,7 +147,8 @@ sum(case when ab.process_result = 'PCR006' then 1 else 0 end) as pcr006Cnt from international_crime_arrest aa inner join ica_suspect_info ab on aa.ica_key = ab.ica_key - + where + status <> 'DST008' and department = #{organ} @@ -157,7 +158,6 @@ and EXTRACT(MONTH FROM case_sent_dt) = ${month} - group by crime_type, violation_type ) c on a.item_cd = c.crime_type and b.item_cd = c.violation_type order by a.item_cd, b.item_cd diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml index 10f59145..b07dae37 100644 --- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml +++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml @@ -102,13 +102,15 @@ - and case_agency in - - #{organCd} - + and (case_agency in + + #{organCd} + + or wrt_user_seq = #{viewUserSeq} + ) - and case_agency = #{viewOrgan} + and (case_agency = #{viewOrgan} or wrt_user_seq = #{viewUserSeq}) @@ -184,13 +186,15 @@ - and b.case_agency in - - #{organCd} - + and (b.case_agency in + + #{organCd} + + or a.wrt_user_seq = #{viewUserSeq} + ) - and b.case_agency = #{viewOrgan} + and (b.case_agency = #{viewOrgan} or a.wrt_user_seq = #{viewUserSeq}) @@ -263,13 +267,15 @@ - and c.case_agency in + and (c.case_agency in #{organCd} + or a.wrt_user_seq = #{viewUserSeq} + ) - and c.case_agency = #{viewOrgan} + and (c.case_agency = #{viewOrgan} or a.wrt_user_seq = #{viewUserSeq}) @@ -356,13 +362,15 @@ - and ci.case_agency in + and (ci.case_agency in #{organCd} + or iss.wrt_user_seq = #{viewUserSeq} + ) - and ci.case_agency = #{viewOrgan} + and (ci.case_agency = #{viewOrgan} or iss.wrt_user_seq = #{viewUserSeq})