diff --git a/src/main/java/kcc/com/cmm/taglibs/RadioTag.java b/src/main/java/kcc/com/cmm/taglibs/RadioTag.java index 072e98ca..be6b66ce 100644 --- a/src/main/java/kcc/com/cmm/taglibs/RadioTag.java +++ b/src/main/java/kcc/com/cmm/taglibs/RadioTag.java @@ -53,6 +53,8 @@ public class RadioTag extends SimpleTagSupport { private String onChange = ""; private String disabled = ""; + + private String spanYn = ""; public void setSelectedValue(String selectedValue) { this.selectedValue = selectedValue; @@ -102,6 +104,10 @@ public class RadioTag extends SimpleTagSupport { public void setDisabled(String disabled) { this.disabled = disabled; } + + public void setSpanYn(String spanYn) { + this.spanYn = spanYn; + } public void setIncludes(String includes) { if (!StringUtil.isEmpty(StringUtil.trim(includes))) { @@ -123,6 +129,15 @@ public class RadioTag extends SimpleTagSupport { @Override public void doTag() throws JspException, IOException { + + String spanStart = ""; + String spanEnd = ""; + + if ("Y".equals(spanYn)) { + spanStart = ""; + spanEnd = ""; + } + JspWriter out = getJspContext().getOut(); StringBuffer tag = new StringBuffer(""); @@ -130,7 +145,7 @@ public class RadioTag extends SimpleTagSupport { id = id+i++; if (defaultText != null) { - tag.append("\n\t\t "); + tag.append("> "+spanEnd); } - + ComDefaultCodeVO vo = new ComDefaultCodeVO(); vo.setCodeId(codeId); @@ -161,7 +176,7 @@ public class RadioTag extends SimpleTagSupport { for (CmmnDetailCode code : codeList) { if (includeSet == null || includeSet.contains(code.getCode())) { id = id+i++; - tag.append("\n\t\t "); + tag.append("> "+spanEnd); } } diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index 389e0e71..55a91d99 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -595,7 +595,7 @@ public class AdjstReqStatusController { // DateUtil.AddDate 더하고싶은 날짜, 년, 월, 일 detailVO.setPayEndDay(DateUtil.AddDate(detailVO.getFrstRegistPnttm(), 0, 0, 7)); model.addAttribute("info", detailVO); - + return "/web/kccadr/accdnt/ars/tab/docIssDetail"; } diff --git a/src/main/java/kcc/kccadr/adrpr/service/AdrPrsctLinkVO.java b/src/main/java/kcc/kccadr/adrpr/service/AdrPrsctLinkVO.java index d035d7b0..02278962 100644 --- a/src/main/java/kcc/kccadr/adrpr/service/AdrPrsctLinkVO.java +++ b/src/main/java/kcc/kccadr/adrpr/service/AdrPrsctLinkVO.java @@ -5,19 +5,37 @@ import kcc.com.cmm.ComDefaultVO; public class AdrPrsctLinkVO extends ComDefaultVO{ private static final long serialVersionUID = 1L; - private String prsctSeq; // 검찰연계 일련번호 - private String dividendDate; // 배당일 - private String prsctNo; // 본사건번호 - private String prsctAdrNo; // 조정사건번호 - private String plntfNm; // 원고-대리인 이름 - private String plntfPhone; // 원고-대리인 연락처 - private String dfndnNm; // 피고-대리인 이름 - private String dfndnPhone; // 피고-대리인 연락처 - private String prsctCn; // 사건내용 - private String frstRegisterId; // 등록자 - private String frstRegistPnttm; // 등록일시 - private String lastUpdusrId; // 수정자 - private String lastUpdtPnttm; // 수정일시 + private String prsctSeq; // 검찰연계 일련번호 + private String prsctNo; // 접수번호 + private String prsctDvddDate; // 접수일자 + private String rfrlOfic; // 회부청 + private String prsctPb; // 담당검사 + private String plntfNm; // 고소인 이름 + private String plntfDeNm; // 고소인 대리인 이름 + private String dfndnNm; // 피고소인 이름 + private String dfndnDeNm; // 피고소인 대리인 이름 + private String ccTyNm; // 저작물 유형명 + private String prsctCn; // 분쟁 내용 + private String memDeptNm; // 조정부 명 + private String assDateFrst; // 1차 조정기일 + private String assDateScd; // 2차 조정기일 + private String assSmtmPrgrs; // 기일동시진행 + private String rpplHead; // 부장 + private String rpplCmtFrst; // 위원1 + private String rpplCmtScd; // 위원2 + private String rpplCmtChg; // 위원변경 + private String prsctRslt; // 조정결과 + private String prsctEndDate; // 종결일 + private String prsctRsltCn; // 성립 내역 + private String prsctMoney; // 합의금액(원) + private String rpplCmtRplc; // 위원교체 + private String assCnt; // 기일수 + private String plntfTerm; // 조정기간 + private String frstRegisterId; // 등록자 + private String frstRegistPnttm; // 등록일시 + private String lastUpdusrId; // 수정자 + private String lastUpdtPnttm; // 수정일시 + public String getPrsctSeq() { return prsctSeq; @@ -25,23 +43,29 @@ public class AdrPrsctLinkVO extends ComDefaultVO{ public void setPrsctSeq(String prsctSeq) { this.prsctSeq = prsctSeq; } - public String getDividendDate() { - return dividendDate; - } - public void setDividendDate(String dividendDate) { - this.dividendDate = dividendDate; - } public String getPrsctNo() { return prsctNo; } public void setPrsctNo(String prsctNo) { this.prsctNo = prsctNo; } - public String getPrsctAdrNo() { - return prsctAdrNo; + public String getPrsctDvddDate() { + return prsctDvddDate; } - public void setPrsctAdrNo(String prsctAdrNo) { - this.prsctAdrNo = prsctAdrNo; + public void setPrsctDvddDate(String prsctDvddDate) { + this.prsctDvddDate = prsctDvddDate; + } + public String getRfrlOfic() { + return rfrlOfic; + } + public void setRfrlOfic(String rfrlOfic) { + this.rfrlOfic = rfrlOfic; + } + public String getPrsctPb() { + return prsctPb; + } + public void setPrsctPb(String prsctPb) { + this.prsctPb = prsctPb; } public String getPlntfNm() { return plntfNm; @@ -49,11 +73,11 @@ public class AdrPrsctLinkVO extends ComDefaultVO{ public void setPlntfNm(String plntfNm) { this.plntfNm = plntfNm; } - public String getPlntfPhone() { - return plntfPhone; + public String getPlntfDeNm() { + return plntfDeNm; } - public void setPlntfPhone(String plntfPhone) { - this.plntfPhone = plntfPhone; + public void setPlntfDeNm(String plntfDeNm) { + this.plntfDeNm = plntfDeNm; } public String getDfndnNm() { return dfndnNm; @@ -61,11 +85,17 @@ public class AdrPrsctLinkVO extends ComDefaultVO{ public void setDfndnNm(String dfndnNm) { this.dfndnNm = dfndnNm; } - public String getDfndnPhone() { - return dfndnPhone; + public String getDfndnDeNm() { + return dfndnDeNm; } - public void setDfndnPhone(String dfndnPhone) { - this.dfndnPhone = dfndnPhone; + public void setDfndnDeNm(String dfndnDeNm) { + this.dfndnDeNm = dfndnDeNm; + } + public String getCcTyNm() { + return ccTyNm; + } + public void setCcTyNm(String ccTyNm) { + this.ccTyNm = ccTyNm; } public String getPrsctCn() { return prsctCn; @@ -73,6 +103,96 @@ public class AdrPrsctLinkVO extends ComDefaultVO{ public void setPrsctCn(String prsctCn) { this.prsctCn = prsctCn; } + public String getMemDeptNm() { + return memDeptNm; + } + public void setMemDeptNm(String memDeptNm) { + this.memDeptNm = memDeptNm; + } + public String getAssDateFrst() { + return assDateFrst; + } + public void setAssDateFrst(String assDateFrst) { + this.assDateFrst = assDateFrst; + } + public String getAssDateScd() { + return assDateScd; + } + public void setAssDateScd(String assDateScd) { + this.assDateScd = assDateScd; + } + public String getAssSmtmPrgrs() { + return assSmtmPrgrs; + } + public void setAssSmtmPrgrs(String assSmtmPrgrs) { + this.assSmtmPrgrs = assSmtmPrgrs; + } + public String getRpplHead() { + return rpplHead; + } + public void setRpplHead(String rpplHead) { + this.rpplHead = rpplHead; + } + public String getRpplCmtFrst() { + return rpplCmtFrst; + } + public void setRpplCmtFrst(String rpplCmtFrst) { + this.rpplCmtFrst = rpplCmtFrst; + } + public String getRpplCmtScd() { + return rpplCmtScd; + } + public void setRpplCmtScd(String rpplCmtScd) { + this.rpplCmtScd = rpplCmtScd; + } + public String getRpplCmtChg() { + return rpplCmtChg; + } + public void setRpplCmtChg(String rpplCmtChg) { + this.rpplCmtChg = rpplCmtChg; + } + public String getPrsctRslt() { + return prsctRslt; + } + public void setPrsctRslt(String prsctRslt) { + this.prsctRslt = prsctRslt; + } + public String getPrsctEndDate() { + return prsctEndDate; + } + public void setPrsctEndDate(String prsctEndDate) { + this.prsctEndDate = prsctEndDate; + } + public String getPrsctRsltCn() { + return prsctRsltCn; + } + public void setPrsctRsltCn(String prsctRsltCn) { + this.prsctRsltCn = prsctRsltCn; + } + public String getPrsctMoney() { + return prsctMoney; + } + public void setPrsctMoney(String prsctMoney) { + this.prsctMoney = prsctMoney; + } + public String getRpplCmtRplc() { + return rpplCmtRplc; + } + public void setRpplCmtRplc(String rpplCmtRplc) { + this.rpplCmtRplc = rpplCmtRplc; + } + public String getAssCnt() { + return assCnt; + } + public void setAssCnt(String assCnt) { + this.assCnt = assCnt; + } + public String getPlntfTerm() { + return plntfTerm; + } + public void setPlntfTerm(String plntfTerm) { + this.plntfTerm = plntfTerm; + } public String getFrstRegisterId() { return frstRegisterId; } @@ -98,4 +218,7 @@ public class AdrPrsctLinkVO extends ComDefaultVO{ this.lastUpdtPnttm = lastUpdtPnttm; } + + + } diff --git a/src/main/java/kcc/kccadr/adrpr/web/AdrPrsctLinkController.java b/src/main/java/kcc/kccadr/adrpr/web/AdrPrsctLinkController.java index 12e00e75..300e514b 100644 --- a/src/main/java/kcc/kccadr/adrpr/web/AdrPrsctLinkController.java +++ b/src/main/java/kcc/kccadr/adrpr/web/AdrPrsctLinkController.java @@ -1,6 +1,9 @@ package kcc.kccadr.adrpr.web; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Comparator; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -9,6 +12,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -232,6 +236,7 @@ public class AdrPrsctLinkController { * @return * @throws Exception */ + @SuppressWarnings("deprecation") @RequestMapping(value = "/kccadr/adrpr/adrPrsctLinkSendExelAjax.do") @ResponseBody public Object adrPrsctLinkSendExelAjax(final MultipartHttpServletRequest multiRequest) throws Exception { @@ -287,7 +292,7 @@ public class AdrPrsctLinkController { return jr; } - for(int i=2; i< sheet.getLastRowNum() + 2; i++){ //먼저 밸리데이션 체크(1줄은 생략) + for(int i=1; i< sheet.getLastRowNum() + 2; i++){ //먼저 밸리데이션 체크(1줄은 생략) HSSFRow row = sheet.getRow(i); //열읽기 if(null == row) { continue; @@ -297,119 +302,67 @@ public class AdrPrsctLinkController { // 행의 두번째 열(이름부터 받아오기) HSSFCell cell = null; boolean errSts = true; - for(int j = 0 ; j < 8; j++){ //행읽기(6행까지나 2행까지만 필요) + for(int j = 0 ; j < 25; j++){ //행읽기(6행까지나 2행까지만 필요) cellValue = ""; - cell = row.getCell(j); //이름/핸드폰/변환1/변환2/변환3/변환4/변환5 + cell = row.getCell(j); if(null == cell || "".equals(cell.toString().trim())) { //셀에 값이 없으면 - //System.out.println("Cell 데이터가 없습니다."); if(j == 1) { if (sheet.getLastRowNum() == i) { continue; } - - //errPhoneCnt++; - //errSts = false; break; } } + if(null != cell){ switch(cell.getCellType()){ //숫자타임을 문자로 변환 case Cell.CELL_TYPE_NUMERIC: - cell.setCellType(Cell.CELL_TYPE_STRING); + if(HSSFDateUtil.isCellDateFormatted(cell)) { + Date date = cell.getDateCellValue(); + cellValue = new SimpleDateFormat("yyyy-MM-dd").format(date); + }else { + cell.setCellType(Cell.CELL_TYPE_STRING); + cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; + } + break; + case Cell.CELL_TYPE_FORMULA: + cell.setCellType(Cell.CELL_TYPE_STRING); + cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; + break; + default: + cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; + break; } - cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; + /* cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; */ } // 항목 체크 Start - if(j == 0) { - //배당일 - if(getItemChk("dividendDate", cellValue) && errSts) { - hashMap.put("dividendDate", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(배당일) "; - errSts = false; - break; - } - } - if(j == 1) { - //본사건번호 - if(getItemChk("prsctNo", cellValue) && errSts) { - hashMap.put("prsctNo", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(본사건번호) "; - errSts = false; - break; - } - } - if(j == 2) { - //조정사건번호 - if(getItemChk("prsctAdrNo", cellValue) && errSts) { - hashMap.put("prsctAdrNo", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(조정사건번호) "; - errSts = false; - break; - } - } - if(j == 3) { - //원고 이름 - if(getItemChk("plntfNm", cellValue) && errSts) { - hashMap.put("plntfNm", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(원고 이름) "; - errSts = false; - break; - } - } - if(j == 4) { - //원고 연락처 - if(getItemChk("plntfPhone", cellValue) && errSts) { - hashMap.put("plntfPhone", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(원고 연락처) "; - errSts = false; - break; - } - } - if(j == 5) { - //피고 이름 - if(getItemChk("dfndnNm", cellValue) && errSts) { - hashMap.put("dfndnNm", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(피고 이름) "; - errSts = false; - break; - } - } - if(j == 6) { - //피고 연락처 - if(getItemChk("dfndnPhone", cellValue) && errSts) { - hashMap.put("dfndnPhone", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(피고 연락처) "; - errSts = false; - break; - } - } - if(j == 7) { - //사건내용 - if(getItemChk("prsctCn", cellValue) && errSts) { - hashMap.put("prsctCn", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(사건내용) "; - errSts = false; - break; - } - } + if(!cellMake("prsctNo", "접수번호", i, j, 0, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctDvddDate", "접수일자", i, j, 1, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rfrlOfic", "회부청", i, j, 2, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctPb", "담당검사", i, j, 3, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("plntfNm", "고소인 이름", i, j, 4, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("plntfDeNm", "고소인 대리인 이름", i, j, 5, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("dfndnNm", "피고소인 이름", i, j, 6, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("dfndnDeNm", "피고소인 대리인 이름", i, j, 7, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("ccTyNm", "저작물 유형명", i, j, 8, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctCn", "분쟁 내용", i, j, 9, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("memDeptNm", "조정부 명", i, j, 10, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("assDateFrst", "1차 조정기일", i, j, 11, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("assDateScd", "2차 조정기일", i, j, 12, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("assSmtmPrgrs", "기일동시진행", i, j, 13, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplHead", "부장", i, j, 14, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplCmtFrst", "위원1", i, j, 15, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplCmtScd", "위원2", i, j, 16, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplCmtChg", "위원변경", i, j, 17, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctRslt", "조정결과", i, j, 18, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctEndDate", "종결일", i, j, 19, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctRsltCn", "성립 내역", i, j, 20, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctMoney", "합의금액(원)", i, j, 21, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplCmtRplc", "위원교체", i, j, 22, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("assCnt", "기일수", i, j, 23, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("plntfTerm", "조정기간", i, j, 24, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; // 항목 체크 End } @@ -448,7 +401,7 @@ public class AdrPrsctLinkController { return jr; } - for(int i=2; i< sheet.getLastRowNum() + 2; i++){ //먼저 밸리데이션 체크(1줄은 생략) + for(int i=1; i< sheet.getLastRowNum() + 2; i++){ //먼저 밸리데이션 체크(1줄은 생략) XSSFRow row = sheet.getRow(i); //열읽기 if(null == row) { continue; @@ -459,7 +412,7 @@ public class AdrPrsctLinkController { XSSFCell cell = null; boolean errSts = true; - for(int j = 0 ; j < 8; j++){ //행읽기(6행까지나 2행까지만 필요) + for(int j = 0 ; j < 25; j++){ //행읽기(6행까지나 2행까지만 필요) cellValue = ""; cell = row.getCell(j); //이름/핸드폰/변환1/변환2/변환3/변환4/변환5 if(null == cell || "".equals(cell.toString().trim())) { //셀에 값이 없으면 @@ -473,100 +426,51 @@ public class AdrPrsctLinkController { if(null != cell){ switch(cell.getCellType()){ //숫자타임을 문자로 변환 case Cell.CELL_TYPE_NUMERIC: - cell.setCellType(Cell.CELL_TYPE_STRING); + if(HSSFDateUtil.isCellDateFormatted(cell)) { + Date date = cell.getDateCellValue(); + cellValue = new SimpleDateFormat("yyyy-MM-dd").format(date); + }else { + cell.setCellType(Cell.CELL_TYPE_STRING); + cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; + } + break; + case Cell.CELL_TYPE_FORMULA: + cell.setCellType(Cell.CELL_TYPE_STRING); + cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; + break; + default: + cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; + break; } - cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; + /* cellValue = StringUtil.getString(cell.getStringCellValue().trim()) ; */ } // 항목 체크 Start - if(j == 0) { - //배당일 - if(getItemChk("dividendDate", cellValue) && errSts) { - hashMap.put("dividendDate", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(배당일) "; - errSts = false; - break; - } - } - if(j == 1) { - //본사건번호 - if(getItemChk("prsctNo", cellValue) && errSts) { - hashMap.put("prsctNo", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(본사건번호) "; - errSts = false; - break; - } - } - if(j == 2) { - //조정사건번호 - if(getItemChk("prsctAdrNo", cellValue) && errSts) { - hashMap.put("prsctAdrNo", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(조정사건번호) "; - errSts = false; - break; - } - } - if(j == 3) { - //원고 이름 - if(getItemChk("plntfNm", cellValue) && errSts) { - hashMap.put("plntfNm", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(원고 이름) "; - errSts = false; - break; - } - } - if(j == 4) { - //원고 연락처 - if(getItemChk("plntfPhone", cellValue) && errSts) { - hashMap.put("plntfPhone", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(원고 연락처) "; - errSts = false; - break; - } - } - if(j == 5) { - //피고 이름 - if(getItemChk("dfndnNm", cellValue) && errSts) { - hashMap.put("dfndnNm", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(피고 이름) "; - errSts = false; - break; - } - } - if(j == 6) { - //피고 연락처 - if(getItemChk("dfndnPhone", cellValue) && errSts) { - hashMap.put("dfndnPhone", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(피고 연락처) "; - errSts = false; - break; - } - } - if(j == 7) { - //사건내용 - if(getItemChk("prsctCn", cellValue) && errSts) { - hashMap.put("prsctCn", cellValue); - }else { - errItemCnt++; - errItemLine += (i+1) + "행(사건내용) "; - errSts = false; - break; - } - } + if(!cellMake("prsctNo", "접수번호", i, j, 0, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctDvddDate", "접수일자", i, j, 1, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rfrlOfic", "회부청", i, j, 2, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctPb", "담당검사", i, j, 3, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("plntfNm", "고소인 이름", i, j, 4, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("plntfDeNm", "고소인 대리인 이름", i, j, 5, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("dfndnNm", "피고소인 이름", i, j, 6, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("dfndnDeNm", "피고소인 대리인 이름", i, j, 7, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("ccTyNm", "저작물 유형명", i, j, 8, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctCn", "분쟁 내용", i, j, 9, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("memDeptNm", "조정부 명", i, j, 10, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("assDateFrst", "1차 조정기일", i, j, 11, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("assDateScd", "2차 조정기일", i, j, 12, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("assSmtmPrgrs", "기일동시진행", i, j, 13, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplHead", "부장", i, j, 14, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplCmtFrst", "위원1", i, j, 15, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplCmtScd", "위원2", i, j, 16, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplCmtChg", "위원변경", i, j, 17, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctRslt", "조정결과", i, j, 18, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctEndDate", "종결일", i, j, 19, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctRsltCn", "성립 내역", i, j, 20, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("prsctMoney", "합의금액(원)", i, j, 21, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("rpplCmtRplc", "위원교체", i, j, 22, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("assCnt", "기일수", i, j, 23, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; + if(!cellMake("plntfTerm", "조정기간", i, j, 24, cellValue, errSts, hashMap, errItemCnt, errItemLine)) break; // 항목 체크 End } @@ -592,21 +496,38 @@ public class AdrPrsctLinkController { // List foreach 문 for (HashMap item : hashMapList) { AdrPrsctLinkVO adrPrsctLinkVO = new AdrPrsctLinkVO(); - adrPrsctLinkVO.setDividendDate(item.get("dividendDate")); adrPrsctLinkVO.setPrsctNo(item.get("prsctNo")); - adrPrsctLinkVO.setPrsctAdrNo(item.get("prsctAdrNo")); + adrPrsctLinkVO.setPrsctDvddDate(item.get("prsctDvddDate")); + adrPrsctLinkVO.setRfrlOfic(item.get("rfrlOfic")); + adrPrsctLinkVO.setPrsctPb(item.get("prsctPb")); adrPrsctLinkVO.setPlntfNm(item.get("plntfNm")); - adrPrsctLinkVO.setPlntfPhone(item.get("plntfPhone")); + adrPrsctLinkVO.setPlntfDeNm(item.get("plntfDeNm")); adrPrsctLinkVO.setDfndnNm(item.get("dfndnNm")); - adrPrsctLinkVO.setDfndnPhone(item.get("dfndnPhone")); + adrPrsctLinkVO.setDfndnDeNm(item.get("dfndnDeNm")); + adrPrsctLinkVO.setCcTyNm(item.get("ccTyNm")); adrPrsctLinkVO.setPrsctCn(item.get("prsctCn")); - adrPrsctLinkVO.setFrstRegisterId(loginVO.getUniqId()); - adrPrsctLinkVO.setLastUpdusrId(loginVO.getUniqId()); + adrPrsctLinkVO.setMemDeptNm(item.get("memDeptNm")); + adrPrsctLinkVO.setAssDateFrst(item.get("assDateFrst")); + adrPrsctLinkVO.setAssDateScd(item.get("assDateScd")); + adrPrsctLinkVO.setAssSmtmPrgrs(item.get("assSmtmPrgrs")); + adrPrsctLinkVO.setRpplHead(item.get("rpplHead")); + adrPrsctLinkVO.setRpplCmtFrst(item.get("rpplCmtFrst")); + adrPrsctLinkVO.setRpplCmtScd(item.get("rpplCmtScd")); + adrPrsctLinkVO.setRpplCmtChg(item.get("rpplCmtChg")); + adrPrsctLinkVO.setPrsctRslt(item.get("prsctRslt")); + adrPrsctLinkVO.setPrsctEndDate(item.get("prsctEndDate")); + adrPrsctLinkVO.setPrsctRsltCn(item.get("prsctRsltCn")); + adrPrsctLinkVO.setPrsctMoney(item.get("prsctMoney")); + adrPrsctLinkVO.setRpplCmtRplc(item.get("rpplCmtRplc")); + adrPrsctLinkVO.setAssCnt(item.get("assCnt")); + adrPrsctLinkVO.setPlntfTerm(item.get("plntfTerm")); //List Add adrPrsctLinkList.add(adrPrsctLinkVO); } + adrPrsctLinkList.stream().sorted(Comparator.comparing(AdrPrsctLinkVO::getPrsctNo)); + //Step2. 데이터 저장 adrPrsctLinkService.adrPrsctLinkListInsert(adrPrsctLinkList); } @@ -670,5 +591,35 @@ public class AdrPrsctLinkController { return rtnVal; } + + private Boolean cellMake( + String info + , String itemNm + , int i + , int j + , int cnt + , String cellValue + , boolean errSts + , HashMap hashMap + , int errItemCnt + , String errItemLine + ) { + + Boolean result = true; + + if(j == cnt) { + if(getItemChk(info, cellValue) && errSts) { + hashMap.put(info, cellValue); + }else { + errItemCnt++; + errItemLine += (i+1) + "행("+itemNm+") "; + errSts = false; +// break; + result = false; + } + } + + return result; + } } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java index 47ab05d1..50bba426 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java @@ -68,7 +68,7 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { private String whereCkSts; // 검색조건 발급상태 private String ckStsListAll; // 검색조건 발급상태 - + private String searchRecordReadingFlag; @@ -306,6 +306,13 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { public void setCkStsListAll(String ckStsListAll) { this.ckStsListAll = ckStsListAll; } + public String getSearchRecordReadingFlag() { + return searchRecordReadingFlag; + } + public void setSearchRecordReadingFlag(String searchRecordReadingFlag) { + this.searchRecordReadingFlag = searchRecordReadingFlag; + } + } diff --git a/src/main/java/kcc/kccadr/stts/web/SttsPrcsController.java b/src/main/java/kcc/kccadr/stts/web/SttsPrcsController.java index 95da9504..74dec807 100644 --- a/src/main/java/kcc/kccadr/stts/web/SttsPrcsController.java +++ b/src/main/java/kcc/kccadr/stts/web/SttsPrcsController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import kcc.com.cmm.spring.data.util.ExcelUtil; +import kcc.kccadr.adrpr.service.AdrPrsctLinkVO; import kcc.kccadr.stts.service.SttsService; import kcc.kccadr.stts.service.SttsVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @@ -329,6 +330,25 @@ public class SttsPrcsController { return "/kccadr/stts/sttsAdr"; } + /** + * (관리자) 검찰연계 + * + * @return String + * @exception Exception + */ + @RequestMapping(value = "/kccadr/stts/sttsPrsct.do") + public String sttsPrsct(ModelMap model, AdrPrsctLinkVO adrPrsctLinkVO) throws Exception { + +// List list = sttsService.sttsAdrList(sttsVO); + +// model.addAttribute("list", decrypt(list)); +// model.addAttribute("sttsVO", sttsVO); + + + + return "/kccadr/stts/sttsAdr"; + } + @SuppressWarnings("rawtypes") @RequestMapping(value = "/kccadr/stts/sttsAdrExcel.do") diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java index f3494de9..56c3de2e 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -1299,10 +1299,10 @@ public class EgovBBSManageController { SimpleDateFormat t1 = new SimpleDateFormat("yyyyMMdd"); String nowTime = t1.format(cal.getTime());*/ - for (BoardVO bvo: resultList) { - Document doc = Jsoup.parse(bvo.getNttCn()); - String text = doc.text(); - bvo.setNttCn2(text); +// for (BoardVO bvo: resultList) { +// Document doc = Jsoup.parse(bvo.getNttCn()); +// String text = doc.text(); +// bvo.setNttCn2(text); /*if("9470000".equals(bmVO.getMenuNo())){ //인재채용시 String tempYmd = ""; if(null != bvo.getNtceBgnde() && !"".equals(bvo.getNtceBgnde())) { //모집기간 요일 추가하여 txt로 변환 @@ -1322,7 +1322,7 @@ public class EgovBBSManageController { bvo.setNtceEnddeView(tempYmd); } }*/ - } +// } PaginationInfo paginationInfoMobile = new PaginationInfo(); paginationInfoMobile.setCurrentPageNo(paginationInfo.getCurrentPageNo()); paginationInfoMobile.setTotalRecordCount(paginationInfo.getTotalRecordCount()); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml index 387df9e5..f56eb36e 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml @@ -1014,6 +1014,7 @@ $searchSortOrd$ + LIMIT #recordCountPerPage# OFFSET #firstIndex# SELECT - PRSCT_SEQ AS prsctSeq - ,TO_CHAR(DIVIDEND_DATE,'YYYY-MM-DD') AS dividendDate - ,PRSCT_NO AS prsctNo - ,PRSCT_ADR_NO AS prsctAdrNo - ,PLNTF_NM AS plntfNm - ,PLNTF_PHONE AS plntfPhone - ,DFNDN_NM AS dfndnNm - ,DFNDN_PHONE AS dfndnPhone - ,PRSCT_CN AS prsctCn - ,FRST_REGISTER_ID AS frstRegisterId - ,FRST_REGIST_PNTTM AS frstRegistPnttm - ,LAST_UPDUSR_ID AS lastUpdusrId - ,LAST_UPDT_PNTTM AS lastUpdtPnttm + prsct_seq AS prsctSeq , + prsct_no AS prsctNo , + prsct_dvdd_date AS prsctDvddDate , + rfrl_ofic AS rfrlOfic , + prsct_pb AS prsctPb , + plntf_nm AS plntfNm , + plntf_de_nm AS plntfDeNm , + dfndn_nm AS dfndnNm , + dfndn_de_nm AS dfndnDeNm , + cc_ty_nm AS ccTyNm , + prsct_cn AS prsctCn , + mem_dept_nm AS memDeptNm , + ass_date_frst AS assDateFrst , + ass_date_scd AS assDateScd , + ass_smtm_prgrs AS assSmtmPrgrs , + rppl_head AS rpplHead , + rppl_cmt_frst AS rpplCmtFrst , + rppl_cmt_scd AS rpplCmtScd , + rppl_cmt_chg AS rpplCmtChg , + prsct_rslt AS prsctRslt , + prsct_end_date AS prsctEndDate , + prsct_rslt_cn AS prsctRsltCn , + prsct_money AS prsctMoney , + rppl_cmt_rplc AS rpplCmtRplc , + ass_cnt AS assCnt , + plntf_term AS plntfTerm , + frst_register_id AS frstRegisterId , + frst_regist_pnttm AS frstRegistPnttm , + last_updusr_id AS lastUpdusrId , + last_updt_pnttm AS lastUpdtPnttm FROM ADR_PRSCT_LINK WHERE PRSCT_SEQ = #prsctSeq# INSERT INTO ADR_PRSCT_LINK ( - PRSCT_SEQ - ,DIVIDEND_DATE - ,PRSCT_NO - ,PRSCT_ADR_NO - ,PLNTF_NM - ,PLNTF_PHONE - ,DFNDN_NM - ,DFNDN_PHONE - ,PRSCT_CN - ,FRST_REGISTER_ID - ,FRST_REGIST_PNTTM + prsct_seq + , prsct_no + , prsct_dvdd_date + , rfrl_ofic + , prsct_pb + , plntf_nm + , plntf_de_nm + , dfndn_nm + , dfndn_de_nm + , cc_ty_nm + , prsct_cn + , mem_dept_nm + , ass_date_frst + , ass_date_scd + , ass_smtm_prgrs + , rppl_head + , rppl_cmt_frst + , rppl_cmt_scd + , rppl_cmt_chg + , prsct_rslt + , prsct_end_date + , prsct_rslt_cn + , prsct_money + , rppl_cmt_rplc + , ass_cnt + , plntf_term + , frst_register_id + , frst_regist_pnttm ) VALUES ( - #prsctSeq# - ,#dividendDate# - ,#prsctNo# - ,#prsctAdrNo# - ,#plntfNm# - ,#plntfPhone# - ,#dfndnNm# - ,#dfndnPhone# - ,#prsctCn# - ,#frstRegisterId# - ,NOW() + #prsctSeq#, + #prsctNo#, + #prsctDvddDate#, + #rfrlOfic#, + #prsctPb#, + #plntfNm#, + #plntfDeNm#, + #dfndnNm#, + #dfndnDeNm#, + #ccTyNm#, + #prsctCn#, + #memDeptNm#, + #assDateFrst#, + #assDateScd#, + #assSmtmPrgrs#, + #rpplHead#, + #rpplCmtFrst#, + #rpplCmtScd#, + #rpplCmtChg#, + #prsctRslt#, + #prsctEndDate#, + #prsctRsltCn#, + #prsctMoney#, + #rpplCmtRplc#, + #assCnt#, + #plntfTerm#, + #frstRegisterId# , + #frstRegistPnttm# + ) - UPDATE ADR_PRSCT_LINK SET - PRSCT_SEQ = #prsctSeq# - ,DIVIDEND_DATE = #dividendDate# - ,PRSCT_NO = #prsctNo# - ,PRSCT_ADR_NO = #prsctAdrNo# - ,PLNTF_NM = #plntfNm# - ,PLNTF_PHONE = #plntfPhone# - ,DFNDN_NM = #dfndnNm# - ,DFNDN_PHONE = #dfndnPhone# - ,PRSCT_CN = #prsctCn# - ,LAST_UPDUSR_ID = #lastUpdusrId# - ,LAST_UPDT_PNTTM = NOW() - WHERE PRSCT_SEQ = #prsctSeq# + UPDATE ADR_PRSCT_LINK SET + prsct_seq =#prsctSeq# + , prsct_no = #prsctNo# + , prsct_dvdd_date = #prsctDvddDate# + , rfrl_ofic = #rfrlOfic# + , prsct_pb = #prsctPb# + , plntf_nm = #plntfNm# + , plntf_de_nm = #plntfDeNm# + , dfndn_nm = #dfndnNm# + , dfndn_de_nm = #dfndnDeNm# + , cc_ty_nm = #ccTyNm# + , prsct_cn = #prsctCn# + , mem_dept_nm = #memDeptNm# + , ass_date_frst = #assDateFrst# + , ass_date_scd = #assDateScd# + , ass_smtm_prgrs = #assSmtmPrgrs# + , rppl_head = #rpplHead# + , rppl_cmt_frst = #rpplCmtFrst# + , rppl_cmt_scd = #rpplCmtScd# + , rppl_cmt_chg = #rpplCmtChg# + , prsct_rslt = #prsctRslt# + , prsct_end_date = #prsctEndDate# + , prsct_rslt_cn = #prsctRsltCn# + , prsct_money = #prsctMoney# + , rppl_cmt_rplc = #rpplCmtRplc# + , ass_cnt = #assCnt# + , plntf_term = #plntfTerm# + , frst_register_id = #frstRegisterId# + , frst_regist_pnttm = now() + , last_updusr_id = #lastUpdusrId# + , last_updt_pnttm = now() + WHERE PRSCT_SEQ = #prsctSeq# diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advcRecord/AdrRecordReading_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advcRecord/AdrRecordReading_SQL_Cubrid.xml index edf89cc8..1a5f12ef 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advcRecord/AdrRecordReading_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advcRecord/AdrRecordReading_SQL_Cubrid.xml @@ -247,6 +247,12 @@ A.prcsn_stat_cd LIKE CONCAT('%' , #searchSelStatus#, '%') + + + a.record_reading_flag = #searchRecordReadingFlag# + + + ORDER BY 1=1 ,$searchSortCnd$ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adrpr/adrPrsctLinkList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adrpr/adrPrsctLinkList.jsp index 0f243c66..a018a20b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adrpr/adrPrsctLinkList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adrpr/adrPrsctLinkList.jsp @@ -123,17 +123,17 @@ function openExcelUploadPop() {

  • 구분

         -

    배당일

    + <%--

    배당일

    @@ -150,7 +150,7 @@ function openExcelUploadPop() {
    - + --%>
    • @@ -188,25 +188,25 @@ function openExcelUploadPop() {
    - - - - - - - + + + + + + + - - - - - - - + + + + + + + @@ -221,22 +221,26 @@ function openExcelUploadPop() { - + + - - - + + - +
    번호사건번호조정사건번호원고피고배당일조정위원처리상태접수번호접수일자회부청고소인피고소인조정부명성립내역
    ${list.prsctNo}${list.prsctAdrNo}${list.prsctDvddDate} + ${list.rfrlOfic} + ${list.plntfNm} ${list.dfndnNm} - - ${list.dividendDate} + ${list.memDeptNm} + + ${list.prsctRsltCn} +
    diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adrpr/adrPrsctLinkRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adrpr/adrPrsctLinkRegist.jsp index 4ceca051..7b4dae32 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adrpr/adrPrsctLinkRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adrpr/adrPrsctLinkRegist.jsp @@ -66,14 +66,43 @@ function getAdrPrsctLinkDetail() { //등록화면 SHow function setAdrPrsctLinkShow(result) { - $("#dividendDate").val(result.dividendDate); //배당일 + /* $("#dividendDate").val(result.dividendDate); //배당일 $("#prsctNo").val(result.prsctNo); //본사건번호 $("#prsctAdrNo").val(result.prsctAdrNo); //조정사건번호 $("#plntfNm").val(result.plntfNm); //원고 이름 $("#dfndnNm").val(result.dfndnNm); //피고 이름 - $("#prsctCn").val(result.prsctCn); //사건내용 + $("#prsctCn").val(result.prsctCn); //사건내용 */ - //원고 연락처 + + $("#prsctNo").val(result.prsctNo); //접수번호 + $("#prsctDvddDate").val(result.prsctDvddDate); //접수일자 + $("#rfrlOfic").val(result.rfrlOfic); //회부청 + $("#prsctPb").val(result.prsctPb); //담당검사 + $("#plntfNm").val(result.plntfNm); //고소인 이름 + $("#plntfDeNm").val(result.plntfDeNm); //고소인 대리인 이름 + $("#dfndnNm").val(result.dfndnNm); //피고소인 이름 + $("#dfndnDeNm").val(result.dfndnDeNm); //피고소인 대리인 이름 + $("#ccTyNm").val(result.ccTyNm); //저작물 유형명 + $("#prsctCn").val(result.prsctCn); //분쟁 내용 + $("#memDeptNm").val(result.memDeptNm); //조정부 명 + $("#assDateFrst").val(result.assDateFrst); //1차 조정기일 + $("#assDateScd").val(result.assDateScd); //2차 조정기일 + $("#assSmtmPrgrs").val(result.assSmtmPrgrs); //기일동시진행 + $("#rpplHead").val(result.rpplHead); //부장 + $("#rpplCmtFrst").val(result.rpplCmtFrst); //위원1 + $("#rpplCmtScd").val(result.rpplCmtScd); //위원2 + $("#rpplCmtChg").val(result.rpplCmtChg); //위원변경 + $("#prsctRslt").val(result.prsctRslt); //조정결과 + $("#prsctEndDate").val(result.prsctEndDate); //종결일 + $("#prsctRsltCn").val(result.prsctRsltCn); //성립 내역 + $("#prsctMoney").val(result.prsctMoney); //합의금액(원) + $("#rpplCmtRplc").val(result.rpplCmtRplc); //위원교체 + $("#assCnt").val(result.assCnt); //기일수 + $("#plntfTerm").val(result.plntfTerm); //조정기간 + + + + /* //원고 연락처 var plntfPhone = ""; if (result.plntfPhone != null && result.plntfPhone != "") { plntfPhone = result.plntfPhone.split('-'); @@ -93,7 +122,7 @@ function setAdrPrsctLinkShow(result) { $("#dfndnPhone2").val(dfndnPhone[1]); $("#dfndnPhone3").val(dfndnPhone[2]); } - } + } */ //버튼명 수정 $("#btnRegister").html("수정"); @@ -101,20 +130,11 @@ function setAdrPrsctLinkShow(result) { //등록화면 Clear function setAdrPrsctLinkClear() { - $("#dividendDate").val(""); //배당일 - $("#prsctNo").val(""); //본사건번호 - $("#prsctAdrNo").val(""); //조정사건번호 - $("#plntfNm").val(""); //원고-대리인 이름 - $("#plntfPhone1").val(""); //원고-대리인 연락처 - $("#plntfPhone2").val(""); - $("#plntfPhone3").val(""); - $("#plntfPhone").val(""); - $("#dfndnNm").val(""); //피고-대리인 이름 - $("#dfndnPhone1").val(""); //피고-대리인 연락처 - $("#dfndnPhone2").val(""); - $("#dfndnPhone3").val(""); - $("#dfndnPhone").val(""); - $("#prsctCn").val(""); //사건내용 +// $("#dividendDate").val(""); //배당일 + + $('.tbType02').find('input').val('') + $('.tbType02').find('textarea').val('') + //검색조건 초기화 var listForm = document.listForm ; @@ -143,12 +163,6 @@ function setAdrPrsctLinkSaveConfirm() { //검찰연계 저장 function setAdrPrsctLinkSave() { $("#prsctSeq").val(prsctSeq); // 일련번호 - - // 연락처 대쉬처리 - var plntfPhone = $("#plntfPhone1").val() + "-" + $("#plntfPhone2").val() + "-" + $("#plntfPhone3").val(); - var dfndnPhone = $("#dfndnPhone1").val() + "-" + $("#dfndnPhone2").val() + "-" + $("#dfndnPhone3").val(); - $("#plntfPhone").val(plntfPhone); - $("#dfndnPhone").val(dfndnPhone); $.ajax({ type: "POST", @@ -182,7 +196,7 @@ function setAdrPrsctLinkSave() { //검찰연계 유효성 검사 function getValidCheck() { - if ($.trim($("#dividendDate").val()) == null || $.trim($("#dividendDate").val()) == "") { + /* if ($.trim($("#dividendDate").val()) == null || $.trim($("#dividendDate").val()) == "") { alert("배당일을 입력하세요"); $("#dividendDate").focus(); return false; @@ -246,7 +260,7 @@ function getValidCheck() { alert("사건내용을 입력하세요"); $("#prsctCn").focus(); return false; - } + } */ } @@ -258,6 +272,10 @@ function goList() { } + + @@ -304,7 +322,7 @@ function goList() { - + + + + + 접수번호 + 접수일자 + 회부청 + 담당검사 + 고소인 이름 + 고소인 대리인 이름 + 피고소인 이름 + 피고소인 대리인 이름 + 저작물 유형명 + 분쟁 내용 + 조정부 명 + 1차 조정기일 + 2차 조정기일 + 기일동시진행 + 부장 + 위원1 + 위원2 + 위원변경 + 조정결과 + 종결일 + 성립 내역 + 합의금액(원) + 위원교체 + 기일수 + 조정기간 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/stts/sttsAdj.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/stts/sttsAdj.jsp new file mode 100644 index 00000000..6e2dde84 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/stts/sttsAdj.jsp @@ -0,0 +1,230 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<% + /** + * @Class Name : sttsAdjPrcs.jsp + * @Description : 조정처리 현황 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.11.01 이준호 최초 생성 + * @author 이준호 + * @since 2021.11.01 + * @version 1.0 + * @see + * + */ +%> + + +조정처리 현황 + + + + + + +
    + + + + + +
    +
    + + +
    +

    조정처리 현황 - 엑셀 다운로드

    +
      +
      • +
    • +

      통계

      +
      • +
    • 조정처리 현황
      • +
    +
    + + + +
    + +
    +
    +
    + +
    +
    +
      +
    • +

      구분

      + + + + + + +
      • + +
    + + +
    +
    +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    접수번호접수일자신청인(대리인)피신청인(대리인)저작물 유형분쟁내용조정결과...

    +<%--
    --%> +

    + + () + +

    +

    + + () + +

    +

    ...

    자료가 없습니다. 다른 검색조건을 선택해주세요

    +
    + +
    +
    +
    + + +
    + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyList.jsp index e1a0fd04..9e5a4ed8 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/viewRecords/applyList.jsp @@ -222,6 +222,17 @@
    + +
  • +

    발급구분

    +
    + <%-- + + --%> + +
    +
    • +

  • 신청일자

    diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp index e3a910cf..25fc32be 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp @@ -24,7 +24,7 @@ pageIndex : pageNo, searchKeyword : $("#searchKeyword").val(), searchCondition : $("#searchCondition").val(), - pageUnit : 2, + pageUnit : $("#pageUnit").val(), } AdjstReq.historyAdjstPopEndList(data); } @@ -57,9 +57,10 @@ - -" /> -" /> + +" /> +" /> +" />
    diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 93c551a8..291ee67a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1331,6 +1331,8 @@ var AdjstReq = { ); }, historyAdjstPopEndList : function(paramObj){ + console.log("paramObj :: ",paramObj); + console.log("paramObj :: ",paramObj == undefined); if(paramObj == undefined || paramObj == ''){ paramObj = { pageIndex : 1, diff --git a/src/main/webapp/WEB-INF/tlds/kcc_tld.tld b/src/main/webapp/WEB-INF/tlds/kcc_tld.tld index 002b4518..f537a8d8 100644 --- a/src/main/webapp/WEB-INF/tlds/kcc_tld.tld +++ b/src/main/webapp/WEB-INF/tlds/kcc_tld.tld @@ -220,6 +220,12 @@ false false java.lang.String + + + spanYn + false + false + java.lang.String ${ec:radio codeId="APPROVAL_GB" name="searchApprovalGb" id="searchApprovalGb" css="class='topsch_select'" includes="Y,N" defaultText="전체" selectedValue="Y" }