From 8ada7f148e24a61a2e44a327fcd5d72f5e4b0d4e Mon Sep 17 00:00:00 2001 From: Kurt92 Date: Tue, 16 May 2023 15:49:50 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9A=B4=ED=96=89=EC=A0=95=EC=A7=80=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EA=B4=80=EB=A6=AC=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rev/rev010101/dao/Rev010101Mapper.java | 6 + .../rev010101/service/Rev010101Service.java | 23 ++- .../service/impl/Rev010101ServiceImpl.java | 91 +++++++++--- .../rev/rev010101/vo/Rev010101VO.java | 8 +- .../rev010101/web/Rev010101Controller.java | 34 +++-- .../vips/process/model/DisableDriveVO.java | 129 +++++++++++++++++ .../model/cetegory/CmmnRevSearchVO.java | 24 +++- .../oracle/vips/CmmnFindByCategory_SQL.xml | 33 +++++ .../sqlmap/oracle/vips/rev/Rev0101001_SQL.xml | 59 ++++++++ .../rev/rev0101/rev010101/rev010101_list.jsp | 132 +++++++++++++++++- .../popup/findCarAndAdresInfo_popup.jsp | 2 +- .../webapp/resource/js/cmmn/cmmnFunction.js | 73 ++++++++++ src/main/webapp/web/WEB-INF/web.xml | 6 + 13 files changed, 578 insertions(+), 42 deletions(-) create mode 100644 src/main/java/xit/vips/process/model/DisableDriveVO.java create mode 100644 src/main/resources/xit/sqlmap/oracle/vips/rev/Rev0101001_SQL.xml create mode 100644 src/main/webapp/web/WEB-INF/web.xml diff --git a/src/main/java/xit/vips/category/rev/rev010101/dao/Rev010101Mapper.java b/src/main/java/xit/vips/category/rev/rev010101/dao/Rev010101Mapper.java index 39e4a59..f3a5b97 100644 --- a/src/main/java/xit/vips/category/rev/rev010101/dao/Rev010101Mapper.java +++ b/src/main/java/xit/vips/category/rev/rev010101/dao/Rev010101Mapper.java @@ -6,6 +6,7 @@ import java.util.List; import egovframework.rte.psl.dataaccess.mapper.Mapper; import xit.vips.category.rev.rev010101.vo.Rev010101SearchVO; import xit.vips.category.rev.rev010101.vo.Rev010101VO; +import xit.vips.process.model.DisableDriveVO; @Mapper public interface Rev010101Mapper { @@ -14,4 +15,9 @@ public List findList(Rev010101SearchVO searchVO)throws SQLException public int countList(Rev010101SearchVO searchVO)throws SQLException; public Rev010101VO findView(Rev010101VO vo)throws SQLException; + + public int addDriveDisable(DisableDriveVO vo)throws SQLException; + + public int deleteDriveDisable(DisableDriveVO vo)throws SQLException; + } diff --git a/src/main/java/xit/vips/category/rev/rev010101/service/Rev010101Service.java b/src/main/java/xit/vips/category/rev/rev010101/service/Rev010101Service.java index ab4779a..8e54756 100644 --- a/src/main/java/xit/vips/category/rev/rev010101/service/Rev010101Service.java +++ b/src/main/java/xit/vips/category/rev/rev010101/service/Rev010101Service.java @@ -1,7 +1,11 @@ package xit.vips.category.rev.rev010101.service; +import java.io.IOException; +import java.sql.SQLException; import java.util.List; +import xit.com.ext.jfile.org.json.JSONArray; +import xit.com.ext.jfile.org.json.JSONException; import xit.vips.category.rev.rev010101.vo.Rev010101SearchVO; import xit.vips.category.rev.rev010101.vo.Rev010101VO; @@ -83,9 +87,26 @@ public interface Rev010101Service { /** * 
메소드 설명: (수정페이지)수시부과등록
- * @param vo void 요청처리 후 응답객체 + * @param vo void 요청처리 * @author: 황대한 * @date: 2019. 9. 17. */ public void addAnytmLevyProc(Rev010101VO vo); + + /** + * 
메소드 설명: 운행정지 자료 관리 테이블 인서트
+ * @param jsonArr void 요청처리 + * @author: 최정민 + * @date: 2023. 05. 10. + */ + + public void addDriveDisable(JSONArray jsonArr, String mode) throws JSONException, IOException, SQLException; + + /** + * 
메소드 설명: 운행정지 자료 관리 테이블 인서트
+ * @param jsonArr void 요청처리 후 응답객체 + * @author: 최정민 + * @date: 2023. 05. 10. + */ + } diff --git a/src/main/java/xit/vips/category/rev/rev010101/service/impl/Rev010101ServiceImpl.java b/src/main/java/xit/vips/category/rev/rev010101/service/impl/Rev010101ServiceImpl.java index 7d9c975..2a65153 100644 --- a/src/main/java/xit/vips/category/rev/rev010101/service/impl/Rev010101ServiceImpl.java +++ b/src/main/java/xit/vips/category/rev/rev010101/service/impl/Rev010101ServiceImpl.java @@ -1,11 +1,18 @@ package xit.vips.category.rev.rev010101.service.impl; +import java.io.IOException; +import java.sql.SQLException; +import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; +import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.stereotype.Service; +import xit.com.ext.jfile.org.json.JSONArray; +import xit.com.ext.jfile.org.json.JSONException; +import xit.com.ext.jfile.org.json.JSONObject; import xit.com.ext.jfile.service.impl.JFileVO; import xit.common.service.FrameworkService; import xit.itgcms.util.CommUtil; @@ -19,6 +26,7 @@ import xit.vips.process.common.service.CmmnFindByCategoryService; import xit.vips.process.common.service.CmmnProcessService; import xit.vips.process.common.service.CreateKeyService; import xit.vips.process.core.service.VipsUnitService; +import xit.vips.process.model.DisableDriveVO; import xit.vips.process.util.VipsConstant.CATEGORY; @@ -28,7 +36,7 @@ public class Rev010101ServiceImpl implements Rev010101Service { private RegvCtgyMgrService regvCtgyMgrService; @Resource private VipsUnitService vipsUnitService; - @Resource + @Resource private FrameworkService frameworkService; @Resource private CmmnFindByCategoryService cmmnFindByCategoryService; @@ -38,12 +46,12 @@ public class Rev010101ServiceImpl implements Rev010101Service { private Rev010101Mapper rev010101Mapper; @Resource private CmmnProcessService cmmnProcessService; - + @SuppressWarnings("unchecked") @Override public List findList(Rev010101SearchVO searchVO) { searchVO.setIsSearchVolunLevy("Y"); - return (List) cmmnFindByCategoryService.findRevs(searchVO); + return (List) cmmnFindByCategoryService.findRevs(searchVO); } @Override @@ -63,7 +71,7 @@ public class Rev010101ServiceImpl implements Rev010101Service { //거소지VO vo.convertToOndssAdresInfo(vo.getOndssAdresVO()); regvCtgyMgrService.addRegv(vo.getRegistVioltVO(), vo.getVhcleVO(), vo.getOwnerVO(), vo.getOndssAdresVO(), user_cd); - + } @Override @@ -82,11 +90,11 @@ public class Rev010101ServiceImpl implements Rev010101Service { //만료기한연장여부 설정 String _change_regist_at = vo.getRegistVioltVO().getChange_regist_at(); vo.getRegistVioltVO().setEndde_extn_at(CommonUtil.isEmpty(_change_regist_at)?"0":_change_regist_at); - + /** * 처리 */ - //첨부파일 승인 처리 + //첨부파일 승인 처리 JFileVO newFile1 = vo.getjFileVO(); if(CommonUtil.notEmpty(newFile1)){ String current_file_id = vo.getRegistVioltVO().getFile_id(); @@ -100,8 +108,8 @@ public class Rev010101ServiceImpl implements Rev010101Service { } } regvCtgyMgrService.modifyRegv(vo.getRegistVioltVO(), vo.getVhcleVO(), vo.getOwnerVO(), vo.getOndssAdresVO(), user_cd); - - + + } @Override @@ -112,11 +120,11 @@ public class Rev010101ServiceImpl implements Rev010101Service { @Override public void addVolunLevyProc(Rev010101VO vo) { - String user_cd =CommUtil.getMngrMemId(); - regvCtgyMgrService.addVolunLevy(vo.getCmmnSendAdresVO(),vo.getLevyVO().getTaxitm_cd(), vo.getLevyVO().getTaxt_ym(), vo.getLevyVO().getLevy_de(), - vo.getLevyVO().getLevy_dedt(), vo.getLevyVO().getLevy_amount(), user_cd); + String user_cd =CommUtil.getMngrMemId(); + regvCtgyMgrService.addVolunLevy(vo.getCmmnSendAdresVO(),vo.getLevyVO().getTaxitm_cd(), vo.getLevyVO().getTaxt_ym(), vo.getLevyVO().getLevy_de(), + vo.getLevyVO().getLevy_dedt(), vo.getLevyVO().getLevy_amount(), user_cd); } - + @Override public void addAnytmLevyProc(Rev010101VO vo) { String user_cd =CommUtil.getMngrMemId(); @@ -124,19 +132,20 @@ public class Rev010101ServiceImpl implements Rev010101Service { , vo.getLevyVO().getLevy_aftdte() ,vo.getLevyVO().getAddi_rt_se() , user_cd); } + @Override public void addRciv(Rev010101VO vo) { String user_cd =CommUtil.getMngrMemId(); vo.getLevyVO().setRciv_de(CommonUtil.replaceToNumber(vo.getLevyVO().getRciv_de())); - regvCtgyMgrService.addLevyRcivResult(vo.getCmmnSendAdresVO().getAtdrc_cd(), vo.getCmmnSendAdresVO().getViolt_iem_cd(), vo.getCmmnSendAdresVO().getManage_year(), - vo.getCmmnSendAdresVO().getManage_no(),vo.getLevyVO().getRciv_de(), user_cd); + regvCtgyMgrService.addLevyRcivResult(vo.getCmmnSendAdresVO().getAtdrc_cd(), vo.getCmmnSendAdresVO().getViolt_iem_cd(), vo.getCmmnSendAdresVO().getManage_year(), + vo.getCmmnSendAdresVO().getManage_no(),vo.getLevyVO().getRciv_de(), user_cd); } @Override public void removeRciv(Rev010101VO vo) { String user_cd =CommUtil.getMngrMemId(); vo.getLevyVO().setRciv_de(CommonUtil.replaceToNumber(vo.getLevyVO().getRciv_de())); - regvCtgyMgrService.removeLevyRcivResult(vo.getCmmnSendAdresVO().getAtdrc_cd(), vo.getCmmnSendAdresVO().getViolt_iem_cd(), vo.getCmmnSendAdresVO().getManage_year(), + regvCtgyMgrService.removeLevyRcivResult(vo.getCmmnSendAdresVO().getAtdrc_cd(), vo.getCmmnSendAdresVO().getViolt_iem_cd(), vo.getCmmnSendAdresVO().getManage_year(), vo.getCmmnSendAdresVO().getManage_no(),user_cd); } @@ -147,13 +156,13 @@ public class Rev010101ServiceImpl implements Rev010101Service { */ boolean isTogetherWithSeipData = "Y".equals(vo.getIsTogetherWithSeipData()); String user_cd = CommUtil.getMngrMemId(); - + /** * 처리 */ regvCtgyMgrService.removeVolunLevy(isTogetherWithSeipData, CATEGORY.REGV, vo.getCmmnSendAdresVO().getAtdrc_cd(), vo.getCmmnSendAdresVO().getViolt_iem_cd(), vo.getCmmnSendAdresVO().getManage_year(), vo.getCmmnSendAdresVO().getManage_no() ,user_cd); - + } @Override @@ -163,14 +172,56 @@ public class Rev010101ServiceImpl implements Rev010101Service { */ boolean isTogetherWithSeipData = "Y".equals(vo.getIsTogetherWithSeipData()); String user_cd = CommUtil.getMngrMemId(); - + /** * 처리 */ regvCtgyMgrService.removeAnytmLevy(isTogetherWithSeipData, CATEGORY.REGV, vo.getCmmnSendAdresVO().getAtdrc_cd(), vo.getCmmnSendAdresVO().getViolt_iem_cd(), vo.getCmmnSendAdresVO().getManage_year(), vo.getCmmnSendAdresVO().getManage_no() ,user_cd); - + } - + + @Override + public void addDriveDisable(JSONArray jsonArr, String mode) throws JSONException, IOException, SQLException { + + String user_cd =CommUtil.getMngrMemId(); + + DisableDriveVO disableDriveVO = new DisableDriveVO(); + disableDriveVO.setUser_cd(user_cd); + + JSONObject jsonObj = new JSONObject(); + + for(int i=0; i rev010101_proc( - @RequestParam(value="mode") String mode - ,@ModelAttribute Rev010101VO vo - ,@ModelAttribute CmmnSendAdresVO cmmnSendAdresVO - ,@ModelAttribute LevyVO levyVO - ,@ModelAttribute RegistVioltVO registVioltVO - ,@ModelAttribute VhcleVO vhcleVO - ,@ModelAttribute OwnerVO ownerVO - ,@ModelAttribute OndssAdresVO ondssAdresVO - ,ModelMap model, HttpServletRequest request, HttpServletResponse response) throws IOException, SQLException, RuntimeException, JSONException { - + @RequestParam(value="mode") String mode + ,@ModelAttribute Rev010101VO vo + ,@ModelAttribute CmmnSendAdresVO cmmnSendAdresVO + ,@ModelAttribute LevyVO levyVO + ,@ModelAttribute RegistVioltVO registVioltVO + ,@ModelAttribute VhcleVO vhcleVO + ,@ModelAttribute OwnerVO ownerVO + ,@ModelAttribute OndssAdresVO ondssAdresVO + ,ModelMap model, HttpServletRequest request, HttpServletResponse response) throws IOException, SQLException, RuntimeException, JSONException { + + + JSONArray jsonArr = new JSONArray(request.getParameter("jsonArr")); boolean result = false; vo.setRegistVioltVO(registVioltVO); @@ -381,7 +387,13 @@ public class Rev010101Controller { case "anytmlevy": rev010101Service.addAnytmLevyProc(vo); result = true; - break; + break; + case "disableDriveSave": + rev010101Service.addDriveDisable(jsonArr, mode); + break; + /*case "disableDriveDelete": + rev010101Service.deleteDriveDisable(jsonArr, mode); + break;*/ default: throw new RuntimeException("유효하지 않은 처리 요청 입니다."); } diff --git a/src/main/java/xit/vips/process/model/DisableDriveVO.java b/src/main/java/xit/vips/process/model/DisableDriveVO.java new file mode 100644 index 0000000..bb8c6a0 --- /dev/null +++ b/src/main/java/xit/vips/process/model/DisableDriveVO.java @@ -0,0 +1,129 @@ +package xit.vips.process.model; + + +import xit.common.model.BaseVO; + +/** + * + *
    + *
  • 업무 그룹명: 운행정지VO
    • + *
  • 설 명:
    • + *
  • 작성일: 2023. 05. 11 + *
+ * + * @author 최정민 + * + */ +public class DisableDriveVO extends BaseVO { + + + private String atdrc_cd; + private String violt_iem_cd; + private String manage_year; + private String manage_no; + private String seq; + private String create_dt; + private String create_user_cd; + private String update_dt; + private String update_user_cd; + private String delete_yn; + + private String user_cd; + private String delete_type; + + public String getDelete_type() { + return delete_type; + } + + public void setDelete_type(String delete_type) { + this.delete_type = delete_type; + } + + public String getUser_cd() { + return user_cd; + } + + public void setUser_cd(String user_cd) { + this.user_cd = user_cd; + } + + public String getAtdrc_cd() { + return atdrc_cd; + } + + public void setAtdrc_cd(String atdrc_cd) { + this.atdrc_cd = atdrc_cd; + } + + public String getViolt_iem_cd() { + return violt_iem_cd; + } + + public void setViolt_iem_cd(String violt_iem_cd) { + this.violt_iem_cd = violt_iem_cd; + } + + public String getManage_year() { + return manage_year; + } + + public void setManage_year(String manage_year) { + this.manage_year = manage_year; + } + + public String getManage_no() { + return manage_no; + } + + public void setManage_no(String manage_no) { + this.manage_no = manage_no; + } + + public String getSeq() { + return seq; + } + + public void setSeq(String seq) { + this.seq = seq; + } + + public String getCreate_dt() { + return create_dt; + } + + public void setCreate_dt(String create_dt) { + this.create_dt = create_dt; + } + + public String getCreate_user_cd() { + return create_user_cd; + } + + public void setCreate_user_cd(String create_user_cd) { + this.create_user_cd = create_user_cd; + } + + public String getUpdate_dt() { + return update_dt; + } + + public void setUpdate_dt(String update_dt) { + this.update_dt = update_dt; + } + + public String getUpdate_user_cd() { + return update_user_cd; + } + + public void setUpdate_user_cd(String update_user_cd) { + this.update_user_cd = update_user_cd; + } + + public String getDelete_yn() { + return delete_yn; + } + + public void setDelete_yn(String delete_yn) { + this.delete_yn = delete_yn; + } +} diff --git a/src/main/java/xit/vips/process/model/cetegory/CmmnRevSearchVO.java b/src/main/java/xit/vips/process/model/cetegory/CmmnRevSearchVO.java index 1ffc372..68f0f27 100644 --- a/src/main/java/xit/vips/process/model/cetegory/CmmnRevSearchVO.java +++ b/src/main/java/xit/vips/process/model/cetegory/CmmnRevSearchVO.java @@ -59,6 +59,10 @@ public class CmmnRevSearchVO extends SearchVO { protected String sch_last_link_de_begin; protected String sch_last_link_de_end; protected String isNotCurInspect = "N"; //종합검사(or정기검사) 미검사자료 필터 사용여부 + + /*2023.05.09 최정민 운행정지 대상자료 추출을 위한 필드추가 isSchDisableDrive** */ + protected String isSchDisableDrive = "N"; //종합검사 운행정지대상자료 필터 사용 여부 + protected String isSchDisableDriveSe; protected String isChangeRegistAt = "N"; //자동차등록사항변경 필터 사용여부 protected String is_sch_elapse_sndng_tme = "N"; //경과안내장발송회차 필터 사용여부 protected String sch_elapse_sndng_tme_begin; @@ -101,8 +105,24 @@ public class CmmnRevSearchVO extends SearchVO { protected String sch_trfntf_result; //이첩 상태 ( 0 : 대기 , 1 : 반송, 2: 수신) protected String is_sch_choose_atdrc ="N"; //발송,수신 기관 구분 protected String sch_choose_atdrc; - - + + + public String getIsSchDisableDrive() { + return isSchDisableDrive; + } + + public void setIsSchDisableDrive(String isSchDisableDrive) { + this.isSchDisableDrive = isSchDisableDrive; + } + + public String getIsSchDisableDriveSe() { + return isSchDisableDriveSe; + } + + public void setIsSchDisableDriveSe(String isSchDisableDriveSe) { + this.isSchDisableDriveSe = isSchDisableDriveSe; + } + public String getIs_sch_choose_atdrc() { return is_sch_choose_atdrc; } diff --git a/src/main/resources/xit/sqlmap/oracle/vips/CmmnFindByCategory_SQL.xml b/src/main/resources/xit/sqlmap/oracle/vips/CmmnFindByCategory_SQL.xml index c2eb407..7bd36ca 100644 --- a/src/main/resources/xit/sqlmap/oracle/vips/CmmnFindByCategory_SQL.xml +++ b/src/main/resources/xit/sqlmap/oracle/vips/CmmnFindByCategory_SQL.xml @@ -1245,6 +1245,39 @@ ) + + + + + + AND EXISTS ( + SELECT 1 + FROM TB_REGIST_VIOLT_VHCLE_STTS SA + LEFT OUTER JOIN TB_DISABLE_DRIVE TDD on (SA.ATDRC_CD=TDD.ATDRC_CD and SA.VIOLT_IEM_CD=TDD.VIOLT_IEM_CD and SA.MANAGE_YEAR=TDD.MANAGE_YEAR and SA.MANAGE_NO=TDD.MANAGE_NO) + WHERE 1=1 + AND A.ATDRC_CD=SA.ATDRC_CD + AND A.VIOLT_IEM_CD=SA.VIOLT_IEM_CD + AND A.MANAGE_YEAR=SA.MANAGE_YEAR + AND A.MANAGE_NO=SA.MANAGE_NO + AND SA.EXP_INSPT_VALID_AT = 0 + AND (TDD.DELETE_YN != 'N' OR TDD.DELETE_YN IS NULL) + ) + + + AND EXISTS ( + SELECT 1 + FROM TB_REGIST_VIOLT_VHCLE_STTS SA + INNER JOIN TB_DISABLE_DRIVE TDD on (SA.ATDRC_CD=TDD.ATDRC_CD and SA.VIOLT_IEM_CD=TDD.VIOLT_IEM_CD and SA.MANAGE_YEAR=TDD.MANAGE_YEAR and SA.MANAGE_NO=TDD.MANAGE_NO) + WHERE 1=1 + AND A.ATDRC_CD=SA.ATDRC_CD + AND A.VIOLT_IEM_CD=SA.VIOLT_IEM_CD + AND A.MANAGE_YEAR=SA.MANAGE_YEAR + AND A.MANAGE_NO=SA.MANAGE_NO + AND SA.EXP_INSPT_VALID_AT = 0 + AND TDD.DELETE_YN = 'N' + ) + + diff --git a/src/main/resources/xit/sqlmap/oracle/vips/rev/Rev0101001_SQL.xml b/src/main/resources/xit/sqlmap/oracle/vips/rev/Rev0101001_SQL.xml new file mode 100644 index 0000000..2af1e0c --- /dev/null +++ b/src/main/resources/xit/sqlmap/oracle/vips/rev/Rev0101001_SQL.xml @@ -0,0 +1,59 @@ + + + + + + + /** addDriveDisable */ + /** 운행정지 자료 등록 */ + INSERT INTO TB_DISABLE_DRIVE( + ATDRC_CD + ,VIOLT_IEM_CD + ,MANAGE_YEAR + ,MANAGE_NO + ,SEQ + ,CREATE_DT + ,CREATE_USER_CD + ,DELETE_YN + ) VALUES ( + #{atdrc_cd} + ,#{violt_iem_cd} + ,#{manage_year} + ,#{manage_no} + ,NVL( + (SELECT MAX(SEQ) + FROM TB_DISABLE_DRIVE + WHERE ATDRC_CD = #{atdrc_cd} + AND VIOLT_IEM_CD = #{violt_iem_cd} + AND MANAGE_YEAR = #{manage_year} + AND MANAGE_NO = #{manage_no} + ), 0 + ) +1 + ,SYSDATE + ,#{user_cd} + ,#{delete_yn} + ) + + + + /** deleteDriveDisable */ + /** 운행정지 자료 삭제 */ + UPDATE TB_DISABLE_DRIVE + SET DELETE_YN = 'Y' + , UPDATE_DT = SYSDATE + , UPDATE_USER_CD = #{user_cd} + WHERE ATDRC_CD = #{atdrc_cd} + AND VIOLT_IEM_CD = #{violt_iem_cd} + AND MANAGE_YEAR = #{manage_year} + AND MANAGE_NO = #{manage_no} + AND SEQ = ( + SELECT MAX(SEQ) + FROM TB_DISABLE_DRIVE + WHERE ATDRC_CD = #{atdrc_cd} + AND VIOLT_IEM_CD = #{violt_iem_cd} + AND MANAGE_YEAR = #{manage_year} + AND MANAGE_NO = #{manage_no} + ) + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/xit/vips/category/rev/rev0101/rev010101/rev010101_list.jsp b/src/main/webapp/WEB-INF/jsp/xit/vips/category/rev/rev0101/rev010101/rev010101_list.jsp index 899b2fc..7199c38 100644 --- a/src/main/webapp/WEB-INF/jsp/xit/vips/category/rev/rev0101/rev010101/rev010101_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/xit/vips/category/rev/rev0101/rev010101/rev010101_list.jsp @@ -466,6 +466,22 @@ + + + + + + + + + + + + <%-- checked="checked"/> --%> @@ -598,6 +614,7 @@ + @@ -723,6 +740,50 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/xit/vips/process/common/popup/findCarAndAdresInfo_popup.jsp b/src/main/webapp/WEB-INF/jsp/xit/vips/process/common/popup/findCarAndAdresInfo_popup.jsp index 81e3bb5..84ba545 100644 --- a/src/main/webapp/WEB-INF/jsp/xit/vips/process/common/popup/findCarAndAdresInfo_popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/xit/vips/process/common/popup/findCarAndAdresInfo_popup.jsp @@ -141,7 +141,7 @@ 차량번호 - " title="차량번호" class="required validate-kr-or-digits"/> + " title="차량번호" <%--class="required validate-kr-or-digits"--%>/> 조회기준일자 diff --git a/src/main/webapp/resource/js/cmmn/cmmnFunction.js b/src/main/webapp/resource/js/cmmn/cmmnFunction.js index 89fd53f..b179013 100644 --- a/src/main/webapp/resource/js/cmmn/cmmnFunction.js +++ b/src/main/webapp/resource/js/cmmn/cmmnFunction.js @@ -3173,3 +3173,76 @@ function personalCheck(){ } } +/** 2023.03.28 최정민 + * 데이터 필터링 공통 + * */ +class DataFilter { + constructor(obj) { + this.obj = obj; + this.createDialog(); + this.dialogOpen(); + } + + dialogOpen(){ + $("#diaRegexRemove").dialog({ + title : this.obj.title, + width : 370, + height: 190, + modal : true, + }).prev(".ui-dialog-titlebar").css("background","#515151"); + } + + setSelectOptions(){ + let options = []; + for(const key in this.obj.options){ + options.push({'value':this.obj.options[key], 'text':key}); + } + return this.obj.options = options; + } + + createDialog(){ + this.setSelectOptions(); + document.querySelector('#filterSelectBox').innerHTML=''; + for(const key in this.obj.options){ + let option = document.createElement("option"); + option.value = this.obj.options[key].value; + option.text = this.obj.options[key].text; + document.querySelector('#filterSelectBox').append(option); + } + } + + /** + * @param option : filterSelectBox > option + * @param param : filteringInput + * @returns 필터링 데이터 + */ + dataFilter(option, param){ + let count = 0; + let result = this.obj.data.filter((data, i)=>{ + let paramLeng = this.obj.data[i][option].indexOf(param); + if(paramLeng != -1) { + console.log('걸린 데이터 : ', data[option]); + document.querySelector("tr["+option+"='"+data[option]+"']").remove(); + count++ + } + console.log(this.obj.data.length); + return paramLeng == -1; + }) + this.obj.data=result; + if (count == 0){ + alert('[' + param + '] 를 포함한 자료가 존재하지 않습니다.'); + } else { + alert(count + '개의 자료를 제외하였습니다.'); + } + $('#div_tbody').siblings('div.cnt_tbody').text(this.obj.data.length+' 건'); + return this.obj.data; + } + dataRollBack(){ + fn_gridDraw(this.obj.copyDataSet); + this.obj.data = this.obj.copyDataSet; + $('#div_tbody').siblings('div.cnt_tbody').text(this.obj.data.length+' 건'); + return this.obj.copyDataSet; + } +} + + diff --git a/src/main/webapp/web/WEB-INF/web.xml b/src/main/webapp/web/WEB-INF/web.xml new file mode 100644 index 0000000..d80081d --- /dev/null +++ b/src/main/webapp/web/WEB-INF/web.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file