diff --git a/src/main/java/cokr/xit/fims/rent/web/Rent04Controller.java b/src/main/java/cokr/xit/fims/rent/web/Rent04Controller.java index f75eee6d..46158ddf 100644 --- a/src/main/java/cokr/xit/fims/rent/web/Rent04Controller.java +++ b/src/main/java/cokr/xit/fims/rent/web/Rent04Controller.java @@ -108,6 +108,9 @@ public class Rent04Controller extends ApplicationController { //사용자 기업명 목록 List entNms = entList.stream().map(i -> i.string("ENT_NM")).toList(); + List finKeywords = List.of("주정차위반","전용차로위반" + ,"장애인","전기차","친환경자동차","친환경 자동차" + ,"도로교통법"); byte[] bytesOfFile = file.getBytes(); InputStream in = new ByteArrayInputStream(bytesOfFile); @@ -170,9 +173,23 @@ public class Rent04Controller extends ApplicationController { } } + boolean finKeywordYn = false; + String findKeyword = ""; + String finSeColumn = resultRow.string("F"); + + if(finSeColumn.contains("과태료")) { + for(String finKeyword : finKeywords) { + if(finSeColumn.contains(finKeyword)) { + finKeywordYn = true; + findKeyword = finKeyword; + break; + } + } + + } if(rowNo != 0 //제목줄이 아닐것 && !resultRow.string("A").equals("") //빈셀이 아닐것 - // && // TODO : 과태료구분이 시스템에서사용하는 과태료일것 + && finKeywordYn //과태료구분이 시스템에서사용하는 과태료일것 ) { String epaynoColumn = resultRow.string("B"); @@ -197,13 +214,32 @@ public class Rent04Controller extends ApplicationController { boolean find = false; //D,G 컬럼 사용가능하면 - if(useable) { + if(useable && !findKeyword.equals("도로교통법")) { RentQuery lsctQuery = new RentQuery(); lsctQuery.setHirerMpngYn("Y"); lsctQuery.setEntIds(entIds); lsctQuery.setSchVhrno(extractVhrno); lsctQuery.setCrdnDt(crdnDt); - //TODO:과태료구분 + switch (findKeyword) { + case "주정차위반": { + lsctQuery.setTaskSeCd("PVS"); + break; + } + case "전용차로위반": { + lsctQuery.setTaskSeCd("BPV"); + break; + } + case "장애인": { + lsctQuery.setTaskSeCd("DPV"); + break; + } + case "전기차": + case "친환경자동차": + case "친환경 자동차": { + lsctQuery.setTaskSeCd("ECA"); + break; + } + } searchResults = lsctMpngMapper.selectCrdnList(lsctQuery); if(searchResults != null && !searchResults.isEmpty()) {