diff --git a/src/main/java/xit/itgcms/core/managerlog/service/MngrCountVO.java b/src/main/java/xit/itgcms/core/managerlog/service/MngrCountVO.java index c1fddef..adb3683 100644 --- a/src/main/java/xit/itgcms/core/managerlog/service/MngrCountVO.java +++ b/src/main/java/xit/itgcms/core/managerlog/service/MngrCountVO.java @@ -1,11 +1,15 @@ package xit.itgcms.core.managerlog.service; +import xit.vips.process.model.OwnerVO; + public class MngrCountVO extends MngrStatsSearchVO{ /** * */ private static final long serialVersionUID = 7933827690458807888L; + private OwnerVO ownerVo; + /** 날짜통계인덱스 */ String cdIdx = ""; diff --git a/src/main/java/xit/vips/category/inr/inr010402/web/Inr010402Controller.java b/src/main/java/xit/vips/category/inr/inr010402/web/Inr010402Controller.java index 52e53c6..f1c8f4d 100644 --- a/src/main/java/xit/vips/category/inr/inr010402/web/Inr010402Controller.java +++ b/src/main/java/xit/vips/category/inr/inr010402/web/Inr010402Controller.java @@ -217,8 +217,8 @@ public class Inr010402Controller { ,@ModelAttribute PostVO postVO ,ModelMap model, HttpServletRequest request, HttpServletResponse response) throws IOException, SQLException, RuntimeException, JSONException { boolean result = false; - - + + /** * 분기처리 */ diff --git a/src/main/java/xit/vips/category/inr/inr010501/vo/Inr010501VO.java b/src/main/java/xit/vips/category/inr/inr010501/vo/Inr010501VO.java index 3629252..19a0106 100644 --- a/src/main/java/xit/vips/category/inr/inr010501/vo/Inr010501VO.java +++ b/src/main/java/xit/vips/category/inr/inr010501/vo/Inr010501VO.java @@ -12,7 +12,7 @@ public class Inr010501VO extends CmmnInrVO { private static final long serialVersionUID = 1L; private PostDocVO postDocVO; - private CmmnSendAdresVO cmmnSendAdresVO ; + private CmmnSendAdresVO cmmnSendAdresVO; diff --git a/src/main/java/xit/vips/category/rev/rev010102/service/Rev010102Service.java b/src/main/java/xit/vips/category/rev/rev010102/service/Rev010102Service.java index b37e896..3636530 100644 --- a/src/main/java/xit/vips/category/rev/rev010102/service/Rev010102Service.java +++ b/src/main/java/xit/vips/category/rev/rev010102/service/Rev010102Service.java @@ -11,4 +11,9 @@ public interface Rev010102Service { // public Rev010102VO findView(Rev010102VO vo); public void modifyProc(Rev010102VO vo,String flag); + + /** 2023.02.27 최정민 + * 이첩대장 삭제기능 추가 + * */ + public void deleteProc(Rev010102VO vo,String flag); } diff --git a/src/main/java/xit/vips/category/rev/rev010102/service/impl/Rev010102ServiceImpl.java b/src/main/java/xit/vips/category/rev/rev010102/service/impl/Rev010102ServiceImpl.java index 5afa7a4..209ec7d 100644 --- a/src/main/java/xit/vips/category/rev/rev010102/service/impl/Rev010102ServiceImpl.java +++ b/src/main/java/xit/vips/category/rev/rev010102/service/impl/Rev010102ServiceImpl.java @@ -104,4 +104,53 @@ public class Rev010102ServiceImpl implements Rev010102Service { } } + /** 2023.02.27 최정민 + * 이첩대장 삭제기능 추가 + * */ + @Override + public void deleteProc(Rev010102VO vo,String flag) { + String user_cd =CommUtil.getMngrMemId(); + + for(int i=0; i findTrfntfRegv(CmmnRevSearchVO searchVO)throws SQLException; public int modifyTrfntfRegv(CmmnRevVO vo)throws SQLException; + + public int deleteTrfntfRegv(CmmnRevVO vo)throws SQLException; public AdstrdVO findAdstrd(AdstrdVO vo) throws SQLException; public int addAdstrd(AdstrdVO vo) throws SQLException; diff --git a/src/main/java/xit/vips/process/core/service/VipsUnitService.java b/src/main/java/xit/vips/process/core/service/VipsUnitService.java index 52a092d..950ecde 100644 --- a/src/main/java/xit/vips/process/core/service/VipsUnitService.java +++ b/src/main/java/xit/vips/process/core/service/VipsUnitService.java @@ -95,6 +95,11 @@ public interface VipsUnitService { public int addTrfntfRegv(CmmnRevVO vo); public List findTrfntfRegv(CmmnRevSearchVO searchVO); public int modifyTrfntfRegv(CmmnRevVO vo); + + /** 2023.02.27 최정민 + * 이첩대장 삭제기능 추가 + * */ + public int deleteTrfntfRegv(CmmnRevVO vo); public AdstrdVO findAdstrd(AdstrdVO vo); public int addAdstrd(AdstrdVO vo); diff --git a/src/main/java/xit/vips/process/core/service/impl/VipsUnitServiceImpl.java b/src/main/java/xit/vips/process/core/service/impl/VipsUnitServiceImpl.java index 6151f98..7ceb93d 100644 --- a/src/main/java/xit/vips/process/core/service/impl/VipsUnitServiceImpl.java +++ b/src/main/java/xit/vips/process/core/service/impl/VipsUnitServiceImpl.java @@ -10587,4 +10587,14 @@ public class VipsUnitServiceImpl implements VipsUnitService{ } } + @Override + public int deleteTrfntfRegv(CmmnRevVO vo) { + try { + int result = vipsUnitMapper.deleteTrfntfRegv(vo); + return result; + } catch (SQLException e) { + throw new RuntimeException("(이첩대장) ERROR 삭제 中 오류 발생", e); + } + } + } diff --git a/src/main/java/xit/vips/rmi/violation/service/impl/RmiViolationCarServiceImpl.java b/src/main/java/xit/vips/rmi/violation/service/impl/RmiViolationCarServiceImpl.java index eb7d48d..faaa92c 100644 --- a/src/main/java/xit/vips/rmi/violation/service/impl/RmiViolationCarServiceImpl.java +++ b/src/main/java/xit/vips/rmi/violation/service/impl/RmiViolationCarServiceImpl.java @@ -55,7 +55,31 @@ public class RmiViolationCarServiceImpl implements RmiViolationCarService{ WEB_AC1_AW0_10_A_WI01PortTypeProxy proxy = new WEB_AC1_AW0_10_A_WI01PortTypeProxy(); DS_AC1_AW0_10_A_REQUESTType requestType = this.setRequestType(cntc_info_code, charger_id, charger_nm, charger_ip, orgnzt_code, startDe, endDe, isCargo); DS_AC1_AW0_10_A_RESPONSELISTType resp = new DS_AC1_AW0_10_A_RESPONSELISTType(); - try { + + + /*최정민 자망연계 샘플데이터*/ + List arrVO = new ArrayList(); + ViolationCarInfoVO vo = new ViolationCarInfoVO(); + vo.setVHRNO("11가1111"); + vo.setMBER_NM("가나다*상품용*"); + vo.setINSPT_BEFORE_VALID_PD_ENDDE("2022-01-01 2022-03-03"); + vo.setINSPT_DE("2023-01-01"); + ViolationCarInfoVO vo2 = new ViolationCarInfoVO(); + vo2.setVHRNO("22가2222"); + vo2.setMBER_NM("다나가-상품용-"); + vo2.setINSPT_BEFORE_VALID_PD_ENDDE("2022-01-01 2022-03-03"); + vo2.setINSPT_DE("2023-01-01"); + ViolationCarInfoVO vo3 = new ViolationCarInfoVO(); + vo3.setVHRNO("33가3333"); + vo3.setMBER_NM("다나가 정상자료"); + vo3.setINSPT_BEFORE_VALID_PD_ENDDE("2022-01-01 2022-03-03"); + vo3.setINSPT_DE("2023-01-01"); + arrVO.add(vo); + arrVO.add(vo2); + arrVO.add(vo3); + + + /*try { resp = proxy.SI_AC1_AW0_10_RR_A_OP(requestType); } catch (RemoteException e) { throw new RuntimeException("(자동차검사 지연/미필_연계)자동차검사 연계 中 오류가 발생하였습니다."+e.getMessage(),e); @@ -65,9 +89,9 @@ public class RmiViolationCarServiceImpl implements RmiViolationCarService{ - /** + *//** * 연계결과 설정 - */ + *//* List arrVO = new ArrayList(); for(DS_AC1_AW0_10_A_RESPONSEType item : resp.getRecord()) { if(CommonUtil.isEmpty(item.getVHRNO())) @@ -77,7 +101,7 @@ public class RmiViolationCarServiceImpl implements RmiViolationCarService{ vo.convertObjectToObject(item); vo.setCargo(isCargo); arrVO.add(vo); - } + }*/ return arrVO; } diff --git a/src/main/resources/xit/sqlmap/oracle/vips/VipsUnit_SQL.xml b/src/main/resources/xit/sqlmap/oracle/vips/VipsUnit_SQL.xml index 87b70f9..0184b43 100644 --- a/src/main/resources/xit/sqlmap/oracle/vips/VipsUnit_SQL.xml +++ b/src/main/resources/xit/sqlmap/oracle/vips/VipsUnit_SQL.xml @@ -120,6 +120,18 @@ AND MANAGE_no = #{manage_no} + + /** deleteTrfntfRegv */ + /** 이첩대장 자료 삭제*/ + DELETE FROM TB_REGIST_VIOLT_TRFNTF + WHERE SEND_ATDRC_CD =#{atdrc_cd} + AND vhcle_no = #{vhcle_no} + 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/resource/js/cmmn/cmmnFunction.js b/src/main/webapp/resource/js/cmmn/cmmnFunction.js index 89fd53f..668f182 100644 --- a/src/main/webapp/resource/js/cmmn/cmmnFunction.js +++ b/src/main/webapp/resource/js/cmmn/cmmnFunction.js @@ -3173,3 +3173,75 @@ 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; + } +} +