diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index 33b60ca6..da2e506b 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -24,6 +24,7 @@ import com.ibm.icu.text.SimpleDateFormat; import seed.com.gtm.seedfile.SeedFileService; import seed.com.user.mypage.MyPageService; +import seed.common.service.InnorixFileService; import seed.manager.group.service.ManagerGroupService; import seed.manager.member.service.ManagerMemberService; import seed.manager.site.service.ManagerSiteManagerService; @@ -57,6 +58,9 @@ public class WebMediationController { @Autowired private ManagerGroupService managerGroupService; + @Autowired + private InnorixFileService innorixFileService; + @Autowired private MediationService service; @@ -3293,12 +3297,25 @@ public class WebMediationController { service.rceUpdate(paramMap); - if(!"".equals(SeedUtils.setReplaceNull(paramMap.get("fileFuncType")))) { + /*if(!"".equals(SeedUtils.setReplaceNull(paramMap.get("fileFuncType")))) { fileService.fileInsert(paramMap, request, session); } // fileService.fileInsert(paramMap, request, session); - fileService.caseFileDel(paramMap); + fileService.caseFileDel(paramMap);*/ + //이노릭스 대용량 업로드 + String innorixFileListStr = (String) paramMap.get("innorixFileListVO"); + if(!"".equals(innorixFileListStr)) { + try { + paramMap.put("innorixDataIdx", paramMap.get("rceptNo")); + paramMap.put("hpName", request.getSession().getAttribute("hpName")); + innorixFileService.innorixCaseFileInsert(innorixFileListStr, paramMap); + }catch(Exception e) { + e.printStackTrace(); + System.out.println("이노릭스에러"); + } + } + paramMap.put("sts", "success"); }catch (Exception e) { @@ -3450,12 +3467,24 @@ public class WebMediationController { service.rceUpdate(paramMap); - if(!"".equals(SeedUtils.setReplaceNull(paramMap.get("fileFuncType")))) { + /*if(!"".equals(SeedUtils.setReplaceNull(paramMap.get("fileFuncType")))) { fileService.fileInsert(paramMap, request, session); } // fileService.fileInsert(paramMap, request, session); - fileService.caseFileDel(paramMap); + fileService.caseFileDel(paramMap);*/ + //이노릭스 대용량 업로드 + String innorixFileListStr = (String) paramMap.get("innorixFileListVO"); + if(!"".equals(innorixFileListStr)) { + try { + paramMap.put("innorixDataIdx", paramMap.get("rceptNo")); + paramMap.put("hpName", request.getSession().getAttribute("hpName")); + innorixFileService.innorixCaseFileInsert(innorixFileListStr, paramMap); + }catch(Exception e) { + e.printStackTrace(); + System.out.println("이노릭스에러"); + } + } // 하도급내역 UPDATE diff --git a/src/main/java/seed/common/service/InnorixFileService.java b/src/main/java/seed/common/service/InnorixFileService.java index 095f3a00..c04bb6fe 100644 --- a/src/main/java/seed/common/service/InnorixFileService.java +++ b/src/main/java/seed/common/service/InnorixFileService.java @@ -7,5 +7,6 @@ import org.springframework.web.bind.annotation.RequestParam; public interface InnorixFileService { public void innorixExtraFileInsert(String innorixFileListStr, @RequestParam Map paramMap) throws Exception; + public void innorixCaseFileInsert(String innorixFileListStr, @RequestParam Map paramMap) throws Exception; } diff --git a/src/main/java/seed/common/service/InnorixFileServiceImpl.java b/src/main/java/seed/common/service/InnorixFileServiceImpl.java index 42950639..86f08881 100644 --- a/src/main/java/seed/common/service/InnorixFileServiceImpl.java +++ b/src/main/java/seed/common/service/InnorixFileServiceImpl.java @@ -36,5 +36,25 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I innorixFileDAO.innorixExtraFileInsert(innorixFileVO); } } + + @Override + public void innorixCaseFileInsert(String innorixFileListStr, @RequestParam Map paramMap) throws Exception { + + ObjectMapper objectMapper = new ObjectMapper(); + List innorixFileList = objectMapper.readValue(innorixFileListStr, new TypeReference>() {}); + + for(InnorixFileVO innorixFileVO : innorixFileList) { + innorixFileVO.setFileNo((String) paramMap.get("innorixDataIdx")); + innorixFileVO.setFileFuncType((String)paramMap.get("fileFuncType")); + innorixFileVO.setCopyContractYn((String)paramMap.get("copyContractYn")); + innorixFileVO.setHpName((String)paramMap.get("hpName")); + innorixFileVO.setFilePath(innorixFileVO.getServerFilePath()); + innorixFileVO.setFileGubun((String)paramMap.get("fileGubun")); + String fileName = innorixFileVO.getClientFileName(); + String fileType = fileName.substring(fileName.lastIndexOf(".")+1, fileName.length()); + innorixFileVO.setFileType(fileType); + innorixFileDAO.innorixCaseFileInsert(innorixFileVO); + } + } } diff --git a/src/main/java/seed/common/service/InnorixFileVO.java b/src/main/java/seed/common/service/InnorixFileVO.java index 6295bf7c..84e5f3f2 100644 --- a/src/main/java/seed/common/service/InnorixFileVO.java +++ b/src/main/java/seed/common/service/InnorixFileVO.java @@ -77,6 +77,16 @@ public class InnorixFileVO extends ComDefaultVO implements Serializable { private String printFileName; + private String copyContractYn; + + private String fileNo; + + private String hpName; + + private String fileGubun; + + private String filePath; + public List getInnorixFileListVO() { return innorixFileListVO; @@ -216,6 +226,36 @@ public class InnorixFileVO extends ComDefaultVO implements Serializable { public void setPrintFileName(String printFileName) { this.printFileName = printFileName; } + public String getCopyContractYn() { + return copyContractYn; + } + public void setCopyContractYn(String copyContractYn) { + this.copyContractYn = copyContractYn; + } + public String getFileNo() { + return fileNo; + } + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + public String getHpName() { + return hpName; + } + public void setHpName(String hpName) { + this.hpName = hpName; + } + public String getFileGubun() { + return fileGubun; + } + public void setFileGubun(String fileGubun) { + this.fileGubun = fileGubun; + } + public String getFilePath() { + return filePath; + } + public void setFilePath(String filePath) { + this.filePath = filePath; + } diff --git a/src/main/java/seed/dao/InnorixFileDAO.java b/src/main/java/seed/dao/InnorixFileDAO.java index d356982d..9cbc0645 100644 --- a/src/main/java/seed/dao/InnorixFileDAO.java +++ b/src/main/java/seed/dao/InnorixFileDAO.java @@ -16,4 +16,7 @@ public class InnorixFileDAO extends EgovAbstractDAO { public void innorixExtraFileInsert(InnorixFileVO innorixFileVO) throws Exception { sqlSession.insert("com.seed.innorixFile.extraInsert", innorixFileVO); } + public void innorixCaseFileInsert(InnorixFileVO innorixFileVO) throws Exception { + sqlSession.insert("com.seed.innorixFile.caseInsert", innorixFileVO); + } } diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/innorixFIle/innorixfile_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/innorixFIle/innorixfile_sql.xml index 9accb7c1..645e57d7 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/innorixFIle/innorixfile_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/innorixFIle/innorixfile_sql.xml @@ -29,8 +29,8 @@ 'Y' ) - - + + + + + <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0"%> + + + + + - -
- -
- +
+ + +
+ +
+ +
+
+

최근 접수사건 (미배정)

+ +
+ +
+
+
+

진행 중 사건목록 (오래된 순)

+ +
+ +
+
+ + 분쟁사건 처리관리 + 바로가기 + + + 나의사건 통계 + 바로가기 + + + 분쟁조정협의회 + 바로가기 + + + 종료사건 조회 + 바로가기 + +
+
+
+

분쟁조정 게시판

+ +
+ +
+
+
+

분쟁조정협의회 (예정)

+ +
+ +
+ +
+ + + +
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index fa3906eb..68e56de2 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -4565,16 +4565,16 @@ function nanumProcessStartTmp(){ - +
- - - + + + @@ -4962,18 +4962,18 @@ function nanumProcessStartTmp(){
-
+ -
- - - - - - - - - - - - -
    -
  • -
  • 신청인 : ${rs.companyCeo}
    • -
  • 서명필요
    • -
- - -
    -
  • -
  • 신청인 : ${rs.companyCeo}
    • -
  • 서명자 : ${rs.caseBSignName}
    • -
  • 서명일시 : ${rs.caseBDate}
    • -
  • 종료요청서삭제
    • -
- - - - - - - - -
    -
  • -
  • 피신청인 : ${rs2.respondentCeo}
    • -
  • 서명필요
    • -
- - -
    -
  • -
  • 피신청인 : ${rs2.respondentCeo}
    • -
  • 서명자 : ${rs2.caseBSignName}
    • -
  • 서명일시 : ${rs2.caseBDate}
    • -
  • 종료요청서삭제
    • -
- - - - - -
+
+ + + + + + + + + + + + +
    +
  • +
  • 신청인 : ${rs.companyCeo}
    • +
  • 서명필요
    • +
+ + +
    +
  • +
  • 신청인 : ${rs.companyCeo}
    • +
  • 서명자 : ${rs.caseBSignName}
    • +
  • 서명일시 : ${rs.caseBDate}
    • +
  • 종료요청서삭제
    • +
+ + + + + + + + +
    +
  • +
  • 피신청인 : ${rs2.respondentCeo}
    • +
  • 서명필요
    • +
+ + +
    +
  • +
  • 피신청인 : ${rs2.respondentCeo}
    • +
  • 서명자 : ${rs2.caseBSignName}
    • +
  • 서명일시 : ${rs2.caseBDate}
    • +
  • 종료요청서삭제
    • +
+ + + + + +
@@ -5144,16 +5144,16 @@ function nanumProcessStartTmp(){ 예시기재
-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -5234,15 +5234,15 @@ function nanumProcessStartTmp(){
-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -5307,15 +5307,15 @@ function nanumProcessStartTmp(){

등기이력조회

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -5336,15 +5336,15 @@ function nanumProcessStartTmp(){

기타

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -5389,13 +5389,13 @@ function nanumProcessStartTmp(){

신청인 사건문서첨부

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + @@ -5418,13 +5418,13 @@ function nanumProcessStartTmp(){

조사관 사건문서첨부(신청인)

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + @@ -5447,13 +5447,13 @@ function nanumProcessStartTmp(){

피신청인 사건문서첨부

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + @@ -5476,19 +5476,19 @@ function nanumProcessStartTmp(){

조사관 사건문서첨부
(피신청인)

- +
@@ -5520,7 +5520,7 @@ function nanumProcessStartTmp(){ @@ -5550,7 +5550,7 @@ function nanumProcessStartTmp(){ @@ -5580,7 +5580,7 @@ function nanumProcessStartTmp(){ @@ -5608,7 +5608,7 @@ function nanumProcessStartTmp(){ @@ -5636,7 +5636,7 @@ function nanumProcessStartTmp(){ @@ -5674,7 +5674,7 @@ function nanumProcessStartTmp(){ @@ -5694,7 +5694,7 @@ function nanumProcessStartTmp(){ @@ -8489,7 +8489,7 @@ function nanumProcessStartTmp(){
-

도급대금 내역 (피신청인)

+

도급대금 내역 (피신청인)

diff --git a/src/main/webapp/kofair_case_seed/adm/images/component/icon_file_clip_blue.png b/src/main/webapp/kofair_case_seed/adm/images/component/icon_file_clip_blue.png new file mode 100644 index 00000000..9125b843 Binary files /dev/null and b/src/main/webapp/kofair_case_seed/adm/images/component/icon_file_clip_blue.png differ diff --git a/src/main/webapp/kofair_case_seed/adm/images/component/icon_popup_close_white.png b/src/main/webapp/kofair_case_seed/adm/images/component/icon_popup_close_white.png new file mode 100644 index 00000000..886b8c63 Binary files /dev/null and b/src/main/webapp/kofair_case_seed/adm/images/component/icon_popup_close_white.png differ diff --git a/src/main/webapp/kofair_case_seed/adm/images/main/icon_1.png b/src/main/webapp/kofair_case_seed/adm/images/main/icon_1.png new file mode 100644 index 00000000..c6562c48 Binary files /dev/null and b/src/main/webapp/kofair_case_seed/adm/images/main/icon_1.png differ diff --git a/src/main/webapp/kofair_case_seed/adm/images/main/icon_2.png b/src/main/webapp/kofair_case_seed/adm/images/main/icon_2.png new file mode 100644 index 00000000..4614c73e Binary files /dev/null and b/src/main/webapp/kofair_case_seed/adm/images/main/icon_2.png differ diff --git a/src/main/webapp/kofair_case_seed/adm/images/main/icon_3.png b/src/main/webapp/kofair_case_seed/adm/images/main/icon_3.png new file mode 100644 index 00000000..ea4e31bd Binary files /dev/null and b/src/main/webapp/kofair_case_seed/adm/images/main/icon_3.png differ diff --git a/src/main/webapp/kofair_case_seed/adm/images/main/icon_4.png b/src/main/webapp/kofair_case_seed/adm/images/main/icon_4.png new file mode 100644 index 00000000..4e780478 Binary files /dev/null and b/src/main/webapp/kofair_case_seed/adm/images/main/icon_4.png differ diff --git a/src/main/webapp/kofair_case_seed/adm/images/main/icon_baro.png b/src/main/webapp/kofair_case_seed/adm/images/main/icon_baro.png new file mode 100644 index 00000000..6f5b1241 Binary files /dev/null and b/src/main/webapp/kofair_case_seed/adm/images/main/icon_baro.png differ diff --git a/src/main/webapp/kofair_case_seed/adm/images/main/icon_plus.png b/src/main/webapp/kofair_case_seed/adm/images/main/icon_plus.png new file mode 100644 index 00000000..e7171a81 Binary files /dev/null and b/src/main/webapp/kofair_case_seed/adm/images/main/icon_plus.png differ diff --git a/src/main/webapp/kofair_case_seed/adm/index.html b/src/main/webapp/kofair_case_seed/adm/index.html index 97c2f9e8..260745d0 100644 --- a/src/main/webapp/kofair_case_seed/adm/index.html +++ b/src/main/webapp/kofair_case_seed/adm/index.html @@ -39,14 +39,14 @@