diff --git a/src/main/java/cokr/xit/fims/mngt/service/bean/TaskProcessor.java b/src/main/java/cokr/xit/fims/mngt/service/bean/TaskProcessor.java index a62db818..c5e9efe7 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/bean/TaskProcessor.java +++ b/src/main/java/cokr/xit/fims/mngt/service/bean/TaskProcessor.java @@ -41,6 +41,10 @@ public class TaskProcessor extends AbstractBean { @Resource(name = "exmptnVhclMapper") private ExmptnVhclMapper exmptnVhclMapper; + public DataObject getTaskVltnCdGrps() { + return vltnCdGrps.clone(); + } + /**모든 위반내역 코드그룹을 반환한다. * @return 모든 위반내역 코드그룹 */ diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index ed0404a7..f0559ac0 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -7,6 +7,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -50,6 +51,7 @@ import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.CrdnListMapper; import cokr.xit.fims.mngt.service.bean.TaskBean; +import cokr.xit.fims.mngt.service.bean.TaskProcessor; import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.Sndng; import cokr.xit.fims.sndb.service.bean.SndngBean; @@ -135,23 +137,23 @@ public class Sprt01Controller extends ApplicationController { */ @RequestMapping(name="통합조회 메인", value=METHOD_URL.integrationSearchMain) public ModelAndView integrationSearchMain() { - Map> commonCodes = getCodesOf("FIM003", "FIM010", "FIM026", "FIM054","FIM004","FIM005","FIM006","FIM061","FIM064"); + TaskProcessor taskProcessor = TaskProcessor.get(); + DataObject taskVltnCdGrps = taskProcessor.getTaskVltnCdGrps(); + List vltnCdGrps = taskVltnCdGrps.values().stream() + .map(v -> (String)v) + .collect(Collectors.toCollection(ArrayList::new)); + vltnCdGrps.addAll(List.of("FIM003", "FIM010", "FIM026", "FIM054")); + String[] cdGrps = vltnCdGrps.toArray(new String[vltnCdGrps.size()]); + Map> commonCodes = getCodesOf(cdGrps); ModelAndView mav = new ModelAndView("fims/sprt/sprt01010-main") .addObject("pageName", "sprt01010") .addObject("sggCd", currentUser().getOrgID()) - .addObject("FIM003List", commonCodes.get("FIM003")) - .addObject("FIM010List", commonCodes.get("FIM010")) - .addObject("FIM026List", commonCodes.get("FIM026")) - .addObject("FIM054List", commonCodes.get("FIM054")) .addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) - .addObject("FIM004List", commonCodes.get("FIM004")) - .addObject("FIM005List", commonCodes.get("FIM005")) - .addObject("FIM006List", commonCodes.get("FIM006")) - .addObject("FIM061List", commonCodes.get("FIM061")) - .addObject("FIM064List", commonCodes.get("FIM064")); + .addObject("vltnCdGrps", taskVltnCdGrps); + vltnCdGrps.forEach(cdGrp -> mav.addObject(cdGrp + "List", commonCodes.get(cdGrp))); - return addCodes(commonCodes, mav, "FIM003", "FIM010", "FIM026", "FIM054" ,"FIM004","FIM005","FIM006","FIM061","FIM064"); + return addCodes(commonCodes, mav, cdGrps); } /**지정한 조건에 따라 통합 조회 자료 목록을 반환한다.