DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

국제범죄 검거현황 통계 오류 수정. 

불법조업 외국어선 조회 조건 수정
예산관리 로딩 지연 오류 작업중.
master
최강석 2023-07-20 18:25:02 +09:00
parent b168ebc938
commit da6386d0ea
6 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java
View File

@ -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 {

15
src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
View File

@ -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<IcaStatistics> icaStatisticsList = internationalCrimeArrestService.selectIcaStatistics(icaStatistics);
mav.addObject("total", internationalCrimeArrestService.getIcaStatisticsTotal(icaStatisticsList));
@ -55,6 +57,17 @@ public class InternationalCrimeArrestController {
List<Integer> 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);

4
src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java
View File

@ -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{

1
src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java
View File

@ -15,6 +15,7 @@ import java.util.List;
@NoArgsConstructor
public class UnlawfulFishingParam extends BaseModel {
/*공통*/
private Integer viewUserSeq;
private String viewOrgan;
/*단속현황*/
private String caseAgency;

4
src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
View File

@ -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>
where
status &lt;> 'DST008'
<if test='organ != null and organ != ""'>
and department = #{organ}
</if>
@ -157,7 +158,6 @@
<if test='month != null and month != 0'>
and EXTRACT(MONTH FROM case_sent_dt) = ${month}
</if>
</where>
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

36
src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml
View File

@ -102,13 +102,15 @@
</if>
<choose>
<when test='accessAuth == "ACC003"'>
and case_agency in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
and (case_agency in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
or wrt_user_seq = #{viewUserSeq}
)
</when>
<otherwise>
and case_agency = #{viewOrgan}
and (case_agency = #{viewOrgan} or wrt_user_seq = #{viewUserSeq})
</otherwise>
</choose>
</sql>
@ -184,13 +186,15 @@
</choose>
<choose>
<when test='accessAuth == "ACC003"'>
and b.case_agency in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
and (b.case_agency in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
or a.wrt_user_seq = #{viewUserSeq}
)
</when>
<otherwise>
and b.case_agency = #{viewOrgan}
and (b.case_agency = #{viewOrgan} or a.wrt_user_seq = #{viewUserSeq})
</otherwise>
</choose>
</sql>
@ -263,13 +267,15 @@
</choose>
<choose>
<when test='accessAuth == "ACC003"'>
and c.case_agency in
and (c.case_agency in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
or a.wrt_user_seq = #{viewUserSeq}
)
</when>
<otherwise>
and c.case_agency = #{viewOrgan}
and (c.case_agency = #{viewOrgan} or a.wrt_user_seq = #{viewUserSeq})
</otherwise>
</choose>
</sql>
@ -356,13 +362,15 @@
</choose>
<choose>
<when test='accessAuth == "ACC003"'>
and ci.case_agency in
and (ci.case_agency in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
or iss.wrt_user_seq = #{viewUserSeq}
)
</when>
<otherwise>
and ci.case_agency = #{viewOrgan}
and (ci.case_agency = #{viewOrgan} or iss.wrt_user_seq = #{viewUserSeq})
</otherwise>
</choose>
</sql>