diff --git a/src/main/java/cokr/xit/fims/cmmn/service/LinkService.java b/src/main/java/cokr/xit/fims/cmmn/service/LinkService.java index 7ffc5067..c668c90d 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/LinkService.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/LinkService.java @@ -1,5 +1,5 @@ package cokr.xit.fims.cmmn.service; public interface LinkService { - boolean insertElectronicNoticeSndng(String filePath, String sggCd, String taskSeCd, String tmplatId); + String insertElectronicNoticeSndng(String filePath, String sggCd, String taskSeCd, String tmplatId); } diff --git a/src/main/java/cokr/xit/fims/cmmn/service/StngService.java b/src/main/java/cokr/xit/fims/cmmn/service/StngService.java index e2cbf756..2404d595 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/StngService.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/StngService.java @@ -13,7 +13,7 @@ public interface StngService { *
  • 그렇지 않으면 false
  • * */ - boolean updateTaskStng(Task task, List vltnList); + String updateTaskStng(Task task, List vltnList); /**시군구별 업무 설정, 위반 설정을 추가한다. * @param sggCd 시군구 코드, taskSeCd 업무구분 코드 @@ -22,5 +22,5 @@ public interface StngService { *
  • 그렇지 않으면 false
  • * */ - boolean createTaskStng(String sggCd, String taskSeCd); + String createTaskStng(String sggCd, String taskSeCd); } diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/LinkServiceBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/LinkServiceBean.java index 23059de1..ee5f5cc2 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/bean/LinkServiceBean.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/LinkServiceBean.java @@ -25,7 +25,7 @@ public class LinkServiceBean extends AbstractServiceBean implements LinkService private ExtrStngMapper extrStngMapper; @Override - public boolean insertElectronicNoticeSndng(String filePath, String sggCd, String taskSeCd, String tmplatId) { + public String insertElectronicNoticeSndng(String filePath, String sggCd, String taskSeCd, String tmplatId) { ExtrStngQuery extrStngQuery = new ExtrStngQuery(); extrStngQuery.setSggCd(sggCd).setTaskSeCd(taskSeCd); @@ -77,6 +77,6 @@ public class LinkServiceBean extends AbstractServiceBean implements LinkService linkBean.insertElectronicNoticeSndng(masterInfo, List.of(detailInfo)); } - return true; + return "[S]"; } } diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngServiceBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngServiceBean.java index 9f490864..a078df5a 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngServiceBean.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngServiceBean.java @@ -31,7 +31,7 @@ public class StngServiceBean extends AbstractServiceBean implements StngService private CodeBean codeBean; @Override - public boolean updateTaskStng(Task task, List vltnList) { + public String updateTaskStng(Task task, List vltnList) { boolean result = taskBean.update(task); if(!result) { @@ -45,11 +45,11 @@ public class StngServiceBean extends AbstractServiceBean implements StngService } } - return result; + return result ? "[S]" : "[F]"; } @Override - public boolean createTaskStng(String sggCd, String taskSeCd) { + public String createTaskStng(String sggCd, String taskSeCd) { Task task = new Task(); task.setSggCd(sggCd); task.setTaskSeCd(taskSeCd); @@ -95,7 +95,7 @@ public class StngServiceBean extends AbstractServiceBean implements StngService } } - return result; + return result ? "[S]" : "[F]"; } diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java index 93874a4c..843f4391 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java +++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java @@ -23,31 +23,31 @@ public interface CrdnService { * @param crdnIds 삭제할 단속자료 ID 목록 * @return 삭제여부 */ - boolean remove(String... crdnIds); + String remove(String... crdnIds); /** 단속 자료를 신규 등록한다. * @param nonQueryRequest 등록 요청, crdn 단속정보, newFileList 업로드 파일 목록 * @return 저장여부 */ - boolean create(Map nonQueryRequest, Crdn crdn, List newFileInfoList); + String create(Map nonQueryRequest, Crdn crdn, List newFileInfoList); /** 단속 자료를 수정한다. * @param nonQueryRequest 수정 요청, crdn 단속정보, newFileInfoList 업로드 파일 목록 * @return 저장여부 */ - boolean update(Map nonQueryRequest, Crdn crdn, List newFileInfoList); + String update(Map nonQueryRequest, Crdn crdn, List newFileInfoList); /** 시간초과 정보를 변경하고, 금액을 증가 또는 감소시킨다. * @param chgAmtSe 금액 변경 구분, crdnId 단속 ID * @return 저장여부 */ - boolean updateOverTimeInfo(String chgAmtSe, String crdnId); + String updateOverTimeInfo(String chgAmtSe, String crdnId); /** 표지정보 미확인 자료를 확인 자료로 수정한다. * @param crdn 단속정보 * @return 저장여부 */ - boolean updateTagInfo(Crdn crdn); + String updateTagInfo(Crdn crdn); /** 단속 자료를 조회한다. * @param query 단속 조회 조건 @@ -83,7 +83,7 @@ public interface CrdnService { * @param entType 업체유형, fileName 파일명 * @return 저장 여부 */ - boolean removeEquipmentLinkFile(String workPath, String fileName); + String removeEquipmentLinkFile(String workPath, String fileName); /** 단속 사진에 대한 파일 처리를 실행한다. * @param crdn 단속정보, processList 파일 처리 목록 diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java b/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java index d35b8348..017ad1e6 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java +++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java @@ -32,13 +32,13 @@ public interface CrdnStngService { * @param teamId 단속팀 ID * @return 저장여부 */ - boolean removeTeamInfo(String teamId); + String removeTeamInfo(String teamId); /** 단속팀 정보를 저장한다. * @param team 단속팀 정보 * @return 저장여부 */ - boolean saveTeamInfo(Team team); + String saveTeamInfo(Team team); /** 단속팀 정보을 조회한다. * @param teamId 단속팀 ID @@ -62,19 +62,19 @@ public interface CrdnStngService { * @param exmptnVhcl 면제차량 정보 * @return 저장여부 */ - boolean createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl); + String createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl); /** 면제차량 정보를 수정한다. * @param exmptnVhcl 면제차량 정보 * @return 저장여부 */ - boolean updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl); + String updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl); /** 면제차량 정보를 삭제한다. * @param exmptnVhcl 면제차량 정보 * @return 저장여부 */ - boolean removeExemptionVehicleInfo(ExmptnVhcl exmptnVhcl); + String removeExemptionVehicleInfo(ExmptnVhcl exmptnVhcl); /** 면제차량 이력을 조회한다. * @param exemptionVehicleId 면제차량 ID diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java index d8433a05..69b183b2 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java @@ -198,29 +198,37 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService } @Override - public boolean remove(String... crdnIds) { - return crdnBean.remove(crdnIds); + public String remove(String... crdnIds) { + boolean result = crdnBean.remove(crdnIds); + if(result) { + return "[S]"; + } else { + return "[F]단속 자료 삭제 중 오류가 발생하였습니다."; + } } - - @Override - public boolean create(Map nonQueryRequest, Crdn crdn, List fileInfoList) { - return crdnBean.create(nonQueryRequest, crdn, fileInfoList); + public String create(Map nonQueryRequest, Crdn crdn, List fileInfoList) { + boolean result = crdnBean.create(nonQueryRequest, crdn, fileInfoList); + if(result) { + return "[S]"; + } else { + return "[F]단속 자료 등록 중 오류가 발생하였습니다."; + } } @Override - public boolean update(Map nonQueryRequest, Crdn crdn, List newFileInfoList) { + public String update(Map nonQueryRequest, Crdn crdn, List newFileInfoList) { boolean result = crdnBean.updateLedger(nonQueryRequest, crdn); if(!result) { throw new RuntimeException("단속 정보 수정 중 오류가 발생하였습니다."); } - return true; + return "[S]"; } @Override - public boolean updateOverTimeInfo(String chgAmtSe, String crdnId) { + public String updateOverTimeInfo(String chgAmtSe, String crdnId) { DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdnId); Crdn crdn = new Crdn(); @@ -245,7 +253,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService } if(crdnUpdtMapper.updateOverTimeInfo(crdn) != 1) { - return false; + return "[F]2시간초과여부 변경 중 오류가 발생하였습니다."; } if(chgAmtSe.equals("0") || chgAmtSe.equals("1")) { @@ -261,18 +269,20 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService int effected = crdnUpdtMapper.updateCrdnAmt(crdn); if(effected != 1) { - return false; + return "[F]단속자료 금액 변경 중 오류가 발생하였습니다."; } - return true; + return "[S]"; } @Override - public boolean updateTagInfo(Crdn crdn) { - return crdnUpdtMapper.updateTagInfo(crdn) == 1 ? true : false; + public String updateTagInfo(Crdn crdn) { + if(crdnUpdtMapper.updateTagInfo(crdn) == 1) { + return "[S]"; + } else { + return "[F]"; + } } - - @Override public DataObject getCrackdownInfo(CrdnQuery query) { return crdnInfoMapper.selectCrdnInfo(query.getCrdnId()); @@ -299,8 +309,13 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService } @Override - public boolean removeEquipmentLinkFile(String workPath, String fileName) { - return crdnBean.removeEquipmentLinkFile(workPath, fileName); + public String removeEquipmentLinkFile(String workPath, String fileName) { + boolean result = crdnBean.removeEquipmentLinkFile(workPath, fileName); + if(result) { + return "[S]"; + } else { + return "[F]장비연계파일 삭제 중 오류가 발생하였습니다."; + } } @Override diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java index 9bb85b91..3a045e30 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java @@ -41,14 +41,14 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng } @Override - public boolean removeTeamInfo(String teamId) { - return crdnStngBean.removeTeamInfo(teamId); + public String removeTeamInfo(String teamId) { + return crdnStngBean.removeTeamInfo(teamId) ? "[S]" : "[F]"; } @Override - public boolean saveTeamInfo(Team team) { - return crdnStngBean.saveTeamInfo(false, team); + public String saveTeamInfo(Team team) { + return crdnStngBean.saveTeamInfo(false, team) ? "[S]" : "[F]"; } @Override @@ -67,18 +67,33 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng } @Override - public boolean createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { - return crdnStngBean.createExemptionVehicleInfo(exmptnVhcl); + public String createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { + boolean result = crdnStngBean.createExemptionVehicleInfo(exmptnVhcl); + if(result) { + return "[S]"; + } else { + return "[F]"; + } } @Override - public boolean updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { - return crdnStngBean.updateExemptionVehicleInfo(exmptnVhcl); + public String updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { + boolean result = crdnStngBean.updateExemptionVehicleInfo(exmptnVhcl); + if(result) { + return "[S]"; + } else { + return "[F]"; + } } @Override - public boolean removeExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { - return crdnStngBean.removeExemptionVehicleInfo(exmptnVhcl); + public String removeExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { + boolean result = crdnStngBean.removeExemptionVehicleInfo(exmptnVhcl); + if(result) { + return "[S]"; + } else { + return "[F]"; + } } @Override diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java index 1a397f7c..f19187c4 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -175,7 +175,11 @@ public class Crdn02Controller extends ApplicationController { * } */ public ModelAndView updateOverTimeInfo(String chgAmtSe, String crdnId) { - boolean saved = crdnService.updateOverTimeInfo(chgAmtSe, crdnId); + boolean saved = false; + String rtnMsg = crdnService.updateOverTimeInfo(chgAmtSe, crdnId); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java index 74569372..3cbb7e96 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -129,8 +129,11 @@ public class Crdn03Controller extends ApplicationController { * } */ public ModelAndView updateTagInfo(Crdn crdn) { - - boolean saved = crdnService.updateTagInfo(crdn); + boolean saved = false; + String rtnMsg = crdnService.updateTagInfo(crdn); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index d0e4297b..642a5347 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -327,9 +327,11 @@ public class Crdn05Controller extends ApplicationController { LayoutDescriptor info = crdnStngBean.getLinkFileLayoutMetadata(fileLayoutId); String workPath = info.getLinkFileLocation(); - - boolean saved = crdnService.removeEquipmentLinkFile(workPath, fileName); - + boolean saved = false; + String rtnMsg = crdnService.removeEquipmentLinkFile(workPath, fileName); + if(rtnMsg.contains("[S]")) { + saved = true; + } mav.addObject("saved", saved); return mav; } @@ -480,8 +482,11 @@ public class Crdn05Controller extends ApplicationController { } Map nonQueryRequest = new HashMap(); crdn.setCvlcptLinkYn("N"); - saved = crdnService.create(nonQueryRequest, crdn, fileInfoList); + String rtnMsg = crdnService.create(nonQueryRequest, crdn, fileInfoList); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java index e8797a36..fb988874 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java @@ -110,8 +110,10 @@ public class Crdn07Controller extends ApplicationController { boolean saved = false; - saved = crdnStngService.removeTeamInfo(teamId); - + String rtnMsg = crdnStngService.removeTeamInfo(teamId); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); @@ -134,8 +136,10 @@ public class Crdn07Controller extends ApplicationController { String sggCd = globalStngMapper.selectSggCd(curDeptCode); team.setSggCd(sggCd); - saved = crdnStngService.saveTeamInfo(team); - + String rtnMsg = crdnStngService.saveTeamInfo(team); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java index 77570a67..7b551bf4 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java @@ -152,6 +152,7 @@ public class Crdn08Controller extends ApplicationController { * } */ public ModelAndView createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { + ModelAndView mav = new ModelAndView("jsonView"); ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); String deptCd = currentUser.getDeptCode(); @@ -159,10 +160,12 @@ public class Crdn08Controller extends ApplicationController { boolean saved = false; - saved = crdnStngService.createExemptionVehicleInfo(exmptnVhcl); - - return new ModelAndView("jsonView") - .addObject("saved", saved); + String rtnMsg = crdnStngService.createExemptionVehicleInfo(exmptnVhcl); + if(rtnMsg.contains("[S]")) { + saved = true; + } + mav.addObject("saved", saved); + return mav; } @@ -175,6 +178,7 @@ public class Crdn08Controller extends ApplicationController { * } */ public ModelAndView updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { + ModelAndView mav = new ModelAndView("jsonView"); ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); String deptCd = currentUser.getDeptCode(); @@ -182,10 +186,12 @@ public class Crdn08Controller extends ApplicationController { boolean saved = false; - saved = crdnStngService.updateExemptionVehicleInfo(exmptnVhcl); - - return new ModelAndView("jsonView") - .addObject("saved", saved); + String rtnMsg = crdnStngService.updateExemptionVehicleInfo(exmptnVhcl); + if(rtnMsg.contains("[S]")) { + saved = true; + } + mav.addObject("saved", saved); + return mav; } @@ -198,13 +204,16 @@ public class Crdn08Controller extends ApplicationController { * } */ public ModelAndView removeExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { + ModelAndView mav = new ModelAndView("jsonView"); boolean saved = false; - saved = crdnStngService.removeExemptionVehicleInfo(exmptnVhcl); - - return new ModelAndView("jsonView") - .addObject("saved", saved); + String rtnMsg = crdnStngService.removeExemptionVehicleInfo(exmptnVhcl); + if(rtnMsg.contains("[S]")) { + saved = true; + } + mav.addObject("saved", saved); + return mav; } diff --git a/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java b/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java index 5f51757d..a6739786 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java @@ -47,31 +47,31 @@ public interface CrdnCvlcptService { * @param crdnID 단속ID * @return 저장여부 */ - boolean sendBackCivilComplaintInfo(String crdnId); + String sendBackCivilComplaintInfo(String crdnId); /** 부과요청 민원에 대한 수용 처리구분을 변경한다. * @param nonQueryRequest 처리 요청, crdnCvlcpt 단속민원정보, crdn 단속정보 * @return 저장여부 */ - boolean updateCvlcptProcessSection(Map nonQueryRequest, CrdnCvlcpt crdnCvlcpt, Crdn crdn); + String updateCvlcptProcessSection(Map nonQueryRequest, CrdnCvlcpt crdnCvlcpt, Crdn crdn); /** 단속민원 자료를 복사하여 신규단속자료를 생성한다. * @param crdnId 단속 ID * @return 저장여부 */ - boolean copyCvlcptCrdnInfo(String crdnId); + String copyCvlcptCrdnInfo(String crdnId); /** 단속민원의 답변내용을 변경한다. * @param crdnCvlcpt 단속민원정보 * @return 저장여부 */ - boolean updateAnswerContent(CrdnCvlcpt crdnCvlcpt); + String updateAnswerContent(CrdnCvlcpt crdnCvlcpt); /** 민원답변대상의 처리 상태를 변경한다. * @param processType 처리 유형, crdnIds 단속ID목록 * @return 저장여부 */ - boolean updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIds); + String updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIds); /** 민원답변 문구 설정 정보를 조회한다. * @param crdnQuery 조회 조건 @@ -88,13 +88,13 @@ public interface CrdnCvlcptService { * @param saveData 저장 자료 구분, crdnCvlcpt 민원 답변 문구 설정 * @return 저장여부 */ - boolean saveAnswerWordsInfo(String saveData, CrdnCvlcpt crdnCvlcpt); + String saveAnswerWordsInfo(String saveData, CrdnCvlcpt crdnCvlcpt); /** 미부과처리건 답변내용을 삭제한다. * @param ansWordsId 답변 문구 ID * @return 저장여부 */ - boolean removeCvlcptAnswerWordsInfo(String ansWordsId); + String removeCvlcptAnswerWordsInfo(String ansWordsId); /** 계도문 문구 설정 정보를 조회한다. * @param crdnQuery 조회 조건 @@ -106,7 +106,7 @@ public interface CrdnCvlcptService { * @param crdnCvlcpt 계도문 문구 설정 * @return 저장여부 */ - boolean saveWarningWordsInfo(CrdnCvlcpt crdnCvlcpt); + String saveWarningWordsInfo(CrdnCvlcpt crdnCvlcpt); /** 새올 요청자료 목록을 조회한다. * @param query 조회 요청 @@ -118,17 +118,17 @@ public interface CrdnCvlcptService { * @param crdnCvlcpt 새올요청자료 정보 * @return 저장여부 */ - boolean createDmndDataInfo(CrdnCvlcpt crdnCvlcpt); + String createDmndDataInfo(CrdnCvlcpt crdnCvlcpt); /** 새올 요청자료를 삭제한다. * @param indivIds 개별요청 ID * @return 저장여부 */ - boolean removeDmndDataInfo(String... indivIds); + String removeDmndDataInfo(String... indivIds); /** 지정한 단속자료에 대해 표지정보조회 실행 후 장애인차량이 아닌 건은 서손 처리한다. * @param crdnIds 단속 ID 목록 * @return 저장여부 */ - boolean executeDisabledTagInfoInquire(String... crdnIds); + String executeDisabledTagInfoInquire(String... crdnIds); } diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index 55945d17..73ac9f02 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -333,7 +333,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } @Override - public boolean sendBackCivilComplaintInfo(String crdnId) { + public String sendBackCivilComplaintInfo(String crdnId) { boolean saved = false; DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdnId); @@ -365,11 +365,11 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } } - return saved; + return saved ? "[S]" : "[F]"; } @Override - public boolean updateCvlcptProcessSection(Map nonQueryRequest, CrdnCvlcpt crdnCvlcpt, Crdn crdn) { + public String updateCvlcptProcessSection(Map nonQueryRequest, CrdnCvlcpt crdnCvlcpt, Crdn crdn) { boolean saved = false; DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdn.getCrdnId()); @@ -449,28 +449,28 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } } - return saved; + return saved ? "[S]" : "[F]"; } @Override - public boolean copyCvlcptCrdnInfo(String crdnId) { - return crdnCvlcptSubBean.copyCvlcptCrdnInfo(crdnId); + public String copyCvlcptCrdnInfo(String crdnId) { + return crdnCvlcptSubBean.copyCvlcptCrdnInfo(crdnId) ? "[S]" : "[F]"; } @Override - public boolean updateAnswerContent(CrdnCvlcpt crdnCvlcpt) { + public String updateAnswerContent(CrdnCvlcpt crdnCvlcpt) { int effected = crdnCvlcptMapper.updateAnswerContent(crdnCvlcpt); if(effected != 1) { throw new RuntimeException("답변 내용 저장에 실패하였습니다."); } - return true; + return "[S]"; } @Override - public boolean updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIds) { + public String updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIds) { List targetDataList = crdnCvlcptMapper.selectAnswerTargetList(crdnIds); @@ -518,7 +518,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } } - return true; + return "[S]"; } @Override @@ -539,7 +539,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } @Override - public boolean saveAnswerWordsInfo(String saveData, CrdnCvlcpt crdnCvlcpt) { + public String saveAnswerWordsInfo(String saveData, CrdnCvlcpt crdnCvlcpt) { boolean saved = false; if(saveData.equals("basic")) { saved = crdnCvlcptMainBean.saveAnswerBasicWordsInfo(crdnCvlcpt); @@ -547,14 +547,14 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv if(saveData.equals("body")) { saved = crdnCvlcptMainBean.saveAnswerBodyWordsInfo(crdnCvlcpt); } - return saved; + return saved ? "[S]" : "[F]"; } @Override - public boolean removeCvlcptAnswerWordsInfo(String ansWordsId) { + public String removeCvlcptAnswerWordsInfo(String ansWordsId) { CrdnCvlcpt crdnCvlcpt = new CrdnCvlcpt(); crdnCvlcpt.setAnsWordsId(ansWordsId); - return answerWordsMapper.deleteCvlcptAnswerWordsInfo(crdnCvlcpt) == 1 ? true : false; + return answerWordsMapper.deleteCvlcptAnswerWordsInfo(crdnCvlcpt) == 1 ? "[S]" : "[F]"; } @Override @@ -563,8 +563,8 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } @Override - public boolean saveWarningWordsInfo(CrdnCvlcpt crdnCvlcpt) { - return crdnCvlcptSubBean.saveWarningWordsInfo(crdnCvlcpt); + public String saveWarningWordsInfo(CrdnCvlcpt crdnCvlcpt) { + return crdnCvlcptSubBean.saveWarningWordsInfo(crdnCvlcpt) ? "[S]" : "[F]"; } @Override @@ -573,17 +573,17 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } @Override - public boolean createDmndDataInfo(CrdnCvlcpt crdnCvlcpt) { - return crdnCvlcptMainBean.createDmndDataInfo(crdnCvlcpt); + public String createDmndDataInfo(CrdnCvlcpt crdnCvlcpt) { + return crdnCvlcptMainBean.createDmndDataInfo(crdnCvlcpt) ? "[S]" : "[F]"; } @Override - public boolean removeDmndDataInfo(String... indivIds) { - return crdnCvlcptMainBean.removeDmndDataInfo(indivIds); + public String removeDmndDataInfo(String... indivIds) { + return crdnCvlcptMainBean.removeDmndDataInfo(indivIds) ? "[S]" : "[F]"; } @Override - public boolean executeDisabledTagInfoInquire(String... crdnIds) { + public String executeDisabledTagInfoInquire(String... crdnIds) { int i=0; HashMap vehicleResultMap = new HashMap(); @@ -662,7 +662,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } } - return i > 0 ? true : false; + return i > 0 ? "[S]" : "[F]"; } } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java index 76c9d42c..d35f68b4 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -157,11 +157,14 @@ public class Cvlc01Controller extends ApplicationController { * } */ public ModelAndView removeCivilComplaint(String[] crdnIds) { - - boolean saved = crdnService.remove(crdnIds); - - return new ModelAndView("jsonView") - .addObject("saved", saved); + ModelAndView mav = new ModelAndView("jsonView"); + boolean saved = false; + String rtnMsg = crdnService.remove(crdnIds); + if(rtnMsg.contains("S")) { + saved = true; + } + mav.addObject("saved", saved); + return mav; } /** 민원내역 원본 보기 팝업 화면을 연다. @@ -265,6 +268,7 @@ public class Cvlc01Controller extends ApplicationController { * } */ public ModelAndView saveCivilComplaintProcessSection(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt, Crdn crdn) { + ModelAndView mav = new ModelAndView("jsonView"); ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); String deptCd = currentUser.getDeptCode(); @@ -286,11 +290,12 @@ public class Cvlc01Controller extends ApplicationController { } } - saved = crdnCvlcptService.updateCvlcptProcessSection(nonQueryRequest, crdnCvlcpt, crdn); - - - return new ModelAndView("jsonView") - .addObject("saved", saved); + String rtnMsg = crdnCvlcptService.updateCvlcptProcessSection(nonQueryRequest, crdnCvlcpt, crdn); + if(rtnMsg.contains("[S]")) { + saved = true; + } + mav.addObject("saved", saved); + return mav; } /**지정한 민원 자료의 복사본을 생성한다. @@ -301,13 +306,16 @@ public class Cvlc01Controller extends ApplicationController { * } */ public ModelAndView copyCivilComplaintInfo(String crdnId) { + ModelAndView mav = new ModelAndView("jsonView"); boolean saved = false; - saved = crdnCvlcptService.copyCvlcptCrdnInfo(crdnId); - - return new ModelAndView("jsonView") - .addObject("saved", saved); + String rtnMsg = crdnCvlcptService.copyCvlcptCrdnInfo(crdnId); + if(rtnMsg.contains("[S]")) { + saved = true; + } + mav.addObject("saved", saved); + return mav; } /**지정한 민원 자료를 반송(회수) 처리한다. @@ -318,12 +326,15 @@ public class Cvlc01Controller extends ApplicationController { * } */ public ModelAndView sendBackCivilComplaintInfo(String crdnId) { + ModelAndView mav = new ModelAndView("jsonView"); boolean saved = false; - saved = crdnCvlcptService.sendBackCivilComplaintInfo(crdnId); - - return new ModelAndView("jsonView") - .addObject("saved", saved); + String rtnMsg = crdnCvlcptService.sendBackCivilComplaintInfo(crdnId); + if(rtnMsg.contains("[S]")) { + saved = true; + } + mav.addObject("saved", saved); + return mav; } } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index e184773e..5653f763 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -212,8 +212,10 @@ public class Cvlc02Controller extends ApplicationController { boolean saved = false; - saved = crdnCvlcptService.updateAnswerContent(crdnCvlcpt); - + String rtnMsg = crdnCvlcptService.updateAnswerContent(crdnCvlcpt); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); } @@ -231,8 +233,10 @@ public class Cvlc02Controller extends ApplicationController { boolean saved = false; String currentInstitute = currentUser().getInstitute(); String currentUserAcnt = currentUser().getAccount(); - saved = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, currentInstitute, currentUserAcnt, crdnIds); - + String rtnMsg = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, currentInstitute, currentUserAcnt, crdnIds); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); } @@ -248,8 +252,10 @@ public class Cvlc02Controller extends ApplicationController { public ModelAndView executeDisabledTagInfoInquire(String... crdnIds) { boolean saved = false; - saved = crdnCvlcptService.executeDisabledTagInfoInquire(crdnIds); - + String rtnMsg = crdnCvlcptService.executeDisabledTagInfoInquire(crdnIds); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java index 45e0f5d2..044f75ad 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java @@ -96,8 +96,10 @@ public class Cvlc04Controller extends ApplicationController { boolean saved = false; - saved = crdnCvlcptService.createDmndDataInfo(crdnCvlcpt); - + String rtnMsg = crdnCvlcptService.createDmndDataInfo(crdnCvlcpt); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); @@ -113,8 +115,11 @@ public class Cvlc04Controller extends ApplicationController { */ public ModelAndView removeDmndDataInfo(String[] indivIds) { - boolean saved = crdnCvlcptService.removeDmndDataInfo(indivIds); - + boolean saved = false; + String rtnMsg = crdnCvlcptService.removeDmndDataInfo(indivIds); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java index 22a69729..6b39adce 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java @@ -119,7 +119,10 @@ public class Cvlc05Controller extends ApplicationController { String saveData = hReq.getParameter("saveData"); if(saveData.equals("basic") || saveData.equals("body")) { - saved = crdnCvlcptService.saveAnswerWordsInfo(saveData, crdnCvlcpt); + String rtnMsg = crdnCvlcptService.saveAnswerWordsInfo(saveData, crdnCvlcpt); + if(rtnMsg.contains("[S]")) { + saved = true; + } } return new ModelAndView("jsonView") @@ -137,8 +140,10 @@ public class Cvlc05Controller extends ApplicationController { public ModelAndView removeCvlcptAnswerWordsInfo(String ansWordsId) { boolean saved = false; - saved = crdnCvlcptService.removeCvlcptAnswerWordsInfo(ansWordsId); - + String rtnMsg = crdnCvlcptService.removeCvlcptAnswerWordsInfo(ansWordsId); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java index 5bcbc73c..9360bf43 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java @@ -87,8 +87,10 @@ public class Cvlc06Controller extends ApplicationController { String currentSggCd = globalStngMapper.selectSggCd(deptCd); crdnCvlcpt.setSggCd(currentSggCd); - saved = crdnCvlcptService.saveWarningWordsInfo(crdnCvlcpt); - + String rtnMsg = crdnCvlcptService.saveWarningWordsInfo(crdnCvlcpt); + if(rtnMsg.contains("[S]")) { + saved = true; + } return new ModelAndView("jsonView") .addObject("saved", saved); } diff --git a/src/main/java/cokr/xit/fims/mngt/service/FactionService.java b/src/main/java/cokr/xit/fims/mngt/service/FactionService.java index 464a85c6..4b00d00d 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/FactionService.java +++ b/src/main/java/cokr/xit/fims/mngt/service/FactionService.java @@ -9,7 +9,7 @@ import cokr.xit.foundation.data.DataObject; public interface FactionService { - boolean updateSgg(FineIntegrationSigungu sgg); + String updateSgg(FineIntegrationSigungu sgg); DataObject getSggInfo(CmmnQuery req); @@ -39,7 +39,7 @@ public interface FactionService { *
  • 그렇지 않으면 false
  • * */ - boolean create(FineIntegrationDepartment dept); + String create(FineIntegrationDepartment dept); /**부서 정보를 수정한다. * @param dept 부서 @@ -48,7 +48,7 @@ public interface FactionService { *
  • 그렇지 않으면 false
  • * */ - boolean update(FineIntegrationDepartment dept); + String update(FineIntegrationDepartment dept); /**부서 정보를 삭제한다. * @param deptCds 부서 코드 목록 @@ -57,5 +57,5 @@ public interface FactionService { *
  • 그렇지 않으면 false
  • * */ - boolean remove(String... deptCds); + String remove(String... deptCds); } diff --git a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java b/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java index 73c8d926..19d1d030 100644 --- a/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java +++ b/src/main/java/cokr/xit/fims/mngt/service/bean/FactionServiceBean.java @@ -20,8 +20,8 @@ public class FactionServiceBean extends AbstractServiceBean implements FactionSe private FactionBean factionBean; @Override - public boolean updateSgg(FineIntegrationSigungu sgg) { - return factionBean.updateSgg(sgg); + public String updateSgg(FineIntegrationSigungu sgg) { + return factionBean.updateSgg(sgg) ? "[S]" : "[F]"; } @Override @@ -46,17 +46,23 @@ public class FactionServiceBean extends AbstractServiceBean implements FactionSe } @Override - public boolean create(FineIntegrationDepartment dept) { - return factionBean.create(dept); + public String create(FineIntegrationDepartment dept) { + return factionBean.create(dept) ? "[S]" : "[F]"; } @Override - public boolean update(FineIntegrationDepartment dept) { - return factionBean.update(dept); + public String update(FineIntegrationDepartment dept) { + return factionBean.update(dept) ? "[S]" : "[F]"; } @Override - public boolean remove(String... deptCds) { - return factionBean.remove(deptCds); + public String remove(String... deptCds) { + boolean result = factionBean.remove(deptCds); + if(result) { + return "[S]"; + } else { + return "[F]"; + } + } } diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java index adfed8c8..6df0efaa 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java @@ -158,9 +158,11 @@ public class Mngt03Controller extends ApplicationController { sgg.setOfficialSealFilepath(newOffcs.get("filePath")); sgg.setOfficialSealFilename(newOffcs.get("fileName")); } - - boolean saved = factionService.updateSgg(sgg); - + boolean saved = false; + String rtnMsg = factionService.updateSgg(sgg); + if(rtnMsg.contains("[S]")) { + saved = true; + } mav.addObject("saved", saved); return mav; } @@ -203,8 +205,11 @@ public class Mngt03Controller extends ApplicationController { public ModelAndView updateTaskStng(Task task) { ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = stngService.updateTaskStng(task, task.getVltnStngList()); - + boolean saved = false; + String rtnMsg = stngService.updateTaskStng(task, task.getVltnStngList()); + if(rtnMsg.contains("[S]")) { + saved = true; + } mav.addObject("saved", saved); return mav; } @@ -219,8 +224,11 @@ public class Mngt03Controller extends ApplicationController { public ModelAndView createTaskStng(String sggCd, String taskSeCd) { ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = stngService.createTaskStng(sggCd, taskSeCd); - + boolean saved = false; + String rtnMsg = stngService.createTaskStng(sggCd, taskSeCd); + if(rtnMsg.contains("[S]")) { + saved = true; + } mav.addObject("saved", saved); return mav; } diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java index f395bcdd..360d5fe1 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java @@ -98,8 +98,11 @@ public class Mngt04Controller extends ApplicationController { */ public ModelAndView removeDept(String... deptCds) { ModelAndView mav = new ModelAndView("jsonView"); - - boolean saved = factionService.remove(deptCds); + boolean saved = false; + String rtnMsg = factionService.remove(deptCds); + if(rtnMsg.contains("[S]")) { + saved = true; + } mav.addObject("saved", saved); return mav; diff --git a/src/main/java/cokr/xit/fims/sprt/service/IntegrationSearchService.java b/src/main/java/cokr/xit/fims/sprt/service/IntegrationSearchService.java index 49120d73..d409edb0 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/IntegrationSearchService.java +++ b/src/main/java/cokr/xit/fims/sprt/service/IntegrationSearchService.java @@ -29,7 +29,7 @@ public interface IntegrationSearchService { * @param etcCn 특기사항, crdnIds 단속 ID 목록 * @return 저장여부 */ - boolean updateEtcCn(String etcCn, String... crdnIds); + String updateEtcCn(String etcCn, String... crdnIds); /** 한글 서식 출력물을 생성한다. * @param formatType 서식유형 ,formatName 서식명, printOption 출력옵션, crdnIds 출력대상 diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java index 7129abaf..4e8e3259 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java @@ -110,10 +110,14 @@ public class IntegrationSearchServiceBean extends AbstractServiceBean implements } @Override - public boolean updateEtcCn(String etcCn, String... crdnIds) { - - return integrationSearchBean.updateEtcCn(etcCn, crdnIds); + public String updateEtcCn(String etcCn, String... crdnIds) { + boolean result = integrationSearchBean.updateEtcCn(etcCn, crdnIds); + if(result) { + return "[S]"; + } else { + return "[F]"; + } } @Override 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 cd1c7b96..d3841896 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -392,8 +392,10 @@ public class Sprt01Controller extends ApplicationController { boolean saved = false; - saved = integrationSearchService.updateEtcCn(crdn.getEtcCn(), crdnIds); - + String rtnMsg = integrationSearchService.updateEtcCn(crdn.getEtcCn(), crdnIds); + if(rtnMsg.contains("[S]")) { + saved = true; + } mav.addObject("saved", saved); return mav;