From c92abdd4b411d4e65e60f4a362bc46d14e1e776e Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 20 Jul 2023 17:40:57 +0900 Subject: [PATCH] =?UTF-8?q?placeholder=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/crdn/dao/Crdn01Mapper.java | 8 ++---- .../cokr/xit/fims/crdn/dao/Crdn06Mapper.java | 19 ++------------ .../fims/crdn/service/bean/Crdn01Bean.java | 8 +++++- .../fims/crdn/service/bean/Crdn06Bean.java | 2 +- .../xit/fims/crdn/web/Crdn01Controller.java | 12 +++++++++ .../sql/mapper/fims/crdn/crdn01-mapper.xml | 4 +-- .../sql/mapper/fims/crdn/crdn06-mapper.xml | 6 ++--- .../WEB-INF/jsp/fims/crdn/crdn01010-main.jsp | 26 ++++++++++++++++++- .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp | 16 +++++++----- 9 files changed, 64 insertions(+), 37 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java index 90519ce5..1d66d3f9 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java @@ -1,10 +1,10 @@ package cokr.xit.fims.crdn.dao; import java.util.List; -import java.util.Map; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; +import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -43,10 +43,6 @@ public interface Crdn01Mapper extends AbstractMapper { * * @return 저장된 정보수 */ - int removeCivilComplaint(Map params); + int removeCivilComplaint(Crdn crdn); - default boolean removeCivilComplaint(String... crdnIDs) { - if (isEmpty(crdnIDs)) return false; - return removeCivilComplaint(params().set("crdnIDs", crdnIDs)) == 1; - }; } diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java index 1021e58a..55cf9e03 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java @@ -1,7 +1,6 @@ package cokr.xit.fims.crdn.dao; import java.util.List; -import java.util.Map; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; @@ -53,24 +52,10 @@ public interface Crdn06Mapper extends AbstractMapper { List selectTagInformationUndefinedDataList(CrdnQuery req); /**표지정보 미확인 자료를 확인 자료로 수정한다. - * @param params 파라미터 - *
  • "crdn" - 단속 대장
    • - *
  • "currentUser" - 현재 접속한 사용자
    • - *
+ * @param crdn 단속 대장 * @return 저장된 정보수 */ - int updateTagInformation(Map params); - - /**표지정보 미확인 자료를 확인 자료로 수정한다. - * @param crdn 단속대장 - * @return 저장 여부 - *
  • 저장됐으면 true
    • - *
  • 그렇지 않으면 false
    • - *
- */ - default boolean updateTagInformation(Crdn crdn) { - return crdn != null && updateTagInformation(params().set("crdn", crdn)) == 1; - } + int updateTagInformation(Crdn crdn); /**과태료 감경 자료 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java index 408bb24c..48c93513 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java @@ -4,8 +4,10 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; +import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.dao.Crdn01Mapper; import cokr.xit.foundation.AbstractComponent; +import cokr.xit.foundation.UserInfo; /** 민원 관리 Bean * @author leebj @@ -17,7 +19,11 @@ public class Crdn01Bean extends AbstractComponent { private Crdn01Mapper crdn01Mapper; public boolean removeCivilComplaint(String... crdnIDs) { - return crdn01Mapper.removeCivilComplaint(crdnIDs); + if (isEmpty(crdnIDs)) return false; + Crdn crdn = new Crdn(); + crdn.setCrdnIDs(crdnIDs); + crdn.setRemovedBy(UserInfo.current().getId()); + return crdn01Mapper.removeCivilComplaint(crdn) == 1 ? true : false; } } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java index 90d3f3b2..8a1b8ebb 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java @@ -27,7 +27,7 @@ public class Crdn06Bean extends AbstractComponent { public boolean update(Crdn crdn) { switch (ifEmpty(crdn.getUpdateInfomation(), () -> "")) { case "tagInformationUndefinedData": - return crdn06Mapper.updateTagInformation(crdn); + return crdn06Mapper.updateTagInformation(crdn) == 1 ? true : false; default: return false; //crdn06Mapper.update(crdn); } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java index 40472b80..5f52b3a5 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -75,6 +75,18 @@ public class Crdn01Controller extends ApplicationController { return mav; } + /** 민원내역 원본 보기 팝업 화면을 연다. + * @return fims/crdn/crdn01050-info + */ + @RequestMapping(name="민원내역 원본 보기", value="/050/info.do") + public ModelAndView getCivilComplaintOrgnlInfo() { + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/crdn/crdn01050-info"); + mav.addObject("pageName", "crdn01050-info"); + + return mav; + } + /**민원접수자료 목록을 조회한다.
* {@link Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 민원접수자료 목록 조회 조건 diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml index 62847169..e4bbec0e 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -243,12 +243,12 @@ SELECT C.CRDN_ID - + /* 민원자료 삭제(crdn01Mapper.removeCivilComplaint) */ UPDATE TB_CRDN SET DEL_YN = 'Y' , DEL_DT = /* 삭제일시 */ - , DLTR = #{currentUser.id} /* 삭제자 */ + , DLTR = #{removedBy} /* 삭제자 */ WHERE CRDN_ID IN ( #{crdnId} ) diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index 16643435..6225dce2 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -398,13 +398,13 @@ SELECT C.CRDN_ID - + /* 표지정보확인 수정(crdn06Mapper.updateTagInformation) */ UPDATE TB_CRDN SET PARKNG_PSBLTY_RSLT_CD = '1' , MDFCN_DT = /* 수정일시 */ - , MDFR = #{currentUser.id} /* 수정자 */ - WHERE CRDN_ID = #{crdn.crdnId} /* 단속 ID */ + , MDFR = #{modifiedBy} /* 수정자 */ + WHERE CRDN_ID = #{crdnId} /* 단속 ID */ + class="form-control form-time" data-fmt-type="time" maxlength="8" required + placeholder="시:분:초" />
- 차량명칭/차량색상은 입력항목이 아닙니다. +
- +
- +
- +