index.jsp 웹표준 수정, 정부 탑 배너 추가

체험하기 > 나의 조정사건 목록 > 수수료납부요청 > 팝업 닫히고 포커싱 오류  수정

.gitignore

@@ -1,4 +1,3 @@
-
 ### Eclipse ###
 
 .metadata

pom.xml

@@ -26,9 +26,14 @@
   		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<webcontent-dir>${project.basedir}\src\main\webapp\WEB-INF\lib</webcontent-dir>
 	</properties>
-	
+<!-- 	<distributionManagement> -->
+<!-- 	   <repository>   -->
+<!-- 	      <id>maven-public</id>   -->
+<!-- 	      <url>http://nexus.iten.co.kr:9999/repository/maven-public/</url>   -->
+<!-- 	    </repository>   -->
+<!-- 	</distributionManagement> -->
 	<repositories>
-		<repository>
+		<!-- <repository>
 			<id>mvn2</id>
 			<url>https://repo1.maven.org/maven2/</url>
 			<releases>
@@ -57,7 +62,7 @@
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-        </repository>
+        </repository> -->
         <!-- <repository>
           <id>cubrid.release.repository</id>
             <url>http://maven.cubrid.org/</url>
@@ -68,6 +73,16 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository> -->
+        <repository>
+            <id>maven-public</id>
+            <url>http://nexus.iten.co.kr:9999/repository/maven-public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
 	</repositories>
 
 	<dependencies>
@@ -613,7 +628,7 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <directory>${basedir}/target</directory>
-		<finalName>kcc_adr_advc</finalName>
+		<finalName>ROOT</finalName>
         <pluginManagement>
             <plugins>
                 <plugin>

src/main/java/egovframework/migration/service/KcdfNewDAO.java

@@ -10,22 +10,22 @@ import com.ibatis.sqlmap.client.SqlMapClient;
 
 import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
 
-@Repository("KcdfNewDAO")
-public class KcdfNewDAO extends EgovAbstractDAO {
-	@Override
-	@Resource(name ="kcdfSqlMapClient")
-	public void setSuperSqlMapClient(SqlMapClient sqlMapClient) {
-		super.setSuperSqlMapClient(sqlMapClient);
-	}
-
-	public int selectKcdfBasicCount() {
-		return  (int)select("KcdfNewDAO.selectKcdfBasicCount");
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<KcdfNewBbsVO> selectKcdfBbsList(KcdfNewBbsVO tempKcdfNewBbsVO) throws Exception{
-		return (List<KcdfNewBbsVO>)list("KcdfNewDAO.selectKcdfBbsList", tempKcdfNewBbsVO);
-	}
-}
+//@Repository("KcdfNewDAO")
+//public class KcdfNewDAO extends EgovAbstractDAO {
+//	@Override
+//	@Resource(name ="kcdfSqlMapClient")
+//	public void setSuperSqlMapClient(SqlMapClient sqlMapClient) {
+//		super.setSuperSqlMapClient(sqlMapClient);
+//	}
+//
+//	public int selectKcdfBasicCount() {
+//		return  (int)select("KcdfNewDAO.selectKcdfBasicCount");
+//	}
+//
+//	@SuppressWarnings("unchecked")
+//	public List<KcdfNewBbsVO> selectKcdfBbsList(KcdfNewBbsVO tempKcdfNewBbsVO) throws Exception{
+//		return (List<KcdfNewBbsVO>)list("KcdfNewDAO.selectKcdfBbsList", tempKcdfNewBbsVO);
+//	}
+//}
 
 

src/main/java/egovframework/migration/service/MariaMigrationService.java

@@ -10,8 +10,8 @@ import org.springframework.stereotype.Service;
 @Service("MariaMigrationService")
 public class MariaMigrationService {
 
-	@Resource(name = "KcdfNewDAO")
-    private KcdfNewDAO kcdfNewDAO;
+//	@Resource(name = "KcdfNewDAO")
+//    private KcdfNewDAO kcdfNewDAO;
 	
 	@Resource(name = "NcmsDAO")
     private NcmsDAO ncmsDAO;
@@ -77,50 +77,50 @@ public class MariaMigrationService {
 		
 	}
 
-	public int selectKcdfBasicCount() {
-		return kcdfNewDAO.selectKcdfBasicCount();
-	}
-
-	public void kcdfMigration() {
-		try {
-			
-			int selectKcdfBasicCount =	kcdfNewDAO.selectKcdfBasicCount();
-			List<KcdfNewBbsVO> list =  new ArrayList<KcdfNewBbsVO>();
-			KcdfNewBbsVO tempKcdfNewBbsVO = new KcdfNewBbsVO(); //limit 를 위해 사용
-			int enterval = 100;
-			int i = 0;
-			if(selectKcdfBasicCount > enterval){
-				for(i=0; i< selectKcdfBasicCount; i++){ //enterval 개씩 끊어서 insert
-					if (i % enterval == 0 ){ //0
-						tempKcdfNewBbsVO.setRecordCountPerPage(enterval);
-						tempKcdfNewBbsVO.setFirstIndex(i);
-						list = kcdfNewDAO.selectKcdfBbsList(tempKcdfNewBbsVO);
-						for(int j=0; j< list.size(); j++){
-							ncmsDAO.insertNcmsBbsInfo(list.get(j));
-						}
-					}
-				}
-				
-				/*if(selectKcdfBasicCount != tempKcdfNewBbsVO.getFirstIndex()) { // enterval 개씩 끊어서 insert 후 남은 데이터 insert
-					tempKcdfNewBbsVO.setFirstIndex(selectKcdfBasicCount);
-					tempKcdfNewBbsVO.setRecordCountPerPage(enterval);
-					list = kcdfNewDAO.selectKcdfBbsList(tempKcdfNewBbsVO);
-					for(i=0; i< list.size(); i++){
-						kcdfNewDAO.insertNcmsBbsInfo(list.get(i));
-					}
-				}*/
-			}else{ //enterval 개 미만
-				tempKcdfNewBbsVO.setFirstIndex(0);
-				tempKcdfNewBbsVO.setRecordCountPerPage(enterval);
-				list = kcdfNewDAO.selectKcdfBbsList(tempKcdfNewBbsVO);
-				for(i=0; i< selectKcdfBasicCount; i++){
-					ncmsDAO.insertNcmsBbsInfo(list.get(i));
-				}
-			}
-		} catch (Exception e) {
-			System.err.println("migration Exception Error");
-		}
-	}
+//	public int selectKcdfBasicCount() {
+//		return kcdfNewDAO.selectKcdfBasicCount();
+//	}
+//
+//	public void kcdfMigration() {
+//		try {
+//			
+//			int selectKcdfBasicCount =	kcdfNewDAO.selectKcdfBasicCount();
+//			List<KcdfNewBbsVO> list =  new ArrayList<KcdfNewBbsVO>();
+//			KcdfNewBbsVO tempKcdfNewBbsVO = new KcdfNewBbsVO(); //limit 를 위해 사용
+//			int enterval = 100;
+//			int i = 0;
+//			if(selectKcdfBasicCount > enterval){
+//				for(i=0; i< selectKcdfBasicCount; i++){ //enterval 개씩 끊어서 insert
+//					if (i % enterval == 0 ){ //0
+//						tempKcdfNewBbsVO.setRecordCountPerPage(enterval);
+//						tempKcdfNewBbsVO.setFirstIndex(i);
+//						list = kcdfNewDAO.selectKcdfBbsList(tempKcdfNewBbsVO);
+//						for(int j=0; j< list.size(); j++){
+//							ncmsDAO.insertNcmsBbsInfo(list.get(j));
+//						}
+//					}
+//				}
+//				
+//				/*if(selectKcdfBasicCount != tempKcdfNewBbsVO.getFirstIndex()) { // enterval 개씩 끊어서 insert 후 남은 데이터 insert
+//					tempKcdfNewBbsVO.setFirstIndex(selectKcdfBasicCount);
+//					tempKcdfNewBbsVO.setRecordCountPerPage(enterval);
+//					list = kcdfNewDAO.selectKcdfBbsList(tempKcdfNewBbsVO);
+//					for(i=0; i< list.size(); i++){
+//						kcdfNewDAO.insertNcmsBbsInfo(list.get(i));
+//					}
+//				}*/
+//			}else{ //enterval 개 미만
+//				tempKcdfNewBbsVO.setFirstIndex(0);
+//				tempKcdfNewBbsVO.setRecordCountPerPage(enterval);
+//				list = kcdfNewDAO.selectKcdfBbsList(tempKcdfNewBbsVO);
+//				for(i=0; i< selectKcdfBasicCount; i++){
+//					ncmsDAO.insertNcmsBbsInfo(list.get(i));
+//				}
+//			}
+//		} catch (Exception e) {
+//			System.err.println("migration Exception Error");
+//		}
+//	}
 
 
 }

src/main/java/egovframework/migration/web/MariaMigrationController.java

@@ -21,9 +21,9 @@ public class MariaMigrationController {
 	@RequestMapping(value="/maria/migration.do")
 	public String mariaTestPage(ModelMap model) throws Exception{
 		
-		int selectKcdfBasicCount =	mariaMigrationService.selectKcdfBasicCount();
+//		int selectKcdfBasicCount =	mariaMigrationService.selectKcdfBasicCount();
 		
-		mariaMigrationService.kcdfMigration();
+//		mariaMigrationService.kcdfMigration();
 		
 		/*List<OrcaleTestVO> list = orcalTestDAO.selectOracleBasicList();*/
 		mariaMigrationService.selectOracleBasicList();

src/main/java/kcc/com/cmm/EgovComExcepHndlr.java

@@ -1,9 +1,15 @@
 package kcc.com.cmm;
 
-import egovframework.rte.fdl.cmmn.exception.handler.ExceptionHandler;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import egovframework.rte.fdl.cmmn.exception.handler.ExceptionHandler;
 
 /**
  * @Class Name : EgovComExcepHndlr.java
@@ -20,10 +26,22 @@ import org.slf4j.LoggerFactory;
  * @see
  *
  */
+@ControllerAdvice
 public class EgovComExcepHndlr implements ExceptionHandler {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(EgovComExcepHndlr.class);
 
+
+    @RequestMapping("/common/error.jsp")
+    @ResponseBody
+    public ResponseEntity<String> notFound() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add(HttpHeaders.CONTENT_TYPE, "application/json");
+
+        return new ResponseEntity<>("{\"error\": \"Resource not found\"}", headers, HttpStatus.NOT_FOUND);
+    }
+
+	
 	/**
 	 * 발생된 Exception을 처리한다.
 	 */

src/main/java/kcc/com/cmm/ImagePaginationRenderer.java

@@ -46,7 +46,7 @@ public class ImagePaginationRenderer extends AbstractPaginationRenderer implemen
 		
 		firstPageLabel    = "<button class='btn_page_first' title='첫 페이지 이동' onclick=\"{0}({1});return false;\"><i></i></button>";
         previousPageLabel = "<button class='btn_page_prev' title='이전 페이지 이동' onclick=\"{0}({1});return false;\"><i></i></button>";
-        currentPageLabel  = "<button class='on' title=\"현재 {0}페이지\" onclick='return false;' disabled>{0}</button>";
+        currentPageLabel  = "<button class='on' title=\"현재 {0}페이지\" onclick='return false;' readonly='readonly'>{0}</button>";
         otherPageLabel    = "<button title=\"{1} 페이지 이동\" onclick=\"{0}({1});return false;\">{2}</button>";
         nextPageLabel     = "<button class='btn_page_next' title='다음 페이지 이동' onclick=\"{0}({1});return false;\"><i></i></button>";
         lastPageLabel     = "<button class='btn_page_last' title='마지막 페이지 이동' onclick=\"{0}({1});return false;\"><i></i></button>";

src/main/java/kcc/com/cmm/ImagePaginationRendererWeb.java

@@ -37,12 +37,13 @@ public class ImagePaginationRendererWeb extends AbstractPaginationRenderer imple
         nextPageLabel     = "<li><a href='#' title='다음10페이지' onclick=\"{0}({1});return false;\"><img src=\"/publish/image/board/arrowRight.png\" alt=\"다음10페이지\"></a></li>";
         lastPageLabel     = "<li><a href='#' title='마지막페이지' onclick=\"{0}({1});return false;\"><img src=\"/publish/image/board/arrowRight2.png\" alt=\"마지막페이지\"></a></li>";*/
 		
-		firstPageLabel    = "<button class='btn_page_first' title='첫 페이지 이동' onclick=\"{0}({1});return false;\"><i></i></button>";
-        previousPageLabel = "<button class='btn_page_prev' title='이전 페이지 이동' onclick=\"{0}({1});return false;\"><i></i></button>";
-        currentPageLabel  = "<button class='on' title=\"현재 {0}페이지\" onclick='return false;' disabled>{0}</button>";
+		firstPageLabel    = "<button class='btn_page_first' title=\"첫 페이지 이동\" onclick=\"{0}({1});return false;\"><i></i></button>";
+        previousPageLabel = "<button class='btn_page_prev' title=\"이전 페이지 이동\" onclick=\"{0}({1});return false;\"><i></i></button>";
+        /*currentPageLabel  = "<button class='on' title=\"현재 {0}페이지\" onclick='return false;' disabled>{0}</button>";*/
+        currentPageLabel  = "<button class='on' title=\"현재 {0}페이지\" onclick=\"return false;\" style=\"pointer-events:none;\">{0}</button>";
         otherPageLabel    = "<button title=\"{1} 페이지 이동\" onclick=\"{0}({1});return false;\">{2}</button>";
-        nextPageLabel     = "<button class='btn_page_next' title='다음 페이지 이동' onclick=\"{0}({1});return false;\"><i></i></button>";
-        lastPageLabel     = "<button class='btn_page_last' title='마지막 페이지 이동' onclick=\"{0}({1});return false;\"><i></i></button>";
+        nextPageLabel     = "<button class='btn_page_next' title=\"다음 페이지 이동\" onclick=\"{0}({1});return false;\"><i></i></button>";
+        lastPageLabel     = "<button class='btn_page_last' title=\"마지막 페이지 이동\" onclick=\"{0}({1});return false;\"><i></i></button>";
 	}
 
 	@Override

src/main/java/kcc/com/cmm/JsonResult.java

@@ -0,0 +1,106 @@
+package kcc.com.cmm;
+
+import java.io.Serializable;
+
+/**
+ * 공용 JSON 리턴 모델
+ * @author wimy
+ *
+ */
+public class JsonResult implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6362971805582357050L;
+	
+	private boolean success;
+	
+	private String code;
+	
+	private String message;
+	
+	private Object data;
+
+	private String redirectUrl = "";
+	
+	/**
+	 * json 성공 여부
+	 * @return
+	 */
+	public boolean isSuccess() {
+		return success;
+	}
+
+	/**
+	 * json 성공 여부
+	 * @param success
+	 */
+	public void setSuccess(boolean success) {
+		this.success = success;
+	}
+
+	/**
+	 * 코드
+	 * @return
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * 코드
+	 * @param code
+	 */
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	/**
+	 * 메시지
+	 * @return
+	 */
+	public String getMessage() {
+		return message;
+	}
+
+	/**
+	 * 메시지
+	 * @param message
+	 */
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	/**
+	 * JSON 데이터
+	 * @return
+	 */
+	public Object getData() {
+		return data;
+	}
+
+	/**
+	 * JSON 데이터
+	 * @param data
+	 */
+	public void setData(Object data) {
+		this.data = data;
+	}
+
+	/**
+	 * 리다이렉트 URL
+	 * @return
+	 */
+	public String getRedirectUrl() {
+		return redirectUrl;
+	}
+
+	/**
+	 * 리다이렉트 URL
+	 * @param redirectUrl
+	 */
+	public void setRedirectUrl(String redirectUrl) {
+		this.redirectUrl = redirectUrl;
+	}
+	
+}

src/main/java/kcc/com/cmm/service/AdrCourtFileMngService.java

@@ -0,0 +1,12 @@
+package kcc.com.cmm.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface AdrCourtFileMngService {
+
+//    public AdrCourtFileVO selectCourtFileInfs(AdrCourtFileVO adrCourtFileVO) throws Exception;
+
+    public void insertCourtFileInf(AdrCourtFileVO adrCourtFileVO) throws Exception;
+
+}

src/main/java/kcc/com/cmm/service/AdrCourtFileVO.java

@@ -0,0 +1,72 @@
+package kcc.com.cmm.service;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+@SuppressWarnings("serial")
+public class AdrCourtFileVO implements Serializable {
+
+    private String crtAtchFileId;
+    private String crtSeq;
+    private String crtSn;
+    private String crtAtchFileTy;
+    private String frstRegistPnttm;
+    private String frstRegisterId;
+    private String lastUpdtPnttm;
+    private String lastUpdusrId;
+    
+    
+	public String getCrtAtchFileId() {
+		return crtAtchFileId;
+	}
+	public void setCrtAtchFileId(String crtAtchFileId) {
+		this.crtAtchFileId = crtAtchFileId;
+	}
+	public String getCrtSeq() {
+		return crtSeq;
+	}
+	public void setCrtSeq(String crtSeq) {
+		this.crtSeq = crtSeq;
+	}
+	public String getCrtSn() {
+		return crtSn;
+	}
+	public void setCrtSn(String crtSn) {
+		this.crtSn = crtSn;
+	}
+	public String getCrtAtchFileTy() {
+		return crtAtchFileTy;
+	}
+	public void setCrtAtchFileTy(String crtAtchFileTy) {
+		this.crtAtchFileTy = crtAtchFileTy;
+	}
+	public String getFrstRegistPnttm() {
+		return frstRegistPnttm;
+	}
+	public void setFrstRegistPnttm(String frstRegistPnttm) {
+		this.frstRegistPnttm = frstRegistPnttm;
+	}
+	public String getFrstRegisterId() {
+		return frstRegisterId;
+	}
+	public void setFrstRegisterId(String frstRegisterId) {
+		this.frstRegisterId = frstRegisterId;
+	}
+	public String getLastUpdtPnttm() {
+		return lastUpdtPnttm;
+	}
+	public void setLastUpdtPnttm(String lastUpdtPnttm) {
+		this.lastUpdtPnttm = lastUpdtPnttm;
+	}
+	public String getLastUpdusrId() {
+		return lastUpdusrId;
+	}
+	public void setLastUpdusrId(String lastUpdusrId) {
+		this.lastUpdusrId = lastUpdusrId;
+	}
+    
+    
+    
+    
+}

src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java

@@ -15,7 +15,7 @@ public enum AdrInnorixFileEnumVO {
 	// history 값
 	private final String p_code_desc;
 	
-	// history 값
+	// history stat 값
 	private final String p_stat_cd;
 	private final String p_adrHstryMgrSeq;
 	private final String p_updateQuery;

src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java

@@ -43,6 +43,7 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable {
 	public String openYn = "";
 	public String atchFileId = "";
 	public String mode = "";
+	public String successMsg = "";
 	public boolean isAdrRpplDoc;
 	
 	/*	
@@ -226,6 +227,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable {
 		this.isAdrRpplDoc = isAdrRpplDoc;
 	}
 
+	public String getSuccessMsg() {
+		return successMsg;
+	}
+
+	public void setSuccessMsg(String successMsg) {
+		this.successMsg = successMsg;
+	}
+	
 	
 	
 	

src/main/java/kcc/com/cmm/service/InnorixFileService.java

@@ -23,5 +23,8 @@ import kcc.kccadr.cmm.RestResponse;
  */
 public interface InnorixFileService {
 
-	RestResponse insertInnorixFileAjax(AdrInnorixFileVO adrInnorixFileVO) throws FdlException, Exception;
+	RestResponse insertInnorixFileAndRpplAjax(AdrInnorixFileVO adrInnorixFileVO) throws FdlException, Exception;
+
+	RestResponse insertInnorixFile(AdrInnorixFileVO adrInnorixFileVO);
+
 }

src/main/java/kcc/com/cmm/service/impl/AdrCourtFileMngServiceImpl.java

@@ -0,0 +1,48 @@
+package kcc.com.cmm.service.impl;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
+import kcc.com.cmm.service.AdrCourtFileMngService;
+import kcc.com.cmm.service.AdrCourtFileVO;
+import kcc.com.cmm.service.FileVO;
+import kcc.kccadr.adjCourtCnctn.service.impl.AdjCourtCnctnDAO;
+
+/**
+ * @Class Name : EgovFileMngServiceImpl.java
+ * @Description : 파일정보의 관리를 위한 구현 클래스
+ * @Modification Information
+ *
+ *    수정일       수정자         수정내용
+ *    -------        -------     -------------------
+ *    2009. 3. 25.     이삼섭    최초생성
+ *
+ * @author 공통 서비스 개발팀 이삼섭
+ * @since 2009. 3. 25.
+ * @version
+ * @see
+ *
+ */
+@Service("AdrCourtFileMngService")
+public class AdrCourtFileMngServiceImpl extends EgovAbstractServiceImpl implements AdrCourtFileMngService {
+
+	@Resource(name = "AdjCourtCnctnDAO")
+	private AdjCourtCnctnDAO adjCourtCnctnDAO;
+
+//	@Override
+//	public AdrCourtFileVO selectCourtFileInfs(AdrCourtFileVO adrCourtFileVO) throws Exception {
+//		return adjCourtCnctnDAO.selectCourtFileInfs(adrCourtFileVO);
+//	}
+	
+	@Override
+	public void insertCourtFileInf(AdrCourtFileVO adrCourtFileVO) throws Exception {
+		adjCourtCnctnDAO.insertCourtFileInf(adrCourtFileVO);
+	}
+}

src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java

@@ -83,33 +83,33 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
 	private EgovFileMngService fileMngService;
 	
 	@Override
-	public RestResponse insertInnorixFileAjax(AdrInnorixFileVO adrInnorixFileListVO) throws FdlException, Exception {
+	public RestResponse insertInnorixFileAndRpplAjax(AdrInnorixFileVO adrInnorixFileVO) throws FdlException, Exception {
 		
 		try {
-			AdrInnorixFileEnumVO innorixEnumVO = AdrInnorixFileEnumVO.valueOf(adrInnorixFileListVO.getJspFileName());
-			adrInnorixFileListVO = innorixEnumVO.conversion(innorixEnumVO, adrInnorixFileListVO);
+			AdrInnorixFileEnumVO innorixEnumVO = AdrInnorixFileEnumVO.valueOf(adrInnorixFileVO.getJspFileName());
+			adrInnorixFileVO = innorixEnumVO.conversion(innorixEnumVO, adrInnorixFileVO);
 
 			// 파일 저장 후 atchFileId 받아옴
-			if("INSERT".equals(adrInnorixFileListVO.getMode()))
-				adrInnorixFileListVO.setAtchFileId(this.insertFileData(adrInnorixFileListVO));
-			if("UPDATE".equals(adrInnorixFileListVO.getMode()))
-				adrInnorixFileListVO.setAtchFileId(this.updateFileData(adrInnorixFileListVO));
+			if("INSERT".equals(adrInnorixFileVO.getMode()))
+				adrInnorixFileVO.setAtchFileId(this.insertFileData(adrInnorixFileVO));
+			if("UPDATE".equals(adrInnorixFileVO.getMode()))
+				adrInnorixFileVO.setAtchFileId(this.updateFileData(adrInnorixFileVO));
 			
-			log.info("adrInnorixFileListVO.isAdrRpplDoc() :: [{}]", adrInnorixFileListVO.isAdrRpplDoc());
+			log.info("adrInnorixFileListVO.isAdrRpplDoc() :: [{}]", adrInnorixFileVO.isAdrRpplDoc());
 			
-			if(adrInnorixFileListVO.isAdrRpplDoc())
-				adrInnorixFileListVO.setRpplDocSeq(this.insertAdrRpplDoc(adrInnorixFileListVO));
+			if(adrInnorixFileVO.isAdrRpplDoc())
+				adrInnorixFileVO.setRpplDocSeq(this.insertAdrRpplDoc(adrInnorixFileVO));
 			
 			// P_code_desc가 없으면 이력을 넣지 않음.
-			if(StringUtils.isNotEmpty(adrInnorixFileListVO.getP_code_desc()))
-				this.ansSubmitAjax(adrInnorixFileListVO);
+			if(StringUtils.isNotEmpty(adrInnorixFileVO.getP_code_desc()))
+				this.ansSubmitAjax(adrInnorixFileVO);
 			
 		} catch (Exception e) {
 			e.printStackTrace();
 			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
 		}
 		
-		return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now());
+		return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(),  adrInnorixFileVO.getAtchFileId(),LocalDateTime.now());
 	}
 
 	/** 
@@ -128,8 +128,6 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
 		
 		List<FileVO> result  = this.fileChange(innorixVO, atchFileId, 0);
 		
-
-		log.info(" // file data 반복문 끝 ");
 		// 파일 업로드
 		fileManageDAO.insertFileInfs(result);
 		
@@ -294,4 +292,19 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
 				);
 		
 	}
+
+	
+	@Override
+	public RestResponse insertInnorixFile(AdrInnorixFileVO adrInnorixFileVO) {
+
+		try {
+			// 파일 저장 후 atchFileId 받아옴
+			adrInnorixFileVO.setAtchFileId(this.insertFileData(adrInnorixFileVO));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
+		}
+		
+		return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(),  adrInnorixFileVO.getAtchFileId(),LocalDateTime.now());
+	}
 }

src/main/java/kcc/com/cmm/taglibs/RadioTag.java

@@ -54,6 +54,8 @@ public class RadioTag extends SimpleTagSupport {
     
     private String disabled = "";
     
+    private String spanYn = "";
+
     public void setSelectedValue(String selectedValue) {
         this.selectedValue = selectedValue;
     }
@@ -103,6 +105,10 @@ public class RadioTag extends SimpleTagSupport {
 		this.disabled = disabled;
 	}
 	
+	public void setSpanYn(String spanYn) {
+		this.spanYn = spanYn;
+	}
+
 	public void setIncludes(String includes) {
         if (!StringUtil.isEmpty(StringUtil.trim(includes))) {
             StringTokenizer includeTokens = new StringTokenizer(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 = "<span>";
+            spanEnd = "</span>";
+        }
+    	
         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<input type=\"radio\" id=\"" + id + "\" name=\"" + name + "\" value=\"" + defaultValue + "\"  checked=\"checked\"");
+            tag.append("\n\t\t"+spanStart +"<input type=\"radio\" id=\"" + id + "\" name=\"" + name + "\" value=\"" + defaultValue + "\"  checked=\"checked\"");
             if (css != null) {
                 tag.append(" " + css + " ");
             }
@@ -146,7 +161,7 @@ public class RadioTag extends SimpleTagSupport {
             	tag.append(" disabled=\"" + "disabled" + "\"");
             }
 
-            tag.append("> <label class=\""+styleClass+"\" for=\""+ id +"\">"+defaultText+"</label>");
+            tag.append("> <label class=\""+styleClass+"\" for=\""+ id +"\">"+defaultText+"</label>"+spanEnd);
 
         }
         
@@ -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<input type=\"radio\" id=\"" + id + "\" name=\"" + name + "\" value=\"" + StringUtil.escapeXml(code.getCode()) + "\"");
+                        tag.append("\n\t\t"+spanStart +"<input type=\"radio\" id=\"" + id + "\" name=\"" + name + "\" value=\"" + StringUtil.escapeXml(code.getCode()) + "\"");
                         if (css != null) {
                             tag.append(" " + css + " ");
                         }
@@ -181,7 +196,7 @@ public class RadioTag extends SimpleTagSupport {
                         	tag.append(" disabled=\"" + "disabled" + "\"");
                         }
 
-                        tag.append("> <label class=\""+styleClass+"\" for=\""+ id +"\">"+StringUtil.escapeXml(code.getCodeNm())+"</label>");
+                        tag.append("> <label class=\""+styleClass+"\" for=\""+ id +"\">"+StringUtil.escapeXml(code.getCodeNm())+"</label>"+spanEnd);
                     }
 
                 }

src/main/java/kcc/com/cmm/taglibs/SelectTag.java

@@ -205,6 +205,7 @@ public class SelectTag extends SimpleTagSupport {
             if (codeList != null) {
                 for (CmmnDetailCode code : codeList) {
                     String cd = code.getCode();
+//                    System.out.println("cd : "+ cd);
                     boolean flag = true;
                     // 포함하는코드가 존재한다면..
                     if(CollectionUtils.isNotEmpty(includeSet)){
@@ -223,7 +224,9 @@ public class SelectTag extends SimpleTagSupport {
                     }
 
                     if(flag){
-                        if (code.getCode().equals(selectedValue)) {
+                    	String trimmedSelectedValue = (selectedValue != null) ? selectedValue.trim() : null;
+//                        if (code.getCode().equals(selectedValue.trim()) {
+                    	  if (code.getCode().equals(trimmedSelectedValue)) {
                             tag.append("\n\t\t<option value=\"" + StringUtil.escapeXml(code.getCode()) + "\" selected=\"selected\" >" + StringUtil.escapeXml(code.getCodeNm()) + "</option>");
                         } else {
                             tag.append("\n\t\t<option value=\"" + StringUtil.escapeXml(code.getCode()) + "\">" + StringUtil.escapeXml(code.getCodeNm()) + "</option>");
@@ -231,12 +234,14 @@ public class SelectTag extends SimpleTagSupport {
                     }
                 }
             }
+
+            tag.append("\n\t </select>");
         } catch (Exception e) {
+        	e.printStackTrace();
         	System.out.println("Exception Occured!!!");
         }
 
-        tag.append("\n\t</select>\n");
-
+//        System.out.println("tag.toString() :: \n" + tag.toString());
         out.print(tag.toString());
 
     }

src/main/java/kcc/com/cmm/util/DateUtil.java

@@ -184,7 +184,7 @@ public final class DateUtil {
      * //month 일 전 cal.add(Calendar.DATE, -day);
      * 
      * */
-    public String AddDate(String strDate, int year, int month, int day) throws Exception { 
+    public static String AddDate(String strDate, int year, int month, int day) throws Exception { 
     	SimpleDateFormat dtFormat = new SimpleDateFormat("yyyy-MM-dd"); 
     	Calendar cal = Calendar.getInstance(); 
     	Date dt = dtFormat.parse(strDate); cal.setTime(dt); 

src/main/java/kcc/com/cmm/util/IpUtil.java

@@ -97,7 +97,7 @@ public class IpUtil {
 		
 		String ozServerNm = "";
 		
-		if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr")) {//로컬 및 개발서버 요청시 서버 경로 처리
+		if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr") || serverNm.contains("192.168.0.176") || serverNm.contains("ljhtest")) {//로컬 및 개발서버 요청시 서버 경로 처리
 			
 			ozServerNm = "http://119.193.215.98:8086";
 //			ozServerNm = "http://192.168.0.176:8091";

src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java

@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 import com.dsmdb.japi.MagicDBAPI;
 
 import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
+import kcc.let.uat.uia.web.SsoAgentInfo;
 
 public final class MagicDBAPIUtil {
 
@@ -34,11 +35,19 @@ public final class MagicDBAPIUtil {
 	}
 	
 	public static String encryptOnlyOneString(String stringVal) {
-//		return MagicDBAPI.encrypt(POLICY_NAME, stringVal);
+		
+		SsoAgentInfo ssoagentinfo = new SsoAgentInfo();
+		if(!"local".equals(ssoagentinfo.getIslocal())) {
+			stringVal = MagicDBAPI.encrypt(POLICY_NAME, stringVal);
+		}
 		return stringVal;
+//		return stringVal;
 	}
 	
 	public static String decryptOnlyOneString(String stringVal) {
+		if (stringVal.indexOf("[")==0) {
+			stringVal	=	MagicDBAPI.decrypt(POLICY_NAME, stringVal);
+		}
 //		return MagicDBAPI.decrypt(POLICY_NAME, stringVal);
 		return stringVal;
 	}

src/main/java/kcc/com/cmm/util/StringUtil2.java

@@ -578,4 +578,21 @@ public final class StringUtil2 {
         
     }
     
+    public static String extractLogMethodNm(
+    		String p_url
+    		) throws Exception{
+    	if(p_url.contains(";JSESSIONID")) {
+    		p_url = p_url.substring(0, p_url.indexOf(";JSESSIONID"));
+    	}else if (p_url.contains(";jsessionid")){
+    		p_url = p_url.substring(0, p_url.indexOf(";jsessionid"));
+    	}
+		String[] s_arr	=	p_url.split("/");
+		
+		if (s_arr.length>=3) {
+			return s_arr[s_arr.length-3]+"/"+s_arr[s_arr.length-2]+"/"+s_arr[s_arr.length-1];			
+		}
+		
+		return p_url;
+    }
+
 }

src/main/java/kcc/com/cmm/web/DataTransferController.java

@@ -0,0 +1,180 @@
+package kcc.com.cmm.web;
+
+import java.time.LocalDateTime;
+
+import javax.annotation.Resource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.AdrInnorixFileVO;
+import kcc.com.cmm.service.InnorixFileService;
+import kcc.com.utl.fcc.service.EgovStringUtil;
+import kcc.kccadr.accdnt.ans.service.AnsVO;
+import kcc.kccadr.cmm.RestResponse;
+
+/**
+ * 
+ * @author 		: 이호영
+ * @fileName 	: InnorixFileController.java 
+ * @date 		: 2022.11.01
+ * @description : innorix 대용량 파일 업로드 솔루션 
+ * =========================================================== 
+ * DATE          AUTHOR   NOTE 
+ * ----------------------------------------------------------- *
+ * 2022.11.01    이호영          최초 생성
+ * 
+ * 
+ * 
+ */
+@Controller
+public class DataTransferController {
+
+    private static final Logger logger = LoggerFactory.getLogger(DataTransferController.class);
+
+    // ADR_ID
+	@Resource(name="adrGnrService")
+	private EgovIdGnrService adrIdgenService;
+	
+	// ADR_ASS_PST_SEQ
+	@Resource(name="adrAssMgrPstGnrService")
+	private EgovIdGnrService adrAssMgrPstGnrService;
+	
+	// AHS_ID
+	@Resource(name="adrHstrySeqGnrService")
+	private EgovIdGnrService adrHstrySeqGnrService;
+	
+	// FILE_ID
+	@Resource(name="egovFileIdGnrService")
+	private EgovIdGnrService egovFileIdGnrService;
+	
+	//PTC_ID
+	@Resource(name="egovPrtclManageGnrService")
+	private EgovIdGnrService egovPrtclManageGnrService;
+	
+	//RLD_ID
+	@Resource(name="egovRldMgrManageGnrService")
+	private EgovIdGnrService egovRldMgrManageGnrService;
+	
+	//RPPL_ID
+	@Resource(name="rpplGnrService")
+	private EgovIdGnrService rpplGnrService;
+	
+	//USRCNFRM_ID
+	@Resource(name="egovUsrCnfrmIdGnrService")
+	private EgovIdGnrService egovUsrCnfrmIdGnrService;
+	
+	@RequestMapping(value = {"/common/transfer/updateIdsData.do"}, method = RequestMethod.GET)
+	public ResponseEntity<RestResponse> updateIdsData(@RequestParam String idsTableName, @RequestParam int updateCnt) throws Exception {
+
+		String resultMsg = String.format("ids 데이터를 성공적으로 업데이트 했습니다. "
+				+ "table_name = %s "
+				+ "update count = %s"
+				, idsTableName, updateCnt);
+		
+		try {
+		
+			if("ADR_ASS_PST_SEQ".equals(idsTableName))
+			{
+				for(int i=0; i<updateCnt; i++)
+				{
+					String nextId =adrAssMgrPstGnrService.getNextStringId();
+					System.out.println("nextId :: "+ nextId);
+				}
+				
+			}
+			
+			if("ADR_ID".equals(idsTableName))
+			{
+				for(int i=0; i<updateCnt; i++)
+				{
+					String nextId =adrIdgenService.getNextStringId();
+					System.out.println("nextId :: "+ nextId);
+				}
+				
+			}
+			
+			if("AHS_ID".equals(idsTableName))
+			{
+				for(int i=0; i<updateCnt; i++)
+				{
+					String nextId =adrHstrySeqGnrService.getNextStringId();
+					System.out.println("nextId :: "+ nextId);
+				}
+				
+			}
+			
+			if("FILE_ID".equals(idsTableName))
+			{
+				for(int i=0; i<updateCnt; i++)
+				{
+					String nextId =egovFileIdGnrService.getNextStringId();
+					System.out.println("nextId :: "+ nextId);
+				}
+				
+			}
+			
+			if("PTC_ID".equals(idsTableName))
+			{
+				for(int i=0; i<updateCnt; i++)
+				{
+					String nextId =egovPrtclManageGnrService.getNextStringId();
+					System.out.println("nextId :: "+ nextId);
+				}
+				
+			}
+			
+			if("RLD_ID".equals(idsTableName))
+			{
+				for(int i=0; i<updateCnt; i++)
+				{
+					String nextId =egovRldMgrManageGnrService.getNextStringId();
+					System.out.println("nextId :: "+ nextId);
+				}
+				
+			}
+			
+			if("RPPL_ID".equals(idsTableName))
+			{
+				for(int i=0; i<updateCnt; i++)
+				{
+					String nextId =rpplGnrService.getNextStringId();
+					System.out.println("nextId :: "+ nextId);
+				}
+				
+			}
+			
+			if("USRCNFRM_ID".equals(idsTableName))
+			{
+				for(int i=0; i<updateCnt; i++)
+				{
+					String nextId =egovUsrCnfrmIdGnrService.getNextStringId();
+					System.out.println("nextId :: "+ nextId);
+				}
+				
+			}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			resultMsg = String.format("ids 데이터를 업데이트에 실패하였습니다. \\n"
+					+ "table_name = %s"
+					+ "update count = %s", idsTableName, updateCnt);
+			return ResponseEntity.ok(new RestResponse(HttpStatus.OK, resultMsg, LocalDateTime.now()));
+		}
+//		String.format("%s_", str);
+
+		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, resultMsg, LocalDateTime.now()));
+	}
+
+	
+}

src/main/java/kcc/com/cmm/web/InnorixFileController.java

@@ -44,8 +44,17 @@ public class InnorixFileController {
 	@Resource(name = "InnorixFileService")
 	protected InnorixFileService innorixService;
 	
-	@RequestMapping(value = {"/kccadr/common/insertInnorixFileAjax.do"}, method = RequestMethod.POST)
-	public ResponseEntity<RestResponse> insertInnorixFileAjax(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception {
+	/** 
+	 * @methodName	: insertInnorixFileAndRpplAjax 
+	 * @author		: 이호영
+	 * @date		: 2022.12.26 
+	 * @description	: 파일등록 외에 rpplDoc 과 history 관련 Controller
+	 * @param adrInnorixFileVO
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping(value = {"/kccadr/common/insertInnorixFileAndRpplAjax.do"}, method = RequestMethod.POST)
+	public ResponseEntity<RestResponse> insertInnorixFileAndRpplAjax(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception {
 
 		//로그인 권한정보 불러오기
 		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
@@ -59,7 +68,34 @@ public class InnorixFileController {
 		adrInnorixFileVO.setLastUpdusrId(userId);
 	
 
-		return ResponseEntity.ok(innorixService.insertInnorixFileAjax(adrInnorixFileVO));
+		return ResponseEntity.ok(innorixService.insertInnorixFileAndRpplAjax(adrInnorixFileVO));
+	}
+
+	/** 
+	 * @methodName	: insertInnorixFile 
+	 * @author		: 이호영
+	 * @date		: 2022.12.26 
+	 * @description	: 파일 insert 전용
+	 * @param adrInnorixFileVO
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping(value = {"/kccadr/common/insertInnorixFileAjax.do"}, method = RequestMethod.POST)
+	public ResponseEntity<RestResponse> insertInnorixFile(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception {
+		
+		//로그인 권한정보 불러오기
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+		
+		if(userId.equals("")) {
+			return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
+		}
+		
+		adrInnorixFileVO.setFrstRegisterId(userId);
+		adrInnorixFileVO.setLastUpdusrId(userId);
+		
+		
+		return ResponseEntity.ok(innorixService.insertInnorixFile(adrInnorixFileVO));
 	}
 
 	

src/main/java/kcc/com/cmm/web/StreamDocsController.java

@@ -1,9 +1,12 @@
 package kcc.com.cmm.web;
 
+import java.io.File;
 import java.time.LocalDateTime;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -18,14 +21,21 @@ import com.mashape.unirest.http.HttpResponse;
 
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import kcc.com.cmm.LoginVO;
-import kcc.com.cmm.service.AdrInnorixFileVO;
+import kcc.com.cmm.service.EgovFileMngService;
 import kcc.com.cmm.service.InnorixFileService;
 import kcc.com.cmm.util.StreamDocsUtil;
 import kcc.com.utl.fcc.service.EgovStringUtil;
-import kcc.kccadr.accdnt.ans.service.AnsVO;
+import kcc.kccadr.accdnt.ars.service.AdjstReqStatusService;
+import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService;
+import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
+import kcc.kccadr.adjst.service.AdjstReqService;
+import kcc.kccadr.advc.service.AdrHstryMgrService;
+import kcc.kccadr.cmm.KccadrPdfConversion;
 import kcc.kccadr.cmm.RestResponse;
 import kcc.kccadr.cmm.service.PdfConversionService;
 import kcc.kccadr.cmm.service.PdfConversionVO;
+import kcc.kccadr.ozSchd.web.OzSchdExportUtil;
+import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 /**
  * 
@@ -50,10 +60,35 @@ public class StreamDocsController {
   	@Resource(name="PdfConversionService")
   	private PdfConversionService pdfConversionService;
   	
+	@Resource(name="adrHstryMgrService")
+	private AdrHstryMgrService adrHstryMgrService;
+  	
 	/** EgovPropertyService */
 	@Resource(name = "InnorixFileService")
 	protected InnorixFileService innorixService;
     
+	//사건 정보
+    @Resource(name = "pgrCmmService")
+    private PgrCmmService cmmService;
+    
+    
+    @Resource(name = "egovCryptoUtil")
+    EgovCryptoUtil egovCryptoUtil;
+
+	// 조정신청 서비스단(대국민)
+	@Resource(name = "AdjstReqService")
+	private AdjstReqService adjstReqService;
+	
+	@Resource(name = "EgovFileMngService")
+	private EgovFileMngService fileService;
+	
+	@Resource(name="adjstReqStatusService")
+	private AdjstReqStatusService adjstReqStatusService;
+	
+	//암복호화 유틸
+	@Resource(name = "EgovFileMngService")
+	EgovFileMngService egovFileMngService;	
+	
     private static String pdfMakepathOut;	//c:/usr/local/tomcat/file/sht/out
     @Value("#{globalSettings['Globals.pdf.makepath.out']}")
     public void setPdfMakepathOut(String path) { pdfMakepathOut = path; }
@@ -62,6 +97,41 @@ public class StreamDocsController {
     @Value("#{globalSettings['Globals.Streamdocs.Url']}")
     public String streamdocsURL;
 	
+    
+	// 실서버 개발서버 구분
+	private static String islocal;	//	/pdf/out/
+    @Value("#{globalSettings['Globals.prod.islocal']}")
+    public void setIslocal(String path) { islocal = path; }
+    
+    
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
+ 	
 	/** 
 	 * @methodName	: regStreamDocsAjax 
 	 * @author		: 이호영
@@ -73,8 +143,83 @@ public class StreamDocsController {
 	 */
 	@RequestMapping(value = {"/kccadr/common/regStreamDocsAjax.do"}, method = RequestMethod.POST)
 	public ResponseEntity<RestResponse> regStreamDocsAjax(@RequestBody PdfConversionVO pdfConversionVO) throws Exception {
+		//PdfConversionVO tmpPdfConversionVO = pdfConversionService.selectConversionPdf(pdfConversionVO);
+
+		try {
+			// make 파일 경로
+			//String filePath = pdfMakepathOut + tmpPdfConversionVO.getAdrSeq() +"/result/bookmark.pdf";			
+			String filePath = pdfMakepathOut + pdfConversionVO.getAdrSeq() +"/result/bookmark.pdf";
+
+			// pdf 파일 등록
+			HttpResponse<String> responseInfo = StreamDocsUtil.regPdfDoc(filePath, streamdocsURL);
+
+			// 성공 시 return value
+			return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "등록 되었습니다.", responseInfo.getBody(), LocalDateTime.now()));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		// 실패 시 return value
+		return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "pdf 로드에 실패하였습니다.\n단권화 파일이 없습니다.", LocalDateTime.now()));
+	}
+
+	/** 
+	 * @methodName	: remakePdfDocsAjax 
+	 * @author		: 이호영
+	 * @date		: 2022.12.12 
+	 * @description	: 재단권화 controller
+	 * @param pdfConversionVO
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping(value = {"/kccadr/common/remakeStreamDocAjax.do"}, method = RequestMethod.POST)
+	public ResponseEntity<RestResponse> remakeStreamDocAjax(
+			@RequestBody PdfConversionVO pdfConversionVO
+			) throws Exception {
 
 		
+		
+		//step1.해당 사건이 종료되었는가?
+        // 조정사건일반
+		PgrCmmVO info	=	new PgrCmmVO();
+		info.setAdrSeq(pdfConversionVO.getAdrSeq());
+    	info = cmmService.selectPgrCmm(info);
+    	
+    	if ("400000".equals(info.getStatCd())) {	//종료인 경우
+    		System.out.println("종료된 경우OOOOOOOOOOOOOO");
+    		//RestResponse rr	=	new RestResponse(null, "", null);
+    		
+    		//return new ResponseEntity<RestResponse>("success", HttpStatus.OK);
+    		
+    		//return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "등록 되었습니다."));
+    		try {
+    			String path = pdfMakepathOut + pdfConversionVO.getAdrSeq() + "/";
+    			File chkFolder = new File(path);
+    			
+    			if(chkFolder.exists()) {
+    				this.deleteFolder(path);
+    			}
+			} catch (Exception e) {
+				System.out.println(e.getMessage());
+			}
+    		//HttpResponse<String> responseInfo = StreamDocsUtil.regPdfDoc(filePath, streamdocsURL);
+    		//return new ResponseEntity.ok(new RestResponse(HttpStatus.OK, "등록 되었습니다.", responseInfo.getBody(), LocalDateTime.now()));
+    		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()));
+    	}else {
+    		System.out.println("종료가 안된 경우XXXXXXXXXXXXXXX");
+    		//return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()));
+    		return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "사건이 종료되지 않았습니다.", LocalDateTime.now()));
+    	}
+    	
+		//PdfConversionVO tmpPdfConversionVO = pdfConversionService.selectConversionPdf(pdfConversionVO);
+
+		
+
+    	
+		//step2.종료된 사건이면 개별 파일을 만든다.0~9
+		//step3.개별 파일이 완료되었으면 단권화를 시작한다.
+
+    	/*
 		PdfConversionVO tmpPdfConversionVO = pdfConversionService.selectConversionPdf(pdfConversionVO);
 
 
@@ -90,10 +235,128 @@ public class StreamDocsController {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		*/
 
 		// 실패 시 return value
-		return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "pdf 로드에 실패하였습니다.", LocalDateTime.now()));
+		//return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "pdf 로드에 실패하였습니다.", LocalDateTime.now()));
+	}
+	
+	/** 
+	 * @methodName	: remakePdfDocsAjax 
+	 * @author		: 이호영
+	 * @date		: 2022.12.12 
+	 * @description	: 재단권화 controller
+	 * @param pdfConversionVO
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping(value = {"/kccadr/common/remakeStreamDocPdfAjax.do"}, method = RequestMethod.POST)
+	public ResponseEntity<RestResponse> remakeStreamDocPdfAjax(
+			@RequestBody PdfConversionVO pdfConversionVO
+			) throws Exception {
+		
+		try {
+			KccadrPdfConversion kpc	=	new KccadrPdfConversion();
+			String s_result	=	kpc.newPdfConversionPrcs(
+					pdfConversionVO.getAdrSeq()
+					, adjstReqStatusService
+					, egovFileMngService
+					, pdfConversionService
+					, adrHstryMgrService
+					);	
+		}catch(Exception ex) {
+			return ResponseEntity.ok(new RestResponse(HttpStatus.EXPECTATION_FAILED, "생성 중 오류가 발생하였습니다.", LocalDateTime.now()));
 		}
 		
 		
+		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()));
+	}
+	
+	/** 
+	 * @methodName	: remakePdfDocsAjax -	201050
+	 * @author		: 이호영
+	 * @date		: 2022.12.12 
+	 * @description	: 재단권화 controller
+	 * @param pdfConversionVO
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping(value = {"/kccadr/common/remakeStreamDoc201050Ajax.do"}, method = RequestMethod.POST)
+	public ResponseEntity<RestResponse> remakeStreamDoc201050Ajax(
+			@RequestBody PdfConversionVO pdfConversionVO
+			, HttpServletRequest request
+			) throws Exception {
+		
+		//step2.종료된 사건이면 개별 파일을 만든다.0~9
+		//0-201050
+    	
+		try {
+	    	String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();    	
+	    	LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+	    	
+			String serverName = request.getServerName();
+			String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+			
+	    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+	    	
+	    	JSONObject jsObjData	=	ozSchd.makeReqReport(
+	    				userId
+	    			, pdfConversionVO.getAdrSeq()
+	    			, adjstReqService			    			
+	    			, fileService
+	    			, egovCryptoUtil
+	    			);
+	    	
+	    	ozSchd.checkOzEnvNMakePDF(
+	    			islocal
+	    			, pdfConversionVO.getAdrSeq()
+	    			, "adjReqReport.ozr"			//oz template file
+	    			, ozDevPdfSavePath
+	    			, ozRealPdfSavePath
+	    			, jsObjData.toJSONString()
+	    			, serverName
+	    			//, "adjReqReport.pdf"			//oz to pdf save file name
+	    			, "201050.pdf"
+	    			, ozDevServerIp
+	    			, ozDevSchedulerIp
+	    			, ozRealServerIp
+	    			, ozRealSchedulerIp
+	    			, devServerCheckString
+	    			);
+	    	
+			// 성공 시 return value
+	    	return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청서 생성되었습니다.", LocalDateTime.now()));
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "조정신청서 생성시 오류가 발생되었습니다.", LocalDateTime.now()));
+		
+	}
+	
+	
+	public void deleteFolder(String path) {
+			
+		File folder = new File(path);
+		try {
+			if(folder.exists()){
+				File[] folder_list = folder.listFiles(); //파일리스트 얻어오기
+					
+				for (int i = 0; i < folder_list.length; i++) {
+					if(folder_list[i].isFile()) {
+						folder_list[i].delete();
+						System.out.println("파일이 삭제되었습니다.");
+					}else {
+						deleteFolder(folder_list[i].getPath()); //재귀함수호출
+						System.out.println("폴더가 삭제되었습니다.");
+					}
+					folder_list[i].delete();
+				}
+				folder.delete(); //폴더 삭제
+			}
+		} catch (Exception e) {
+		System.out.println(e.getMessage());
+		}
+	}
 }

src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java

@@ -75,6 +75,9 @@ public class AdjstPayMentController {
 	@Value("#{globalSettings['Globals.pay.siteDomain']}")
 	private String global_siteDomain;
 	
+	@Value("#{globalSettings['Globals.prod.islocal']}")
+	private String prodIsLocal;
+	
     @Resource(name="PayService")
 	private PayService payService;
     
@@ -223,9 +226,17 @@ public class AdjstPayMentController {
 		
 		String requestUrl = scheme + "://" + serverName + serverPort;
 		
+		
+		
 		//고객사 임의데이터 ("요청URL" + "§" + "pk")
 		String merchantData = requestUrl + "/web/kccadr/accdnt/apm/adjstPayMentProcess.do" + "§";
 		
+		if("local".equals(prodIsLocal)) {
+			merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; 
+		}else {
+			merchantData = "https://adr.copyright.or.kr" + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§";
+		}
+		
 		model.addAttribute("mid", mid);
 		model.addAttribute("signKey", signKey);
 		model.addAttribute("mKey", mKey);
@@ -240,6 +251,9 @@ public class AdjstPayMentController {
 		
 		model.addAttribute("list", adjstPayMentVOList);
 		model.addAttribute("ssoLoginVO", ssoLoginVO);
+		model.addAttribute("IsLocal", prodIsLocal);
+		
+		
 		return "/web/kccadr/accdnt/apm/adjstPayMentDetail";
 	}
 	

src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java

@@ -29,12 +29,14 @@ import org.springframework.web.servlet.support.RequestContextUtils;
 import com.fasterxml.jackson.core.io.JsonStringEncoder;
 import com.inicis.std.util.SignatureUtil;
 
+import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.EgovMessageSource;
 import kcc.com.cmm.LoginVO;
 import kcc.com.cmm.service.EgovFileMngService;
 import kcc.com.cmm.service.FileVO;
+import kcc.com.cmm.util.DateUtil;
 import kcc.com.cmm.util.IpUtil;
 import kcc.com.cmm.util.StringUtil;
 import kcc.com.utl.fcc.service.EgovStringUtil;
@@ -144,6 +146,8 @@ public class AdjstReqStatusController {
 	@Value("#{globalSettings['Globals.pay.siteDomain']}")
 	private String global_siteDomain;
 
+    @Resource(name="recordReadingHstryGnrService")
+    private EgovIdGnrService recordReadingHstryGnrService;
 	
 	
 	/**
@@ -547,11 +551,18 @@ public class AdjstReqStatusController {
 		}
 		
 		// 작성단계 셋팅
-		adrRecordReadingVO.setFrstRegisterId(userId);	// 최초등록자
-		adrRecordReadingVO.setPrcsnStatCd(KccadrConstants.ADR_RCD_RDNG_PRCSN_STAT_CD_10); //신청완료 상태
+		adrRecordReadingVO.setFrstRegisterId(userId);	// 최초수정자
+		adrRecordReadingVO.setLastUpdusrId(userId);	// 최초등록자
+		adrRecordReadingVO.setPrcsnStatCd(KccadrConstants.ADR_RCD_RDNG_PRCSN_STAT_CD_10); //신청 상태
 
 		try {
 			adrRecordReadingService.insertRecordReading(adrRecordReadingVO);
+			
+			// history 영역
+			adrRecordReadingVO.setFrstRegisterId(userId);
+			adrRecordReadingVO.setRecordReadingHstrySeq(recordReadingHstryGnrService.getNextStringId());
+			adrRecordReadingService.insertRecordReadingHist(adrRecordReadingVO);
+			
 			modelAndView.addObject("result", "success");
 		} catch(Exception e) {
 			modelAndView.addObject("result", "fail");
@@ -561,6 +572,78 @@ public class AdjstReqStatusController {
 		
 	}
 	
+	// 대국민 조정사건 기록열람 신청 상세
+	@RequestMapping(value = "/web/kccadr/payment/accdnt/ai/docIssDetail.do")
+	public String docIssDetail(@ModelAttribute("adrRecordReadingVO") AdrRecordReadingVO adrRecordReadingVO, 
+			ModelMap model, 
+			HttpServletRequest request, 
+			HttpServletResponse response) throws Exception {
+		
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+		LoginVO loginVO = "anonymousUser".equals(auth) ? new LoginVO() : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		SsoLoginVO ssoLoginVO = (SsoLoginVO) request.getSession().getAttribute("SSOLoginVO");
+		
+		if (loginVO == null) {
+
+			model.addAttribute("msg", "로그인 해주세요.");
+			return "redirect:/web/user/login/ssoLogin.do";
+		}
+		AdrRecordReadingVO detailVO = adrRecordReadingService.selectDetail(adrRecordReadingVO);
+		
+		// 결제 마감일 계산
+		// DateUtil.AddDate 더하고싶은 날짜, 년, 월, 일
+		detailVO.setPayEndDay(DateUtil.AddDate(detailVO.getFrstRegistPnttm(), 0, 0, 7)); 
+		model.addAttribute("info", detailVO);
+		
+		return "/web/kccadr/accdnt/ars/tab/docIssDetail";
+	}
+	
+
+	
+	// 대국민 조정사건 기록열람 신청 ajax
+	@RequestMapping(value = "/web/kccadr/payment/accdnt/ai/docIssPrcsnStatCdModifyAjax.do")
+	public ModelAndView docIssPrcsnStatCdModifyAjax(AdrRecordReadingVO adrRecordReadingVO, ModelMap model) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+		
+		if (loginVO == null) {
+		
+			modelAndView.addObject("result", "fail");
+			modelAndView.addObject("message", "로그인 해주세요.");
+			return modelAndView;
+		}
+		
+		// 작성단계 셋팅
+		adrRecordReadingVO.setLastUpdusrId(userId);	// 최초등록자
+
+		// 기존 mapper 사용하기 위한 생성자
+		PayVO payVO = new PayVO();
+		payVO.setLastUpdusrId(userId);	// 수정자
+		payVO.setPrcsnStatCd("90");
+		payVO.setAsctnTablePk1(adrRecordReadingVO.getRecordReadingSeq());
+		adrRecordReadingService.updatePrcsnStatCd(payVO);
+		adrRecordReadingVO.setFrstRegisterId(userId);
+		
+
+	    // history 영역
+	    adrRecordReadingVO.setRecordReadingHstrySeq(recordReadingHstryGnrService.getNextStringId());
+	    adrRecordReadingVO.setPrcsnStatCd("90");
+	    adrRecordReadingService.insertRecordReadingHist(adrRecordReadingVO);
+		
+		
+			
+		modelAndView.addObject("result", "success");
+			
+		return modelAndView;
+	
+	}
+	
+	
 	// 대국민 조정사건 기록열람 신청 목록
 	@RequestMapping(value = "/web/kccadr/payment/accdnt/ai/docIssReqList.do")
 	public String docIssReqList(@ModelAttribute("adrRecordReadingVO") AdrRecordReadingVO adrRecordReadingVO, 
@@ -568,10 +651,6 @@ public class AdjstReqStatusController {
 								HttpServletRequest request, 
 								HttpServletResponse response) throws Exception {
 		
-		String sessionId = request.getSession().getId();
-		System.out.println(sessionId);
-		response.setHeader("Set-Cookie", "JSESSIONID="+ sessionId +"; Path=/; Secure; SameSite=None");
-		
 		String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
 		LoginVO loginVO = "anonymousUser".equals(auth) ? new LoginVO() : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
 		
@@ -594,11 +673,6 @@ public class AdjstReqStatusController {
 			adrRecordReadingVO.setSearchSortOrd("desc");
 		}
 
-		// 키워드가 있다면 일단 암호화 하여 암호화 컬럼에 셋
-		if(StringUtils.isNotBlank(adrRecordReadingVO.getSearchKeyword())){
-			adrRecordReadingVO.setSearchEncKeyword(egovCryptoUtil.encrypt(adrRecordReadingVO.getSearchKeyword()));
-		}
-
 		/** paging */
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(adrRecordReadingVO.getPageIndex());
@@ -610,18 +684,27 @@ public class AdjstReqStatusController {
 		adrRecordReadingVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 
 		List<AdrRecordReadingVO> list = adrRecordReadingService.selectDocReqList(adrRecordReadingVO);
+		
+		list.stream().forEach(t->{
+			AdrRecordReadingVO aVO = adrRecordReadingService.selectStatCdAndStatTxt(t); 
+			t.setStatCd(aVO.getStatCd());
+			t.setStatTxt(aVO.getStatTxt());
+			t.setResPonDentNm(egovCryptoUtil.decrypt(t.getResPonDentNm()));
+			t.setAppliCantNm(egovCryptoUtil.decrypt(t.getAppliCantNm()));
+		});
+		
 		paginationInfo.setTotalRecordCount(list.size() > 0 ? list.get(0).getTotCnt() : 0);
 		model.addAttribute("paginationInfo", paginationInfo);
 		
-		int listSize = list.size();
+		/*int listSize = list.size();
 		for(int i=0; i<listSize; i++) {
-			list.get(i).setResPonDentNm(egovCryptoUtil.decrypt(list.get(i).getResPonDentNm()));
+			list.get(i).setResPonDentNm(egovCryptoUtil.decrypt(list.get(i).getResPonDentNm()));dmat
 			list.get(i).setAppliCantNm(egovCryptoUtil.decrypt(list.get(i).getAppliCantNm()));
-		}
+		}*/
 		
 		model.addAttribute("list", list);
 		model.addAttribute("ssoLoginVO", ssoLoginVO);
-		
+		/*
 		
 		// ======================결제 시작===================
 		String mid					= global_mid;		                    // 상점아이디					
@@ -650,7 +733,7 @@ public class AdjstReqStatusController {
 		String signature_view = SignatureUtil.makeSignature(signParam_view);
 		String signature_print = SignatureUtil.makeSignature(signParam_print);
 		
-		/* 기타 */
+		 기타 
 		String siteDomain = global_siteDomain; //가맹점 도메인 입력
 		
 		//서버정보 받아오기
@@ -661,9 +744,15 @@ public class AdjstReqStatusController {
 		
 		String requestUrl = scheme + "://" + serverName + serverPort;
 		
-		//고객사 임의데이터 ("요청URL" + "§" + "pk")
 		String merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§";
 		
+		//고객사 임의데이터 ("요청URL" + "§" + "pk")
+		if("local".equals(prodIsLocal)) {
+			merchantData = requestUrl + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§"; 
+		}else {
+			merchantData = "https://adr.copyright.or.kr" + "/web/kccadr/accdnt/ai/doclssReqProcess.do" + "§";
+		}
+		
 		model.addAttribute("mid", mid);
 		model.addAttribute("signKey", signKey);
 		model.addAttribute("mKey", mKey);
@@ -678,6 +767,8 @@ public class AdjstReqStatusController {
 
 		// ======================결제 끝===================
 		
+		model.addAttribute("IsLocal", prodIsLocal);
+*/
 		return "/web/kccadr/accdnt/ars/tab/docIssReqList";
 	}
 	
@@ -798,6 +889,7 @@ public class AdjstReqStatusController {
 			PayVO payVO = payService.selectPayForPk(pk);
 			if("0000".equals(payVO.getResultcode())) {
 				//3.
+		        payVO.setPrcsnStatCd("20");
 				adrRecordReadingService.updatePrcsnStatCd(payVO);
 			}else {
 				//fail
@@ -1054,12 +1146,13 @@ public class AdjstReqStatusController {
 		List<PgrCmmVO> resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO);
 		
 		String atchFileId = "";
-		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 				
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
 				
 			}
+		}
  		
 		/*if(!adrSeq.equals("")) {
 			
@@ -1067,91 +1160,91 @@ public class AdjstReqStatusController {
 			
 		}*/
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!adrSn.equals("")) {
+		if(StringUtil.isNotEmpty(adrSn)) {
 			
 			oj.put("adrSn", adrSn);
 			
 		}
 		
-		if(!cctyTx.equals("")) {
+		if(StringUtil.isNotEmpty(cctyTx)) {
 			
 			oj.put("cctyTx", cctyTx);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!adrAdmNm.equals("")) {
+		if(StringUtil.isNotEmpty(adrAdmNm)) {
 			
 			oj.put("adrAdmNm", adrAdmNm);
 			
 		}
 		
-		if(!adrAdmOffmTel.equals("")) {
+		if(StringUtil.isNotEmpty(adrAdmOffmTel)) {
 			
 			oj.put("adrAdmOffmTel", adrAdmOffmTel);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!resPonDentNm.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			
 		}
 		
-		if(!resPonDentNmEtc.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNmEtc)) {
 			
 			oj.put("resPonDentNmEtc", resPonDentNmEtc);
 			
 		}
 		
-		/*if(!appDeDay.equals("")) {
+		/*if(StringUtil.isNotEmpty(appDeDay)) {
 			
 			oj.put("appDeDay", appDeDay);
 			
 		}*/
 		
-		if(!appDeDate.equals("")) {
+		if(StringUtil.isNotEmpty(appDeDate)) {
 			
 			oj.put("appDeDate", appDeDate);
 			
 		}
 		
-		if(!appPlace.equals("")) {
+		if(StringUtil.isNotEmpty(appPlace)) {
 			
 			oj.put("appPlace", appPlace);
 			
 		}
 		
-		if(!appPlaceAddr.equals("")) {
+		if(StringUtil.isNotEmpty(appPlaceAddr)) {
 			
 			oj.put("appPlaceAddr", appPlaceAddr);
 			
 		}
 		
-		if(!atchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(atchFileId)) {
 			
 			String domain = "";
 			

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtAppVO.java

@@ -0,0 +1,103 @@
+package kcc.kccadr.adjCourtCnctn.service;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import kcc.com.cmm.ComDefaultVO;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
+
+public class AdjCourtAppVO  extends ComDefaultVO implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1111076331699607617L;
+	
+	private String crtSeq; //법원연계 seq
+	private String crtSn; //법원연계 기일수
+	
+	
+	private String crtFtfDe; //대면기일
+	private String crtAddr; //장소
+	private String crtAttnder; //참석자
+	private String crtRslt; //기일결과
+	private String crtAtchFileId; //첨부파일 아이디
+	
+	private String frstRegistPnttm;
+	private String frstRegisterId;
+	private String lastUpdtPnttm;
+	private String lastUpdusrId;
+	
+	
+	public String getCrtSeq() {
+		return crtSeq;
+	}
+	public void setCrtSeq(String crtSeq) {
+		this.crtSeq = crtSeq;
+	}
+	public String getCrtSn() {
+		return crtSn;
+	}
+	public void setCrtSn(String crtSn) {
+		this.crtSn = crtSn;
+	}
+	public String getCrtFtfDe() {
+		return crtFtfDe;
+	}
+	public void setCrtFtfDe(String crtFtfDe) {
+		this.crtFtfDe = crtFtfDe;
+	}
+	public String getCrtAddr() {
+		return crtAddr;
+	}
+	public void setCrtAddr(String crtAddr) {
+		this.crtAddr = crtAddr;
+	}
+	public String getCrtAttnder() {
+		return crtAttnder;
+	}
+	public void setCrtAttnder(String crtAttnder) {
+		this.crtAttnder = crtAttnder;
+	}
+	public String getCrtRslt() {
+		return crtRslt;
+	}
+	public void setCrtRslt(String crtRslt) {
+		this.crtRslt = crtRslt;
+	}
+	public String getCrtAtchFileId() {
+		return crtAtchFileId;
+	}
+	public void setCrtAtchFileId(String crtAtchFileId) {
+		this.crtAtchFileId = crtAtchFileId;
+	}
+	public String getFrstRegistPnttm() {
+		return frstRegistPnttm;
+	}
+	public void setFrstRegistPnttm(String frstRegistPnttm) {
+		this.frstRegistPnttm = frstRegistPnttm;
+	}
+	public String getFrstRegisterId() {
+		return frstRegisterId;
+	}
+	public void setFrstRegisterId(String frstRegisterId) {
+		this.frstRegisterId = frstRegisterId;
+	}
+	public String getLastUpdtPnttm() {
+		return lastUpdtPnttm;
+	}
+	public void setLastUpdtPnttm(String lastUpdtPnttm) {
+		this.lastUpdtPnttm = lastUpdtPnttm;
+	}
+	public String getLastUpdusrId() {
+		return lastUpdusrId;
+	}
+	public void setLastUpdusrId(String lastUpdusrId) {
+		this.lastUpdusrId = lastUpdusrId;
+	}
+	
+	
+	
+	
+}

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtAprvlService.java

@@ -0,0 +1,19 @@
+package kcc.kccadr.adjCourtCnctn.service;
+
+import java.util.List;
+
+public interface AdjCourtAprvlService {
+	public void insertAprvlReg(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception;
+	
+	List<AdjCourtaprvlVO> adjCourtAprvlList(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception;
+	
+	public int adjCourtAprvlListCnt(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception;
+	
+	AdjCourtaprvlVO adjCourtAprvlDetail(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception;
+	
+	public List<AdjCourtaprvlVO> adjCourtAprvlLine(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception;
+	
+	public void adjCourtAprvlLineUpdate(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception;
+	
+	public AdjCourtaprvlVO adjCourtAprvlLineChk(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception;
+}

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java

@@ -2,20 +2,64 @@ package kcc.kccadr.adjCourtCnctn.service;
 
 import java.util.List;
 
-import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
 import kcc.kccadr.cmm.RestResponse;
 
 public interface AdjCourtCnctnService {
 
-	RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO);
+	RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) throws Exception;
 	
-	int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO);
+	RestResponse insertCourtCnctnFile(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) throws Exception;
 
-	List<AdjCourtCnctnVO> adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO);
+	int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception;
 
-	AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO);
+	List<AdjCourtCnctnVO> adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception;
 
-	RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO);
+	AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception;
+
+	RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception;
+
+	void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception;
+	
+	public List<AdjCourtCnctnVO> selectAdjCourtCnctniFileList(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception;
+	
+	public void insertCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception;
+	
+	public void updateCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception;
+	
+	public List<AdjCourtDeptVO> selectAdjCourtCnctniDeptPop() throws Exception;
+	
+	RestResponse insertAdjCourtCnctnDeptPopAjax(AdjCourtDeptVO deptVO) throws Exception;
+	
+	public void updateAdjCourtCnctnStatCd(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception;
+	
+	List<AdjCourtAppVO> selectAdjCourtCnctnAppList(AdjCourtAppVO adjCourtAppVO) throws Exception;
+	
+	public int selectAdjCourtCnctnAppNextSn(AdjCourtAppVO adjCourtAppVO) throws Exception;
+	
+	public RestResponse insertAdjCourtCnctnAppReg(AdjCourtAppVO adjCourtAppVO, final MultipartHttpServletRequest multiRequest) throws Exception;
+	
+	public AdjCourtAppVO selectAdjCourtCnctnAppDetail(AdjCourtAppVO adjCourtAppVO) throws Exception;
+	
+	public RestResponse updateAdjCourtCnctnEnd(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) throws Exception;
+	
+	public RestResponse updateAdjCourtCnctnEndAfterPopAjax(AdjCourtCnctnVO adjCourtCnctnVO, AdjCourtDeptVO adjCourtDeptVO) throws Exception;
+	
+	public AdjCourtDeptVO selectCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception;
+	
+	public RestResponse insertAdjCourtRprtDePopAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception;
+
+	void updateOfcpsNmFromAdrCourtDeptMgr(AdjCourtCnctnVO adjCourtCnctnVO);
+
+	public RestResponse  updateCrtAdjCmsnrMenoAjax(AdjCourtCnctnVO adjCourtCnctnVO);
+	
+	public RestResponse  updateCrtAdjAdminMenoAjax(AdjCourtCnctnVO adjCourtCnctnVO);
+	
+	public RestResponse  updateCrtStatCdAjax(AdjCourtCnctnVO adjCourtCnctnVO);
+
+	List<AdjCourtRprtMgrVO> findByIdFromAdjCourtRprtMgr(AdjCourtCnctnVO adjCourtCnctnVO);
+
+	AdjCourtRprtMgrVO findByRprtSeqFromAdrCourtRprtMgr(AdjCourtCnctnVO adjCourtCnctnVO);
 
-	void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO);
 }

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java

@@ -14,207 +14,257 @@ public class AdjCourtCnctnVO  extends ComDefaultVO implements Serializable {
 	 */
 	private static final long serialVersionUID = -1111076331699607617L;
 	
+	private String crtSeq; //법원연계 seq
+	private String crtSn; //법원연계 기일수
+	private String crtOriNo; //본사건번호
+	private String crtNo; //조정사건번호
+	private String crtDcsnDe; //결정일
+	private String crtRcptDe; //수령일
+	private String crtAllctDe; //배당일
+	private String crtRprtDe; //보고일
+	private String crtClimntNm; //원고이름
+	private String crtClimntPhone; //원고연락처
+	private String crtClimntAgntNm; //원고-대리인 이름
+	private String crtClimntAgtPhone; //원고-대리인 연락처
+	private String crtClimntInfo; //원고정보
+	private String crtDfndntNm; //피고이름
+	private String crtDfndntPhone; //피고연락처
+	private String crtDfndntAgntNm; //피고-대리인 이름
+	private String crtDfndntAgntPhone; //피고-대리인 연락처
+	private String crtDfndntInfo; //피고정보
+	private String crtCn; //사건내용
+	private String crtAtchFileId; //회신 첨부파일 아이디
+	private String crtAtchFileIdEnd; // 사무수행보고서 첨부파일 아이디
+	private String crtAllctDdlDe; //사무처리기한-배당일+45 자동으로 계산 이후 연장시 +30
+	private String crtCcTy; //사건분류 - 저작물종류
+	private String crtLinkHouse; //연계법원
+	private String crtStatCd; //처리상태
+	private String crtAgrment; //합의금
 	
-	private String courtSeq = "";
-	private String courtNum = "";
-	private String courtOrgNo = "";
-	private String courtNo = "";
-	private String dcsnDe = "";
-	private String rcvDe = "";
-	private String alctnDe = "";
-	private String alctnMonth = "";
-	private String officeWorkDe = "";
-	private String rprtDe = "";
-	private String rprtMonth = "";
-	private String processDay = "";
-	private String courtFld = "";
-	private String accdntCn = "";
-	private String reqInfo = "";
-	private String aplcnInfo = "";
-	private String rspndInfo = "";
-	private String aplcnDpty = "";
-	private String rspndDpty = "";
-	private String courtRslt = "";
-	private String courtDetailRslt = "";
-	private String adjCmsnr = "";
-	private String pay = "";
-	private String appDe = "";
-	private String pymntDay = "";
-	private String extns = "";
-	private String useYn = "";
-	private String rmrks = "";
-	private String frstRegistPnttm = "";
-	private String frstRegisterId = "";
-	private String lastUpdtPnttm = "";
-	private String lastUpdusrId = "";
+	private String crtEndRslt; //결과
+	private String crtEndRsltDetail; //세부결과
+	
+	private String frstRegistPnttm;
+	private String frstRegisterId;
+	private String lastUpdtPnttm;
+	private String lastUpdusrId;
 	
 	
 	private String searchCondition2 = "";
 	private String diffMonth = "";
 	
 	
+	private String tabSeq;
+	private String atchFileId;
+	private String fileSn;
+	private String crtAtchFileTy;
+	private String orignlFileNm;
 	
-	public String getCourtSeq() {
-		return courtSeq;
+	private String pstinstCode;
+	private String crtDeptTy;
+	
+	
+	private String crtDeptKng;
+	private String crtDeptOrdi;
+	
+	private String esntlId;
+	
+	private String crtEndDe;
+	
+	private String deptNm;
+	
+	private String searchStatCd;
+	
+	private String ckStsList[]; 
+    private String ckStsListAll;
+    private String crtLinkHouseList[]; 
+    private String crtLinkHouseAll;
+    
+    private String searchMonth;
+    
+    private String searchStartDt;
+    private String searchEndDt;
+    
+    private String deptNmArr;
+    
+    private String searchLoginId;
+    
+    private String crtAllctDdlDeAdd1st;
+    private String crtAllctDdlDeAdd2nd;
+    
+    private int pageUnit = 50;
+
+    private int pageSize = 50;
+        
+    private int recordCountPerPage = 50;
+    
+    private String deptOrdinaryYn;
+    
+    private String uniqId;
+    
+    private String crtCnfrm;
+    
+    private String ofcpsNm;
+	
+    private String crtAdjAdminMeno;
+    private String crtAdjCmsnrMeno;
+    
+    private String rprtSeq;
+    private String rprtPhone;
+    private String rprtPgr;
+    private String rprtSeqTemp;
+    private List<AdjCourtRprtMgrVO> adjCourtRprtMgrList; 
+    
+    
+	public String getCrtSeq() {
+		return crtSeq;
 	}
-	public void setCourtSeq(String courtSeq) {
-		this.courtSeq = courtSeq;
+	public void setCrtSeq(String crtSeq) {
+		this.crtSeq = crtSeq;
 	}
-	public String getCourtNum() {
-		return courtNum;
+	public String getCrtSn() {
+		return crtSn;
 	}
-	public void setCourtNum(String courtNum) {
-		this.courtNum = courtNum;
+	public void setCrtSn(String crtSn) {
+		this.crtSn = crtSn;
 	}
-	public String getCourtOrgNo() {
-		return courtOrgNo;
+	public String getCrtOriNo() {
+		return crtOriNo;
 	}
-	public void setCourtOrgNo(String courtOrgNo) {
-		this.courtOrgNo = courtOrgNo;
+	public void setCrtOriNo(String crtOriNo) {
+		this.crtOriNo = crtOriNo;
 	}
-	public String getCourtNo() {
-		return courtNo;
+	public String getCrtNo() {
+		return crtNo;
 	}
-	public void setCourtNo(String courtNo) {
-		this.courtNo = courtNo;
+	public void setCrtNo(String crtNo) {
+		this.crtNo = crtNo;
 	}
-	public String getDcsnDe() {
-		return dcsnDe;
+	public String getCrtDcsnDe() {
+		return crtDcsnDe;
 	}
-	public void setDcsnDe(String dcsnDe) {
-		this.dcsnDe = dcsnDe;
+	public void setCrtDcsnDe(String crtDcsnDe) {
+		this.crtDcsnDe = crtDcsnDe;
 	}
-	public String getRcvDe() {
-		return rcvDe;
+	public String getCrtRcptDe() {
+		return crtRcptDe;
 	}
-	public void setRcvDe(String rcvDe) {
-		this.rcvDe = rcvDe;
+	public void setCrtRcptDe(String crtRcptDe) {
+		this.crtRcptDe = crtRcptDe;
 	}
-	public String getAlctnDe() {
-		return alctnDe;
+	public String getCrtAllctDe() {
+		return crtAllctDe;
 	}
-	public void setAlctnDe(String alctnDe) {
-		this.alctnDe = alctnDe;
+	public void setCrtAllctDe(String crtAllctDe) {
+		this.crtAllctDe = crtAllctDe;
 	}
-	public String getAlctnMonth() {
-		return alctnMonth;
+	public String getCrtRprtDe() {
+		return crtRprtDe;
 	}
-	public void setAlctnMonth(String alctnMonth) {
-		this.alctnMonth = alctnMonth;
+	public void setCrtRprtDe(String crtRprtDe) {
+		this.crtRprtDe = crtRprtDe;
 	}
-	public String getOfficeWorkDe() {
-		return officeWorkDe;
+	public String getCrtClimntNm() {
+		return crtClimntNm;
 	}
-	public void setOfficeWorkDe(String officeWorkDe) {
-		this.officeWorkDe = officeWorkDe;
+	public void setCrtClimntNm(String crtClimntNm) {
+		this.crtClimntNm = crtClimntNm;
 	}
-	public String getRprtDe() {
-		return rprtDe;
+	public String getCrtClimntPhone() {
+		return crtClimntPhone;
 	}
-	public void setRprtDe(String rprtDe) {
-		this.rprtDe = rprtDe;
+	public void setCrtClimntPhone(String crtClimntPhone) {
+		this.crtClimntPhone = crtClimntPhone;
 	}
-	public String getRprtMonth() {
-		return rprtMonth;
+	public String getCrtClimntAgntNm() {
+		return crtClimntAgntNm;
 	}
-	public void setRprtMonth(String rprtMonth) {
-		this.rprtMonth = rprtMonth;
+	public void setCrtClimntAgntNm(String crtClimntAgntNm) {
+		this.crtClimntAgntNm = crtClimntAgntNm;
 	}
-	public String getProcessDay() {
-		return processDay;
+	public String getCrtClimntAgtPhone() {
+		return crtClimntAgtPhone;
 	}
-	public void setProcessDay(String processDay) {
-		this.processDay = processDay;
+	public void setCrtClimntAgtPhone(String crtClimntAgtPhone) {
+		this.crtClimntAgtPhone = crtClimntAgtPhone;
 	}
-	public String getCourtFld() {
-		return courtFld;
+	public String getCrtClimntInfo() {
+		return crtClimntInfo;
 	}
-	public void setCourtFld(String courtFld) {
-		this.courtFld = courtFld;
+	public void setCrtClimntInfo(String crtClimntInfo) {
+		this.crtClimntInfo = crtClimntInfo;
 	}
-	public String getAccdntCn() {
-		return accdntCn;
+	public String getCrtDfndntNm() {
+		return crtDfndntNm;
 	}
-	public void setAccdntCn(String accdntCn) {
-		this.accdntCn = accdntCn;
+	public void setCrtDfndntNm(String crtDfndntNm) {
+		this.crtDfndntNm = crtDfndntNm;
 	}
-	public String getReqInfo() {
-		return reqInfo;
+	public String getCrtDfndntPhone() {
+		return crtDfndntPhone;
 	}
-	public void setReqInfo(String reqInfo) {
-		this.reqInfo = reqInfo;
+	public void setCrtDfndntPhone(String crtDfndntPhone) {
+		this.crtDfndntPhone = crtDfndntPhone;
 	}
-	public String getAplcnInfo() {
-		return aplcnInfo;
+	public String getCrtDfndntAgntNm() {
+		return crtDfndntAgntNm;
 	}
-	public void setAplcnInfo(String aplcnInfo) {
-		this.aplcnInfo = aplcnInfo;
+	public void setCrtDfndntAgntNm(String crtDfndntAgntNm) {
+		this.crtDfndntAgntNm = crtDfndntAgntNm;
 	}
-	public String getRspndInfo() {
-		return rspndInfo;
+	public String getCrtDfndntAgntPhone() {
+		return crtDfndntAgntPhone;
 	}
-	public void setRspndInfo(String rspndInfo) {
-		this.rspndInfo = rspndInfo;
+	public void setCrtDfndntAgntPhone(String crtDfndntAgntPhone) {
+		this.crtDfndntAgntPhone = crtDfndntAgntPhone;
 	}
-	public String getAplcnDpty() {
-		return aplcnDpty;
+	public String getCrtDfndntInfo() {
+		return crtDfndntInfo;
 	}
-	public void setAplcnDpty(String aplcnDpty) {
-		this.aplcnDpty = aplcnDpty;
+	public void setCrtDfndntInfo(String crtDfndntInfo) {
+		this.crtDfndntInfo = crtDfndntInfo;
 	}
-	public String getRspndDpty() {
-		return rspndDpty;
+	public String getCrtCn() {
+		return crtCn;
 	}
-	public void setRspndDpty(String rspndDpty) {
-		this.rspndDpty = rspndDpty;
+	public void setCrtCn(String crtCn) {
+		this.crtCn = crtCn;
 	}
-	public String getCourtRslt() {
-		return courtRslt;
+	public String getCrtAtchFileId() {
+		return crtAtchFileId;
 	}
-	public void setCourtRslt(String courtRslt) {
-		this.courtRslt = courtRslt;
+	public void setCrtAtchFileId(String crtAtchFileId) {
+		this.crtAtchFileId = crtAtchFileId;
 	}
-	public String getCourtDetailRslt() {
-		return courtDetailRslt;
+	public String getCrtAllctDdlDe() {
+		return crtAllctDdlDe;
 	}
-	public void setCourtDetailRslt(String courtDetailRslt) {
-		this.courtDetailRslt = courtDetailRslt;
+	public void setCrtAllctDdlDe(String crtAllctDdlDe) {
+		this.crtAllctDdlDe = crtAllctDdlDe;
 	}
-	public String getAdjCmsnr() {
-		return adjCmsnr;
+	public String getCrtCcTy() {
+		return crtCcTy;
 	}
-	public void setAdjCmsnr(String adjCmsnr) {
-		this.adjCmsnr = adjCmsnr;
+	public void setCrtCcTy(String crtCcTy) {
+		this.crtCcTy = crtCcTy;
 	}
-	public String getPay() {
-		return pay;
+	public String getCrtLinkHouse() {
+		return crtLinkHouse;
 	}
-	public void setPay(String pay) {
-		this.pay = pay;
+	public void setCrtLinkHouse(String crtLinkHouse) {
+		this.crtLinkHouse = crtLinkHouse;
 	}
-	public String getAppDe() {
-		return appDe;
+	public String getCrtStatCd() {
+		return crtStatCd;
 	}
-	public void setAppDe(String appDe) {
-		this.appDe = appDe;
+	public void setCrtStatCd(String crtStatCd) {
+		this.crtStatCd = crtStatCd;
 	}
-	public String getPymntDay() {
-		return pymntDay;
+	public String getCrtAgrment() {
+		return crtAgrment;
 	}
-	public void setPymntDay(String pymntDay) {
-		this.pymntDay = pymntDay;
-	}
-	public String getExtns() {
-		return extns;
-	}
-	public void setExtns(String extns) {
-		this.extns = extns;
-	}
-	public String getUseYn() {
-		return useYn;
-	}
-	public void setUseYn(String useYn) {
-		this.useYn = useYn;
+	public void setCrtAgrment(String crtAgrment) {
+		this.crtAgrment = crtAgrment;
 	}
 	public String getFrstRegistPnttm() {
 		return frstRegistPnttm;
@@ -240,12 +290,6 @@ public class AdjCourtCnctnVO  extends ComDefaultVO implements Serializable {
 	public void setLastUpdusrId(String lastUpdusrId) {
 		this.lastUpdusrId = lastUpdusrId;
 	}
-	public String getRmrks() {
-		return rmrks;
-	}
-	public void setRmrks(String rmrks) {
-		this.rmrks = rmrks;
-	}
 	public String getSearchCondition2() {
 		return searchCondition2;
 	}
@@ -258,10 +302,252 @@ public class AdjCourtCnctnVO  extends ComDefaultVO implements Serializable {
 	public void setDiffMonth(String diffMonth) {
 		this.diffMonth = diffMonth;
 	}
-	
-	
-	
-	
+	public String getTabSeq() {
+		return tabSeq;
+	}
+	public void setTabSeq(String tabSeq) {
+		this.tabSeq = tabSeq;
+	}
+	public String getAtchFileId() {
+		return atchFileId;
+	}
+	public void setAtchFileId(String atchFileId) {
+		this.atchFileId = atchFileId;
+	}
+	public String getFileSn() {
+		return fileSn;
+	}
+	public void setFileSn(String fileSn) {
+		this.fileSn = fileSn;
+	}
+	public String getCrtAtchFileTy() {
+		return crtAtchFileTy;
+	}
+	public void setCrtAtchFileTy(String crtAtchFileTy) {
+		this.crtAtchFileTy = crtAtchFileTy;
+	}
+	public String getOrignlFileNm() {
+		return orignlFileNm;
+	}
+	public void setOrignlFileNm(String orignlFileNm) {
+		this.orignlFileNm = orignlFileNm;
+	}
+	public String getPstinstCode() {
+		return pstinstCode;
+	}
+	public void setPstinstCode(String pstinstCode) {
+		this.pstinstCode = pstinstCode;
+	}
+	public String getCrtDeptTy() {
+		return crtDeptTy;
+	}
+	public void setCrtDeptTy(String crtDeptTy) {
+		this.crtDeptTy = crtDeptTy;
+	}
+	public String getCrtDeptKng() {
+		return crtDeptKng;
+	}
+	public void setCrtDeptKng(String crtDeptKng) {
+		this.crtDeptKng = crtDeptKng;
+	}
+	public String getCrtDeptOrdi() {
+		return crtDeptOrdi;
+	}
+	public void setCrtDeptOrdi(String crtDeptOrdi) {
+		this.crtDeptOrdi = crtDeptOrdi;
+	}
+	public String getEsntlId() {
+		return esntlId;
+	}
+	public void setEsntlId(String esntlId) {
+		this.esntlId = esntlId;
+	}
+	public String getCrtEndRslt() {
+		return crtEndRslt;
+	}
+	public void setCrtEndRslt(String crtEndRslt) {
+		this.crtEndRslt = crtEndRslt;
+	}
+	public String getCrtEndRsltDetail() {
+		return crtEndRsltDetail;
+	}
+	public void setCrtEndRsltDetail(String crtEndRsltDetail) {
+		this.crtEndRsltDetail = crtEndRsltDetail;
+	}
+	public String getCrtAtchFileIdEnd() {
+		return crtAtchFileIdEnd;
+	}
+	public void setCrtAtchFileIdEnd(String crtAtchFileIdEnd) {
+		this.crtAtchFileIdEnd = crtAtchFileIdEnd;
+	}
+	public String getCrtEndDe() {
+		return crtEndDe;
+	}
+	public void setCrtEndDe(String crtEndDe) {
+		this.crtEndDe = crtEndDe;
+	}
+	public String getDeptNm() {
+		return deptNm;
+	}
+	public void setDeptNm(String deptNm) {
+		this.deptNm = deptNm;
+	}
+	public String getSearchStatCd() {
+		return searchStatCd;
+	}
+	public void setSearchStatCd(String searchStatCd) {
+		this.searchStatCd = searchStatCd;
+	}
+	public String[] getCrtLinkHouseList() {
+		return crtLinkHouseList;
+	}
+	public void setCrtLinkHouseList(String[] crtLinkHouseList) {
+		this.crtLinkHouseList = crtLinkHouseList;
+	}
+	public String getCrtLinkHouseAll() {
+		return crtLinkHouseAll;
+	}
+	public void setCrtLinkHouseAll(String crtLinkHouseAll) {
+		this.crtLinkHouseAll = crtLinkHouseAll;
+	}
+	public String[] getCkStsList() {
+		return ckStsList;
+	}
+	public void setCkStsList(String[] ckStsList) {
+		this.ckStsList = ckStsList;
+	}
+	public String getCkStsListAll() {
+		return ckStsListAll;
+	}
+	public void setCkStsListAll(String ckStsListAll) {
+		this.ckStsListAll = ckStsListAll;
+	}
+	public String getSearchMonth() {
+		return searchMonth;
+	}
+	public void setSearchMonth(String searchMonth) {
+		this.searchMonth = searchMonth;
+	}
+	public String getSearchStartDt() {
+		return searchStartDt;
+	}
+	public void setSearchStartDt(String searchStartDt) {
+		this.searchStartDt = searchStartDt;
+	}
+	public String getSearchEndDt() {
+		return searchEndDt;
+	}
+	public void setSearchEndDt(String searchEndDt) {
+		this.searchEndDt = searchEndDt;
+	}
+	public String getDeptNmArr() {
+		return deptNmArr;
+	}
+	public void setDeptNmArr(String deptNmArr) {
+		this.deptNmArr = deptNmArr;
+	}
+	public String getSearchLoginId() {
+		return searchLoginId;
+	}
+	public void setSearchLoginId(String searchLoginId) {
+		this.searchLoginId = searchLoginId;
+	}
+	public String getCrtAllctDdlDeAdd1st() {
+		return crtAllctDdlDeAdd1st;
+	}
+	public void setCrtAllctDdlDeAdd1st(String crtAllctDdlDeAdd1st) {
+		this.crtAllctDdlDeAdd1st = crtAllctDdlDeAdd1st;
+	}
+	public String getCrtAllctDdlDeAdd2nd() {
+		return crtAllctDdlDeAdd2nd;
+	}
+	public void setCrtAllctDdlDeAdd2nd(String crtAllctDdlDeAdd2nd) {
+		this.crtAllctDdlDeAdd2nd = crtAllctDdlDeAdd2nd;
+	}
+	public int getPageUnit() {
+		return pageUnit;
+	}
+	public void setPageUnit(int pageUnit) {
+		this.pageUnit = pageUnit;
+	}
+	public int getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public int getRecordCountPerPage() {
+		return recordCountPerPage;
+	}
+	public void setRecordCountPerPage(int recordCountPerPage) {
+		this.recordCountPerPage = recordCountPerPage;
+	}
+	public String getDeptOrdinaryYn() {
+		return deptOrdinaryYn;
+	}
+	public void setDeptOrdinaryYn(String deptOrdinaryYn) {
+		this.deptOrdinaryYn = deptOrdinaryYn;
+	}
+	public String getUniqId() {
+		return uniqId;
+	}
+	public void setUniqId(String uniqId) {
+		this.uniqId = uniqId;
+	}
+	public String getCrtCnfrm() {
+		return crtCnfrm;
+	}
+	public void setCrtCnfrm(String crtCnfrm) {
+		this.crtCnfrm = crtCnfrm;
+	}
+	public String getOfcpsNm() {
+		return ofcpsNm;
+	}
+	public void setOfcpsNm(String ofcpsNm) {
+		this.ofcpsNm = ofcpsNm;
+	}
+	public String getCrtAdjAdminMeno() {
+		return crtAdjAdminMeno;
+	}
+	public void setCrtAdjAdminMeno(String crtAdjAdminMeno) {
+		this.crtAdjAdminMeno = crtAdjAdminMeno;
+	}
+	public String getCrtAdjCmsnrMeno() {
+		return crtAdjCmsnrMeno;
+	}
+	public void setCrtAdjCmsnrMeno(String crtAdjCmsnrMeno) {
+		this.crtAdjCmsnrMeno = crtAdjCmsnrMeno;
+	}
+	public String getRprtSeq() {
+		return rprtSeq;
+	}
+	public void setRprtSeq(String rprtSeq) {
+		this.rprtSeq = rprtSeq;
+	}
+	public String getRprtPhone() {
+		return rprtPhone;
+	}
+	public void setRprtPhone(String rprtPhone) {
+		this.rprtPhone = rprtPhone;
+	}
+	public String getRprtPgr() {
+		return rprtPgr;
+	}
+	public void setRprtPgr(String rprtPgr) {
+		this.rprtPgr = rprtPgr;
+	}
+	public String getRprtSeqTemp() {
+		return rprtSeqTemp;
+	}
+	public void setRprtSeqTemp(String rprtSeqTemp) {
+		this.rprtSeqTemp = rprtSeqTemp;
+	}
+	public List<AdjCourtRprtMgrVO> getAdjCourtRprtMgrList() {
+		return adjCourtRprtMgrList;
+	}
+	public void setAdjCourtRprtMgrList(List<AdjCourtRprtMgrVO> adjCourtRprtMgrList) {
+		this.adjCourtRprtMgrList = adjCourtRprtMgrList;
+	}
 	
 	
 	

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtDeptVO.java

@@ -0,0 +1,134 @@
+package kcc.kccadr.adjCourtCnctn.service;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import kcc.com.cmm.ComDefaultVO;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
+
+public class AdjCourtDeptVO  extends ComDefaultVO implements Serializable {
+
+	private static final long serialVersionUID = -1111076331699607617L;
+	
+	
+	private String esntlId;
+	private String crtSeq;
+	private String crtAtchFileId;
+	private String crtAllwanc;
+	private String crtPayDe;
+	private String crtRecivAccnt;
+	private String crtDeptTy;
+	
+	
+	private String frstRegistPnttm;
+	private String frstRegisterId;
+	private String lastUpdtPnttm;
+	private String lastUpdusrId;
+	
+	private String crtLinkHouse;
+	
+	private String emplyrId;
+	private String userNm;
+	private String pstinstCode;
+	private String ofcpsNm;
+	
+	public String getCrtAtchFileId() {
+		return crtAtchFileId;
+	}
+	public void setCrtAtchFileId(String crtAtchFileId) {
+		this.crtAtchFileId = crtAtchFileId;
+	}
+	public String getCrtAllwanc() {
+		return crtAllwanc;
+	}
+	public void setCrtAllwanc(String crtAllwanc) {
+		this.crtAllwanc = crtAllwanc;
+	}
+	public String getCrtPayDe() {
+		return crtPayDe;
+	}
+	public void setCrtPayDe(String crtPayDe) {
+		this.crtPayDe = crtPayDe;
+	}
+	public String getCrtRecivAccnt() {
+		return crtRecivAccnt;
+	}
+	public void setCrtRecivAccnt(String crtRecivAccnt) {
+		this.crtRecivAccnt = crtRecivAccnt;
+	}
+	public String getEsntlId() {
+		return esntlId;
+	}
+	public void setEsntlId(String esntlId) {
+		this.esntlId = esntlId;
+	}
+	public String getCrtSeq() {
+		return crtSeq;
+	}
+	public void setCrtSeq(String crtSeq) {
+		this.crtSeq = crtSeq;
+	}
+	public String getFrstRegistPnttm() {
+		return frstRegistPnttm;
+	}
+	public void setFrstRegistPnttm(String frstRegistPnttm) {
+		this.frstRegistPnttm = frstRegistPnttm;
+	}
+	public String getFrstRegisterId() {
+		return frstRegisterId;
+	}
+	public void setFrstRegisterId(String frstRegisterId) {
+		this.frstRegisterId = frstRegisterId;
+	}
+	public String getLastUpdtPnttm() {
+		return lastUpdtPnttm;
+	}
+	public void setLastUpdtPnttm(String lastUpdtPnttm) {
+		this.lastUpdtPnttm = lastUpdtPnttm;
+	}
+	public String getLastUpdusrId() {
+		return lastUpdusrId;
+	}
+	public void setLastUpdusrId(String lastUpdusrId) {
+		this.lastUpdusrId = lastUpdusrId;
+	}
+	public String getCrtLinkHouse() {
+		return crtLinkHouse;
+	}
+	public void setCrtLinkHouse(String crtLinkHouse) {
+		this.crtLinkHouse = crtLinkHouse;
+	}
+	public String getCrtDeptTy() {
+		return crtDeptTy;
+	}
+	public void setCrtDeptTy(String crtDeptTy) {
+		this.crtDeptTy = crtDeptTy;
+	}
+	public String getEmplyrId() {
+		return emplyrId;
+	}
+	public void setEmplyrId(String emplyrId) {
+		this.emplyrId = emplyrId;
+	}
+	public String getUserNm() {
+		return userNm;
+	}
+	public void setUserNm(String userNm) {
+		this.userNm = userNm;
+	}
+	public String getPstinstCode() {
+		return pstinstCode;
+	}
+	public void setPstinstCode(String pstinstCode) {
+		this.pstinstCode = pstinstCode;
+	}
+	public String getOfcpsNm() {
+		return ofcpsNm;
+	}
+	public void setOfcpsNm(String ofcpsNm) {
+		this.ofcpsNm = ofcpsNm;
+	}
+	
+	
+}

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtRprtMgrVO.java

@@ -0,0 +1,63 @@
+package kcc.kccadr.adjCourtCnctn.service;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import kcc.com.cmm.ComDefaultVO;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
+
+public class AdjCourtRprtMgrVO  extends ComDefaultVO implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 836926077984092881L;
+	
+	private String crtSeq; //법원연계 seq
+	private String crtSn; //법원연계 기일수
+	private String rprtSeq; // 사무수행보고일 SEQ
+	private String rprtPhone; // 전화
+	private String rprtPgr; // 기일진행
+	private String crtRprtDe; // 사무수행보고일
+	
+	public String getCrtSeq() {
+		return crtSeq;
+	}
+	public void setCrtSeq(String crtSeq) {
+		this.crtSeq = crtSeq;
+	}
+	public String getCrtSn() {
+		return crtSn;
+	}
+	public void setCrtSn(String crtSn) {
+		this.crtSn = crtSn;
+	}
+	public String getRprtSeq() {
+		return rprtSeq;
+	}
+	public void setRprtSeq(String rprtSeq) {
+		this.rprtSeq = rprtSeq;
+	}
+	public String getRprtPhone() {
+		return rprtPhone;
+	}
+	public void setRprtPhone(String rprtPhone) {
+		this.rprtPhone = rprtPhone;
+	}
+	public String getRprtPgr() {
+		return rprtPgr;
+	}
+	public void setRprtPgr(String rprtPgr) {
+		this.rprtPgr = rprtPgr;
+	}
+	public String getCrtRprtDe() {
+		return crtRprtDe;
+	}
+	public void setCrtRprtDe(String crtRprtDe) {
+		this.crtRprtDe = crtRprtDe;
+	}
+	
+	
+	
+}

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtaprvlVO.java

@@ -0,0 +1,231 @@
+package kcc.kccadr.adjCourtCnctn.service;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import kcc.com.cmm.ComDefaultVO;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
+
+public class AdjCourtaprvlVO  extends AdjCourtCnctnVO implements Serializable {
+
+	private static final long serialVersionUID = -1111076331699607617L;
+	
+	private String crtAprvlSeq;
+	private String crtSeq;
+	private String crtStatCd;
+	private String crtAprvlCnt;
+	private String crtAprvlId1;
+	private String crtAprvlYn1;
+	private String crtAprvlDe1;
+	private String crtAprvlId2;
+	private String crtAprvlYn2;
+	private String crtAprvlDe2;
+	private String crtAprvlId3;
+	private String crtAprvlYn3;
+	private String crtAprvlDe3;
+	
+	private String crtAprvlId;
+	private String crtAprvlYn;
+	private String crtAprvlDe;
+	
+	private String crtDeptKng;
+	private String esntlId;
+	
+	private String frstRegistPnttm;
+	private String frstRegisterId;
+	private String lastUpdtPnttm;
+	private String lastUpdusrId;
+	
+	private String confirmStatus;
+	private String allYn; 
+	private String target;
+	private String step;
+	private String lastYn;
+	private String targetId;
+	private String stepMem;
+
+	
+	public String getCrtAprvlSeq() {
+		return crtAprvlSeq;
+	}
+	public void setCrtAprvlSeq(String crtAprvlSeq) {
+		this.crtAprvlSeq = crtAprvlSeq;
+	}
+	public String getCrtSeq() {
+		return crtSeq;
+	}
+	public void setCrtSeq(String crtSeq) {
+		this.crtSeq = crtSeq;
+	}
+	public String getCrtStatCd() {
+		return crtStatCd;
+	}
+	public void setCrtStatCd(String crtStatCd) {
+		this.crtStatCd = crtStatCd;
+	}
+	public String getCrtAprvlCnt() {
+		return crtAprvlCnt;
+	}
+	public void setCrtAprvlCnt(String crtAprvlCnt) {
+		this.crtAprvlCnt = crtAprvlCnt;
+	}
+	public String getCrtAprvlId1() {
+		return crtAprvlId1;
+	}
+	public void setCrtAprvlId1(String crtAprvlId1) {
+		this.crtAprvlId1 = crtAprvlId1;
+	}
+	public String getCrtAprvlYn1() {
+		return crtAprvlYn1;
+	}
+	public void setCrtAprvlYn1(String crtAprvlYn1) {
+		this.crtAprvlYn1 = crtAprvlYn1;
+	}
+	public String getCrtAprvlDe1() {
+		return crtAprvlDe1;
+	}
+	public void setCrtAprvlDe1(String crtAprvlDe1) {
+		this.crtAprvlDe1 = crtAprvlDe1;
+	}
+	public String getCrtAprvlId2() {
+		return crtAprvlId2;
+	}
+	public void setCrtAprvlId2(String crtAprvlId2) {
+		this.crtAprvlId2 = crtAprvlId2;
+	}
+	public String getCrtAprvlYn2() {
+		return crtAprvlYn2;
+	}
+	public void setCrtAprvlYn2(String crtAprvlYn2) {
+		this.crtAprvlYn2 = crtAprvlYn2;
+	}
+	public String getCrtAprvlDe2() {
+		return crtAprvlDe2;
+	}
+	public void setCrtAprvlDe2(String crtAprvlDe2) {
+		this.crtAprvlDe2 = crtAprvlDe2;
+	}
+	public String getCrtAprvlId3() {
+		return crtAprvlId3;
+	}
+	public void setCrtAprvlId3(String crtAprvlId3) {
+		this.crtAprvlId3 = crtAprvlId3;
+	}
+	public String getCrtAprvlYn3() {
+		return crtAprvlYn3;
+	}
+	public void setCrtAprvlYn3(String crtAprvlYn3) {
+		this.crtAprvlYn3 = crtAprvlYn3;
+	}
+	public String getCrtAprvlDe3() {
+		return crtAprvlDe3;
+	}
+	public void setCrtAprvlDe3(String crtAprvlDe3) {
+		this.crtAprvlDe3 = crtAprvlDe3;
+	}
+	public String getFrstRegistPnttm() {
+		return frstRegistPnttm;
+	}
+	public void setFrstRegistPnttm(String frstRegistPnttm) {
+		this.frstRegistPnttm = frstRegistPnttm;
+	}
+	public String getFrstRegisterId() {
+		return frstRegisterId;
+	}
+	public void setFrstRegisterId(String frstRegisterId) {
+		this.frstRegisterId = frstRegisterId;
+	}
+	public String getLastUpdtPnttm() {
+		return lastUpdtPnttm;
+	}
+	public void setLastUpdtPnttm(String lastUpdtPnttm) {
+		this.lastUpdtPnttm = lastUpdtPnttm;
+	}
+	public String getLastUpdusrId() {
+		return lastUpdusrId;
+	}
+	public void setLastUpdusrId(String lastUpdusrId) {
+		this.lastUpdusrId = lastUpdusrId;
+	}
+	public String getCrtDeptKng() {
+		return crtDeptKng;
+	}
+	public void setCrtDeptKng(String crtDeptKng) {
+		this.crtDeptKng = crtDeptKng;
+	}
+	public String getEsntlId() {
+		return esntlId;
+	}
+	public void setEsntlId(String esntlId) {
+		this.esntlId = esntlId;
+	}
+	public String getCrtAprvlId() {
+		return crtAprvlId;
+	}
+	public void setCrtAprvlId(String crtAprvlId) {
+		this.crtAprvlId = crtAprvlId;
+	}
+	public String getCrtAprvlYn() {
+		return crtAprvlYn;
+	}
+	public void setCrtAprvlYn(String crtAprvlYn) {
+		this.crtAprvlYn = crtAprvlYn;
+	}
+	public String getCrtAprvlDe() {
+		return crtAprvlDe;
+	}
+	public void setCrtAprvlDe(String crtAprvlDe) {
+		this.crtAprvlDe = crtAprvlDe;
+	}
+	public String getConfirmStatus() {
+		return confirmStatus;
+	}
+	public void setConfirmStatus(String confirmStatus) {
+		this.confirmStatus = confirmStatus;
+	}
+	public String getAllYn() {
+		return allYn;
+	}
+	public void setAllYn(String allYn) {
+		this.allYn = allYn;
+	}
+	public String getTarget() {
+		return target;
+	}
+	public void setTarget(String target) {
+		this.target = target;
+	}
+	public String getStep() {
+		return step;
+	}
+	public void setStep(String step) {
+		this.step = step;
+	}
+	public String getLastYn() {
+		return lastYn;
+	}
+	public void setLastYn(String lastYn) {
+		this.lastYn = lastYn;
+	}
+	public String getTargetId() {
+		return targetId;
+	}
+	public void setTargetId(String targetId) {
+		this.targetId = targetId;
+	}
+	public String getStepMem() {
+		return stepMem;
+	}
+	public void setStepMem(String stepMem) {
+		this.stepMem = stepMem;
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+}

src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtAprvlDAO.java

@@ -0,0 +1,46 @@
+package kcc.kccadr.adjCourtCnctn.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtaprvlVO;
+
+@Repository("AdjCourtAprvlDAO")
+public class AdjCourtAprvlDAO  extends EgovAbstractDAO {
+
+//	public void insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) {
+//		insert("adjCourtCnctnDAO.insertCourtCnctn", adjCourtCnctnVO);
+//	}
+	public void insertAprvlReg(AdjCourtaprvlVO adjCourtaprvlVO) {
+		insert("adjCourtAprvlDAO.insertAprvlReg", adjCourtaprvlVO);
+	}
+	
+	public List<AdjCourtaprvlVO> adjCourtAprvlList(AdjCourtaprvlVO adjCourtaprvlVO) {
+		return (List<AdjCourtaprvlVO>) list("adjCourtCnctnDAO.adjCourtAprvlList", adjCourtaprvlVO);
+	}
+	
+	public int adjCourtAprvlListCnt(AdjCourtaprvlVO adjCourtaprvlVO) {
+		return (int) select("adjCourtCnctnDAO.adjCourtAprvlListCnt", adjCourtaprvlVO);
+	}
+	
+	public AdjCourtaprvlVO adjCourtAprvlDetail(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception {
+		return (AdjCourtaprvlVO) select("adjCourtAprvlDAO.adjCourtAprvlDetail", adjCourtaprvlVO);
+	}
+	
+	public List<AdjCourtaprvlVO> adjCourtAprvlLine(AdjCourtaprvlVO adjCourtaprvlVO) {
+		return (List<AdjCourtaprvlVO>) list("adjCourtAprvlDAO.adjCourtAprvlLine", adjCourtaprvlVO);
+	}
+	
+	public void adjCourtAprvlLineUpdate(AdjCourtaprvlVO adjCourtaprvlVO) {
+		update("adjCourtAprvlDAO.adjCourtAprvlLineUpdate", adjCourtaprvlVO);
+	}
+	
+	
+	public AdjCourtaprvlVO adjCourtAprvlLineChk(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception {
+		return (AdjCourtaprvlVO) select("adjCourtAprvlDAO.adjCourtAprvlLineChk" , adjCourtaprvlVO);
+	}
+	
+}

src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtAprvlServiceImpl.java

@@ -0,0 +1,79 @@
+package kcc.kccadr.adjCourtCnctn.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
+import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import kcc.com.cmm.service.AdrCourtFileMngService;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.EgovFileMngUtil;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtAprvlService;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtaprvlVO;
+
+@Service("AdjCourtAprvlService")
+public class AdjCourtAprvlServiceImpl extends EgovAbstractServiceImpl implements AdjCourtAprvlService {
+
+	// 조정신청 DAO
+	@Resource(name = "AdjCourtCnctnDAO")
+	private AdjCourtCnctnDAO adjCourtCnctnDAO;
+	
+	@Resource(name = "AdjCourtAprvlDAO")
+	private AdjCourtAprvlDAO adjCourtAprvlDAO;
+
+	@Resource(name="courtCnctnGnrService")
+	private EgovIdGnrService courtCnctnGnrService;
+	
+	@Resource(name = "EgovFileMngService")
+	private EgovFileMngService fileMngService;
+	
+	@Resource(name = "EgovFileMngUtil")
+	private EgovFileMngUtil fileUtil;
+	
+	@Resource(name = "AdrCourtFileMngService")
+	private AdrCourtFileMngService adrCourtFileMngService;
+	
+	@Resource(name="courtAprvlGnrService")
+	private EgovIdGnrService courtAprvlGnrService;
+
+	@Override
+	public void insertAprvlReg(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception {
+		String crtAprvlSeq = courtAprvlGnrService.getNextStringId();
+		adjCourtaprvlVO.setCrtAprvlSeq(crtAprvlSeq);
+		adjCourtAprvlDAO.insertAprvlReg(adjCourtaprvlVO);
+	}
+
+	@Override
+	public List<AdjCourtaprvlVO> adjCourtAprvlList(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception {
+		return adjCourtAprvlDAO.adjCourtAprvlList(adjCourtaprvlVO);
+	}
+	
+	@Override
+	public int adjCourtAprvlListCnt(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception  {
+		return adjCourtAprvlDAO.adjCourtAprvlListCnt(adjCourtaprvlVO);
+	}
+
+	@Override
+	public AdjCourtaprvlVO adjCourtAprvlDetail(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception {
+		return adjCourtAprvlDAO.adjCourtAprvlDetail(adjCourtaprvlVO);
+	}
+	
+	@Override
+	public List<AdjCourtaprvlVO> adjCourtAprvlLine(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception  {
+		return adjCourtAprvlDAO.adjCourtAprvlLine(adjCourtaprvlVO);
+	}
+	
+	@Override
+	public void adjCourtAprvlLineUpdate(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception  {
+		adjCourtAprvlDAO.adjCourtAprvlLineUpdate(adjCourtaprvlVO);
+	}
+	
+	@Override
+	public AdjCourtaprvlVO adjCourtAprvlLineChk(AdjCourtaprvlVO adjCourtaprvlVO) throws Exception {
+		return adjCourtAprvlDAO.adjCourtAprvlLineChk(adjCourtaprvlVO);
+	}
+	
+}

src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java

@@ -5,10 +5,11 @@ import java.util.List;
 import org.springframework.stereotype.Repository;
 
 import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
+import kcc.com.cmm.service.AdrCourtFileVO;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtAppVO;
 import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO;
-import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
-import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
-import kcc.kccadr.cmm.RestResponse;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtDeptVO;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtRprtMgrVO;
 
 @Repository("AdjCourtCnctnDAO")
 public class AdjCourtCnctnDAO  extends EgovAbstractDAO {
@@ -38,4 +39,94 @@ public class AdjCourtCnctnDAO  extends EgovAbstractDAO {
 		update("adjCourtCnctnDAO.updateUseYn", adjCourtCnctnVO);
 	}
 	
+	public void insertCourtFileInf(AdrCourtFileVO adrCourtFileVO) {
+		insert("adjCourtCnctnDAO.insertCourtFileInf", adrCourtFileVO);
+	}
+	
+	public void insertCourtDept(AdjCourtDeptVO adjCourtDeptVO) {
+		insert("adjCourtCnctnDAO.insertCourtDept", adjCourtDeptVO);
+	}
+	
+	public void updateCourtDept(AdjCourtDeptVO adjCourtDeptVO) {
+		update("adjCourtCnctnDAO.updateCourtDept", adjCourtDeptVO);
+	}
+	
+	public List<AdjCourtCnctnVO> selectAdjCourtCnctniFileList(AdjCourtCnctnVO adjCourtCnctnVO) {
+		return (List<AdjCourtCnctnVO>) list("adjCourtCnctnDAO.selectAdjCourtCnctniFileList", adjCourtCnctnVO);
+	}
+	
+	public List<AdjCourtDeptVO> selectAdjCourtCnctniDeptPop() {
+		return (List<AdjCourtDeptVO>) list("adjCourtCnctnDAO.selectAdjCourtCnctniDeptPop");
+	}
+
+	public void saveFromAdrCourtDeptMgr(AdjCourtDeptVO deptVO) {
+		update("adjCourtCnctnDAO.saveFromAdrCourtDeptMgr", deptVO);
+	}
+	
+	public void updateAdjCourtCnctnStatCd(AdjCourtCnctnVO adjCourtCnctnVO) {
+		update("adjCourtCnctnDAO.updateAdjCourtCnctnStatCd", adjCourtCnctnVO);
+	}
+	
+	public List<AdjCourtAppVO> selectAdjCourtCnctnAppList(AdjCourtAppVO adjCourtAppVO) throws Exception {
+
+		return (List<AdjCourtAppVO>) list("adjCourtCnctnDAO.selectAdjCourtCnctnAppList", adjCourtAppVO);
+	}
+	
+	public int selectAdjCourtCnctnAppNextSn(AdjCourtAppVO adjCourtAppVO) {
+		return (int) select("adjCourtCnctnDAO.selectAdjCourtCnctnAppNextSn", adjCourtAppVO);
+	}
+	
+	public void insertAdjCourtCnctnAppReg(AdjCourtAppVO adjCourtAppVO) {
+		insert("adjCourtCnctnDAO.insertAdjCourtCnctnAppReg", adjCourtAppVO);
+	}
+	
+	public AdjCourtAppVO selectAdjCourtCnctnAppDetail(AdjCourtAppVO adjCourtAppVO) {
+		return (AdjCourtAppVO) select("adjCourtCnctnDAO.selectAdjCourtCnctnAppDetail", adjCourtAppVO);
+	}
+	
+	public void updateAdjCourtCnctnEnd(AdjCourtCnctnVO adjCourtCnctnVO){
+		update("adjCourtCnctnDAO.updateAdjCourtCnctnEnd", adjCourtCnctnVO);
+	}
+	
+	public void updateCourtCnctnEndAfter(AdjCourtCnctnVO adjCourtCnctnVO){
+		update("adjCourtCnctnDAO.updateCourtCnctnEndAfter", adjCourtCnctnVO);
+	}
+	
+	public void updateCourtDeptEndAfterDept(AdjCourtDeptVO adjCourtDeptVO){
+		update("adjCourtCnctnDAO.updateCourtDeptEndAfterDept", adjCourtDeptVO);
+	}
+	
+	public AdjCourtDeptVO selectCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception {
+		return (AdjCourtDeptVO) select("adjCourtCnctnDAO.selectCourtDept", adjCourtDeptVO);
+	}
+	
+	public void insertAdjCourtRprtDePopAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
+		update("adjCourtCnctnDAO.insertAdjCourtRprtDePopAjax", adjCourtCnctnVO);
+	}
+
+	public void updateOfcpsNmFromAdrCourtDeptMgr(AdjCourtCnctnVO adjCourtCnctnVO) {
+		update("adjCourtCnctnDAO.updateOfcpsNmFromAdrCourtDeptMgr", adjCourtCnctnVO);
+	}
+
+	public void updateCrtAdjCmsnrMenoAjax(AdjCourtCnctnVO adjCourtCnctnVO) {
+		update("adjCourtCnctnDAO.updateCrtAdjCmsnrMenoAjax", adjCourtCnctnVO);
+	}
+
+	public void updateCrtAdjAdminMenoAjax(AdjCourtCnctnVO adjCourtCnctnVO) {
+		update("adjCourtCnctnDAO.updateCrtAdjAdminMenoAjax", adjCourtCnctnVO);
+	}
+
+	public List<AdjCourtRprtMgrVO> findByIdFromAdjCourtRprtMgr(AdjCourtCnctnVO adjCourtCnctnVO) {
+		return (List<AdjCourtRprtMgrVO>) list("adjCourtCnctnDAO.findByIdFromAdjCourtRprtMgr", adjCourtCnctnVO);
+	}
+
+	public AdjCourtRprtMgrVO findByRprtSeqFromAdrCourtRprtMgr(AdjCourtCnctnVO adjCourtCnctnVO) {
+		return (AdjCourtRprtMgrVO) select("adjCourtCnctnDAO.findByRprtSeqFromAdrCourtRprtMgr", adjCourtCnctnVO);
+	}
+
+	public void updateCrtStatCdAjax(AdjCourtCnctnVO adjCourtCnctnVO) {
+		update("adjCourtCnctnDAO.updateCrtStatCdAjax", adjCourtCnctnVO);
+	}
+	
+	
 }

src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java

@@ -1,34 +1,33 @@
 package kcc.kccadr.adjCourtCnctn.service.impl;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
-import kcc.com.cmm.service.CmmnDetailCode;
+import kcc.com.cmm.service.AdrCourtFileMngService;
+import kcc.com.cmm.service.AdrCourtFileVO;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.EgovFileMngUtil;
+import kcc.com.cmm.service.FileVO;
 import kcc.com.cmm.util.DateUtil;
-import kcc.com.utl.user.service.CheckAdrProcessUtil;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtAppVO;
 import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService;
 import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO;
-import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService;
-import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
-import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
-import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO;
-import kcc.kccadr.adjst.service.AdjstReqVO;
-import kcc.kccadr.adjst.service.impl.AdjstReqDAO;
-import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
-import kcc.kccadr.cmm.KccadrConstants;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtDeptVO;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtRprtMgrVO;
+import kcc.kccadr.cmm.KccadrCourtConstants;
 import kcc.kccadr.cmm.RestResponse;
-import kcc.let.sym.ccm.cde.service.CmmnDetailCodeVO;
-import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService;
-import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 @Service("AdjCourtCnctnService")
 public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements AdjCourtCnctnService {
@@ -40,11 +39,58 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements
 	@Resource(name="courtCnctnGnrService")
 	private EgovIdGnrService courtCnctnGnrService;
 	
+	@Resource(name="crtRprtMgrIdgenService")
+	private EgovIdGnrService crtRprtMgrIdgenService;
+	
+	@Resource(name = "EgovFileMngService")
+	private EgovFileMngService fileMngService;
+	
+	@Resource(name = "EgovFileMngUtil")
+	private EgovFileMngUtil fileUtil;
+	
+	@Resource(name = "AdrCourtFileMngService")
+	private AdrCourtFileMngService adrCourtFileMngService;
+
 	@Override
-	public RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) {
+	public RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) {
+		
 		try {
-			adjCourtCnctnVO.setCourtSeq(courtCnctnGnrService.getNextStringId());
+			adjCourtCnctnVO.setCrtSeq(courtCnctnGnrService.getNextStringId());
+			adjCourtCnctnVO.setCrtStatCd("101000");
+			adjCourtCnctnVO.setCrtStatCd(KccadrCourtConstants.CRT_REG);
+			
+			final Map<String, MultipartFile> files = multiRequest.getFileMap();
+			
+			if (!files.isEmpty()){
+				for(Entry<String, MultipartFile> files_tmp : files.entrySet()) {
+					if(!files_tmp.getValue().getName().equals("file_temp")) {
+						List<FileVO> result = fileUtil.parseFileInf(files, "CRT_", 0, "", "", "");
+						String atchFileId = fileMngService.insertFileInfs(result);
+						adjCourtCnctnVO.setCrtAtchFileId(atchFileId);
+						
+						AdrCourtFileVO adrCourtFileVO = new AdrCourtFileVO();
+						
+						adrCourtFileVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq());
+						adrCourtFileVO.setCrtSn(adjCourtCnctnVO.getCrtSn());
+						adrCourtFileVO.setCrtAtchFileId(atchFileId);
+						adrCourtFileVO.setCrtAtchFileTy(KccadrCourtConstants.CRT_FILE_RETURN);
+						adrCourtFileVO.setFrstRegisterId(adjCourtCnctnVO.getFrstRegisterId());
+						
+						adrCourtFileMngService.insertCourtFileInf(adrCourtFileVO);
+					}
+				}
+			}
+		
 			adjCourtCnctnDAO.insertCourtCnctn(adjCourtCnctnVO);
+			
+			AdjCourtDeptVO adjCourtDeptVO = new AdjCourtDeptVO();
+			adjCourtDeptVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq());
+			adjCourtDeptVO.setFrstRegisterId(adjCourtCnctnVO.getFrstRegisterId());
+			adjCourtDeptVO.setCrtLinkHouse(adjCourtCnctnVO.getCrtLinkHouse());
+			adjCourtDeptVO.setCrtDeptTy("10");
+			
+			adjCourtCnctnDAO.insertCourtDept(adjCourtDeptVO);
+			
 		} catch (Exception e) {
 			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
 		}
@@ -81,6 +127,16 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements
 	public RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) {
 		try {
 			adjCourtCnctnDAO.updateCourtCnctn(adjCourtCnctnVO);
+			
+			AdjCourtDeptVO adjCourtDeptVO = new AdjCourtDeptVO();
+			
+			adjCourtDeptVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq());
+			adjCourtDeptVO.setLastUpdusrId(adjCourtCnctnVO.getLastUpdusrId());
+			adjCourtDeptVO.setCrtLinkHouse(adjCourtCnctnVO.getCrtLinkHouse());
+			adjCourtDeptVO.setCrtDeptTy("10");
+			
+			adjCourtCnctnDAO.updateCourtDept(adjCourtDeptVO);
+			
 		} catch (Exception e) {
 			return new RestResponse(HttpStatus.BAD_REQUEST, "수정에 실패하였습니다.", LocalDateTime.now());
 		}
@@ -92,6 +148,207 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements
 		adjCourtCnctnDAO.updateUseYn(adjCourtCnctnVO);
 	}
 	
+	public List<AdjCourtCnctnVO> selectAdjCourtCnctniFileList(AdjCourtCnctnVO adjCourtCnctnVO) {
+		return adjCourtCnctnDAO.selectAdjCourtCnctniFileList(adjCourtCnctnVO);
+	}
+	
+	@Override
+	public void insertCourtDept(AdjCourtDeptVO adjCourtDeptVO) {
+		adjCourtCnctnDAO.insertCourtDept(adjCourtDeptVO);
+	}
+	
+	@Override
+	public void updateCourtDept(AdjCourtDeptVO adjCourtDeptVO) {
+		adjCourtCnctnDAO.updateCourtDept(adjCourtDeptVO);
+	}
+	
+	@Override
+	public List<AdjCourtDeptVO> selectAdjCourtCnctniDeptPop() {
+		return adjCourtCnctnDAO.selectAdjCourtCnctniDeptPop();
+	}
+
+	@Override
+	public RestResponse insertAdjCourtCnctnDeptPopAjax(AdjCourtDeptVO deptVO) throws Exception {
+		try {
+			adjCourtCnctnDAO.saveFromAdrCourtDeptMgr(deptVO);
+		} catch (Exception e)
+		{ e.printStackTrace();
+			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
+		}
+		return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now());
+	}
+	
+	@Override
+	public void updateAdjCourtCnctnStatCd(AdjCourtCnctnVO adjCourtCnctnVO) {
+		adjCourtCnctnDAO.updateAdjCourtCnctnStatCd(adjCourtCnctnVO);
+	}
+
+	@Override
+	public List<AdjCourtAppVO> selectAdjCourtCnctnAppList(AdjCourtAppVO adjCourtAppVO) throws Exception {
+
+		return adjCourtCnctnDAO.selectAdjCourtCnctnAppList(adjCourtAppVO);
+	}
+	
+	@Override
+	public int selectAdjCourtCnctnAppNextSn(AdjCourtAppVO adjCourtAppVO) throws Exception {
+		return adjCourtCnctnDAO.selectAdjCourtCnctnAppNextSn(adjCourtAppVO);
+	}
+	
+	@Override
+	public RestResponse insertAdjCourtCnctnAppReg(AdjCourtAppVO adjCourtAppVO, final MultipartHttpServletRequest multiRequest) throws Exception  {
+		
+		final Map<String, MultipartFile> files = multiRequest.getFileMap();
+		if (!files.isEmpty()){
+				List<FileVO> result = fileUtil.parseFileInf(files, "CRT_", 0, adjCourtAppVO.getCrtAtchFileId(), "", "");
+				String atchFileId = fileMngService.insertFileInfs(result);
+				adjCourtAppVO.setCrtAtchFileId(atchFileId);
+				
+				AdrCourtFileVO adrCourtFileVO = new AdrCourtFileVO();
+				
+				adrCourtFileVO.setCrtSeq(adjCourtAppVO.getCrtSeq());
+				adrCourtFileVO.setCrtSn(adjCourtAppVO.getCrtSn());
+				adrCourtFileVO.setCrtAtchFileId(atchFileId);
+				adrCourtFileVO.setCrtAtchFileTy(KccadrCourtConstants.CRT_FILE_APP);
+				adrCourtFileVO.setFrstRegisterId(adjCourtAppVO.getFrstRegisterId());
+				
+				adrCourtFileMngService.insertCourtFileInf(adrCourtFileVO);
+		}
+		
+		adjCourtCnctnDAO.insertAdjCourtCnctnAppReg(adjCourtAppVO);
+		
+		return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now());
+	}
+	
+	@Override
+	public AdjCourtAppVO selectAdjCourtCnctnAppDetail(AdjCourtAppVO adjCourtAppVO) throws Exception {
+		return adjCourtCnctnDAO.selectAdjCourtCnctnAppDetail(adjCourtAppVO);
+	}
+	
+	@Override
+	public RestResponse updateAdjCourtCnctnEnd(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) throws Exception{
+		
+		final Map<String, MultipartFile> files = multiRequest.getFileMap();
+		if (!files.isEmpty()){
+				List<FileVO> result = fileUtil.parseFileInf(files, "CRT_", 0, adjCourtCnctnVO.getCrtAtchFileIdEnd(), "", "");
+				String atchFileId = fileMngService.insertFileInfs(result);
+				adjCourtCnctnVO.setCrtAtchFileIdEnd(atchFileId);
+				
+				AdrCourtFileVO adrCourtFileVO = new AdrCourtFileVO();
+				
+				adrCourtFileVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq());
+				adrCourtFileVO.setCrtSn(adjCourtCnctnVO.getCrtSn());
+				adrCourtFileVO.setCrtAtchFileId(atchFileId);
+				adrCourtFileVO.setCrtAtchFileTy(KccadrCourtConstants.CRT_FILE_ACTION);
+				adrCourtFileVO.setFrstRegisterId(adjCourtCnctnVO.getFrstRegisterId());
+				
+				adrCourtFileMngService.insertCourtFileInf(adrCourtFileVO);
+		}
+		
+		adjCourtCnctnDAO.updateAdjCourtCnctnEnd(adjCourtCnctnVO);
+		return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now());
+	}
+	
+	@Override
+	public RestResponse insertCourtCnctnFile(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) {
+		try {
+
+			final Map<String, MultipartFile> files = multiRequest.getFileMap();
+			List<FileVO> result = fileUtil.parseFileInf(files, "CRT_", 0, adjCourtCnctnVO.getAtchFileId(), "", "");
+			String atchFileId = fileMngService.insertFileInfs(result);
+			adjCourtCnctnVO.setCrtAtchFileId(atchFileId);
+			
+			AdrCourtFileVO adrCourtFileVO = new AdrCourtFileVO();
+			
+			adrCourtFileVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq());
+			adrCourtFileVO.setCrtSn(adjCourtCnctnVO.getCrtSn());
+			adrCourtFileVO.setCrtAtchFileId(atchFileId);
+			adrCourtFileVO.setCrtAtchFileTy(adjCourtCnctnVO.getCrtAtchFileTy());
+			adrCourtFileVO.setFrstRegisterId(adjCourtCnctnVO.getFrstRegisterId());
+			
+			adrCourtFileMngService.insertCourtFileInf(adrCourtFileVO);
+		} catch (Exception e) {
+			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
+		}
+		return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now());
+	}
+
+	@Override
+	public RestResponse updateAdjCourtCnctnEndAfterPopAjax(AdjCourtCnctnVO adjCourtCnctnVO, AdjCourtDeptVO adjCourtDeptVO)
+			throws Exception {
+		
+		try {
+			adjCourtCnctnDAO.updateCourtCnctnEndAfter(adjCourtCnctnVO);
+			adjCourtCnctnDAO.updateCourtDeptEndAfterDept(adjCourtDeptVO);
+		}catch (Exception e) {
+			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
+		}
+		return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now());
+	}
+	
+	@Override
+	public AdjCourtDeptVO selectCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception {
+		return adjCourtCnctnDAO.selectCourtDept(adjCourtDeptVO);
+	}
+
+	@Override
+	public RestResponse insertAdjCourtRprtDePopAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
+		try {
+			adjCourtCnctnVO.setRprtSeqTemp(crtRprtMgrIdgenService.getNextStringId()); 
+			adjCourtCnctnDAO.insertAdjCourtRprtDePopAjax(adjCourtCnctnVO);
+		}catch (Exception e) {
+			e.printStackTrace();
+			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
+		}
+		return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now());
+	}
+
+	@Override
+	public void updateOfcpsNmFromAdrCourtDeptMgr(AdjCourtCnctnVO adjCourtCnctnVO) {
+		// TODO Auto-generated method stub
+		adjCourtCnctnDAO.updateOfcpsNmFromAdrCourtDeptMgr(adjCourtCnctnVO);
+		
+	}
+
+	@Override
+	public RestResponse updateCrtAdjCmsnrMenoAjax(AdjCourtCnctnVO adjCourtCnctnVO) {
+		try {
+			adjCourtCnctnDAO.updateCrtAdjCmsnrMenoAjax(adjCourtCnctnVO);
+		}catch (Exception e) {
+			return new RestResponse(HttpStatus.BAD_REQUEST, "수정에 실패하였습니다.", LocalDateTime.now());
+		}
+		return new RestResponse(HttpStatus.OK, "수정 되었습니다.", LocalDateTime.now());
+	}
+	
+	@Override
+	public RestResponse updateCrtAdjAdminMenoAjax(AdjCourtCnctnVO adjCourtCnctnVO) {
+		try {
+			adjCourtCnctnDAO.updateCrtAdjAdminMenoAjax(adjCourtCnctnVO);
+		}catch (Exception e) {
+			return new RestResponse(HttpStatus.BAD_REQUEST, "수정에 실패하였습니다.", LocalDateTime.now());
+		}
+		return new RestResponse(HttpStatus.OK, "수정 되었습니다.", LocalDateTime.now());
+	}
+	
+	@Override
+	public RestResponse updateCrtStatCdAjax(AdjCourtCnctnVO adjCourtCnctnVO) {
+		try {
+			adjCourtCnctnDAO.updateCrtStatCdAjax(adjCourtCnctnVO);
+		}catch (Exception e) {
+			return new RestResponse(HttpStatus.BAD_REQUEST, "오류가 발생하였습니다.", LocalDateTime.now());
+		}
+		return new RestResponse(HttpStatus.OK, "정상 처리 되었습니다.", LocalDateTime.now());
+	}
+
+	@Override
+	public List<AdjCourtRprtMgrVO> findByIdFromAdjCourtRprtMgr(AdjCourtCnctnVO adjCourtCnctnVO) {
+		
+		return adjCourtCnctnDAO.findByIdFromAdjCourtRprtMgr(adjCourtCnctnVO);
+	}
+
+	@Override
+	public AdjCourtRprtMgrVO findByRprtSeqFromAdrCourtRprtMgr(AdjCourtCnctnVO adjCourtCnctnVO) {
+		return adjCourtCnctnDAO.findByRprtSeqFromAdrCourtRprtMgr(adjCourtCnctnVO);
+	}
 	
 	
 }

src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java

@@ -0,0 +1,252 @@
+package kcc.kccadr.adjCourtCnctn.web;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONObject;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.LoginVO;
+import kcc.com.utl.fcc.service.EgovStringUtil;
+import kcc.com.utl.user.service.CheckLoginUtil;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtAprvlService;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtaprvlVO;
+import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO;
+import kcc.kccadr.adjcclt.service.AdjstConciliatorVO;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
+import kcc.kccadr.cmm.CmmUtil;
+import kcc.kccadr.cmm.KccadrConstants;
+import kcc.kccadr.cmm.KccadrCourtConstants;
+import kcc.kccadr.ozSchd.web.OzSchdExportUtil;
+import kcc.let.uss.umt.service.UserManageVO;
+
+@Controller
+public class AdjCourtAprvlController {
+
+	// 조정신청 서비스단
+	@Resource(name = "AdjCourtAprvlService")
+	private AdjCourtAprvlService adjCourtAprvlService;
+	
+	@Resource(name = "AdjCourtCnctnService")
+	private AdjCourtCnctnService adjCourtCnctnService;
+	
+	//로그인 체크 util
+	@Resource(name = "checkLoginUtil")
+	private CheckLoginUtil checkLoginUtil;
+	
+	@RequestMapping(value = "/kccadr/adjCourtAprvl/aprvlList.do")
+    public String AprvlList(
+    		@ModelAttribute("adjCourtaprvlVO") AdjCourtaprvlVO adjCourtaprvlVO 
+    		, ModelMap model
+    		, HttpServletRequest request) throws Exception {
+
+        String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+        LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+        
+		if (loginVO == null) {
+
+			model.addAttribute("msg", "로그인 해주세요.");
+			return "redirect:/web/user/login/ssoLogin.do";
+		}
+		if("ROLE_COURT_ADMIN".equals(loginVO.getAuthority())
+			&& "80".equals(loginVO.getOfcpsNm())) {
+			
+			model.addAttribute("msg", "접근 할 수 없습니다.");
+			return "redirect:/kccadr/adjCourtCnctn/adjCourtCnctnList.do";
+		}
+			
+        
+        if(adjCourtaprvlVO.getPageUnit() != 10) {
+        	adjCourtaprvlVO.setPageUnit(adjCourtaprvlVO.getPageUnit());
+        }
+
+        if("".equals(adjCourtaprvlVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+        	adjCourtaprvlVO.setSearchSortCnd("a.crtSeq");
+        	adjCourtaprvlVO.setSearchSortOrd("desc");
+        }
+        
+        if("".equals(adjCourtaprvlVO.getSearchStatusArr()) || adjCourtaprvlVO.getSearchStatusArr() == null){
+        	String[] defaultSearchStatusArr = {"01"};
+        	adjCourtaprvlVO.setSearchStatusArr(defaultSearchStatusArr);
+        }
+
+        if(StringUtils.isEmpty(adjCourtaprvlVO.getSearchStartDt()) && StringUtils.isEmpty(adjCourtaprvlVO.getSearchEndDt())){
+        	adjCourtaprvlVO.setSearchStartDt(CmmUtil.getDiffMonth(1 , "yyyy-MM-dd"));
+            adjCourtaprvlVO.setSearchEndDt(CmmUtil.getDateNow("yyyy-MM-dd"));
+        }
+        
+        if(StringUtils.isEmpty(adjCourtaprvlVO.getSearchMonth())) {
+        	adjCourtaprvlVO.setSearchMonth("3");
+        }
+
+        /** paging */
+        PaginationInfo paginationInfo = new PaginationInfo();
+        paginationInfo.setCurrentPageNo(adjCourtaprvlVO.getPageIndex());
+        paginationInfo.setRecordCountPerPage(adjCourtaprvlVO.getPageUnit());
+        paginationInfo.setPageSize(adjCourtaprvlVO.getPageSize());
+        
+        adjCourtaprvlVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+        adjCourtaprvlVO.setLastIndex(paginationInfo.getLastRecordIndex());
+        adjCourtaprvlVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+        paginationInfo.setTotalRecordCount(adjCourtAprvlService.adjCourtAprvlListCnt(adjCourtaprvlVO));
+        
+        model.addAttribute("paginationInfo", paginationInfo);
+        
+        model.addAttribute("list", adjCourtAprvlService.adjCourtAprvlList(adjCourtaprvlVO));
+        return "kccadr/adjCourtCnctn/adjCourtAprvlList";
+    }
+	
+	
+	
+	@RequestMapping("/kccadr/adjCourtAprvl/popup/aprvlReqPop.do")
+	public String aprvlReqPop(
+			@ModelAttribute("adjCourtaprvlVO") AdjCourtaprvlVO adjCourtaprvlVO
+			, ModelMap model
+			) throws Exception {
+		
+		return "kccadr/adjCourtCnctn/pop/adjCourtaprvlReqPop";
+	}
+	
+	@RequestMapping(value="/kccadr/adjCourtAprvl/popup/aprvlReqAjax.do")
+	public ModelAndView checkNInsertAprvlStep1Ajax(
+			HttpServletRequest request 
+			, AdjCourtaprvlVO adjCourtaprvlVO
+			) throws Exception {
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		try {
+			AdjReqMgrVO arv = new AdjReqMgrVO();
+			
+	    	//로그인 정보 획득 -  ssoLoginVO 사용
+	    	LoginVO loginVO = checkLoginUtil.getLoginVO();
+	    	
+			/*
+			 * 1.법원연계결재에 저장
+			 * 2.법원연계관리 상태값 변경
+			 */
+			
+			//step.2.조정사건결재에 저장=======================================================================
+			int i = 0;
+			
+			adjCourtaprvlVO.setFrstRegisterId(loginVO.getUniqId());
+			
+			adjCourtAprvlService.insertAprvlReg(adjCourtaprvlVO);
+			
+			AdjCourtCnctnVO adjCourtCnctnVO = new AdjCourtCnctnVO();
+			adjCourtCnctnVO.setCrtSeq(adjCourtaprvlVO.getCrtSeq());
+			adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId());
+			adjCourtCnctnVO.setCrtStatCd(adjCourtaprvlVO.getCrtStatCd());
+			
+			adjCourtCnctnService.updateAdjCourtCnctnStatCd(adjCourtCnctnVO);
+			
+			if (i<=0) {
+				modelAndView.addObject("status", "success");
+				modelAndView.addObject("message", "결재선 생성 실패.-step2");
+						
+				return modelAndView;
+			}
+			modelAndView.addObject("status", "success");	
+		}catch(Exception ex) {
+			modelAndView.addObject("status", "fail");
+			modelAndView.addObject("message", "결재선 생성 실패.-step0");
+		
+		}
+		return modelAndView;
+	}
+	
+	
+	@RequestMapping(value = "/kccadr/adjCourtAprvl/aprvlDetail.do")
+    public String aprvlDetail(
+    		@ModelAttribute("adjCourtaprvlVO") AdjCourtaprvlVO adjCourtaprvlVO 
+    		, ModelMap model
+    		, HttpServletRequest request) throws Exception {
+		
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		model.addAttribute("courtVO",  adjCourtCnctnService.findByid(adjCourtaprvlVO));
+		
+		model.addAttribute("detailVO", adjCourtAprvlService.adjCourtAprvlDetail(adjCourtaprvlVO));
+		
+		model.addAttribute("approvLine", adjCourtAprvlService.adjCourtAprvlLine(adjCourtaprvlVO));
+		
+		AdjCourtaprvlVO statInfo = adjCourtAprvlService.adjCourtAprvlLineChk(adjCourtaprvlVO);
+		
+		model.addAttribute("statInfo", statInfo);
+		model.addAttribute("loginVO", loginVO);
+		
+		
+		return "kccadr/adjCourtCnctn/adjCourtAprvlDetail";
+	}
+	
+	
+	
+	@RequestMapping(value="/kccadr/adjCourtAprvl/aprvlSave.do", method = RequestMethod.POST)
+	public ModelAndView internalApprovManageSave(HttpServletRequest request , @RequestBody AdjCourtaprvlVO adjCourtaprvlVO) throws Exception {
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		if (loginVO == null) {
+
+			modelAndView.addObject("result", "fail");
+			modelAndView.addObject("message", "로그인 해주세요.");
+			return modelAndView;
+		}
+		
+		adjCourtaprvlVO.setFrstRegisterId(loginVO.getUniqId());
+		adjCourtaprvlVO.setLastUpdusrId(loginVO.getUniqId());
+		adjCourtaprvlVO.setCrtAprvlId(loginVO.getUniqId());
+
+		//결재 순서 및 체크
+		AdjCourtaprvlVO statInfo = new AdjCourtaprvlVO();
+		statInfo = adjCourtAprvlService.adjCourtAprvlLineChk(adjCourtaprvlVO);
+		
+		adjCourtaprvlVO.setStep(statInfo.getStep());
+		//결재 처리
+		adjCourtAprvlService.adjCourtAprvlLineUpdate(adjCourtaprvlVO);
+		
+		statInfo = new AdjCourtaprvlVO();
+		statInfo = adjCourtAprvlService.adjCourtAprvlLineChk(adjCourtaprvlVO);
+		
+		// 모든 결재가 끝났다면...
+		if("Y".equals(statInfo.getAllYn())){
+			//adr_court_mgr - > statCd 변경
+			if("2".equals(statInfo.getCrtAprvlCnt())) {
+				adjCourtaprvlVO.setCrtStatCd(KccadrCourtConstants.CRT_APRVL_END);
+			}
+			else {
+				adjCourtaprvlVO.setCrtStatCd(KccadrCourtConstants.CRT_APRVL_OK);
+			}
+			adjCourtaprvlVO.setLastUpdusrId(loginVO.getUniqId());
+			adjCourtCnctnService.updateAdjCourtCnctnStatCd(adjCourtaprvlVO);
+		}
+		modelAndView.addObject("result", KccadrConstants.SUCCESS);
+		return modelAndView;
+	}
+	
+	
+	@RequestMapping("/kccadr/adjCourtAprvl/popup/aprvlReqEndPop.do")
+	public String aprvlReqEndPop(
+			@ModelAttribute("adjCourtaprvlVO") AdjCourtaprvlVO adjCourtaprvlVO
+			, ModelMap model
+			) throws Exception {
+		
+		return "kccadr/adjCourtCnctn/pop/adjCourtaprvlReqEndPop";
+	}
+}

src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java

@@ -1,26 +1,52 @@
 package kcc.kccadr.adjCourtCnctn.web;
 
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
+import egovframework.rte.psl.dataaccess.util.EgovMap;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.ComDefaultCodeVO;
 import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.EgovCmmUseService;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.FileVO;
+import kcc.com.cmm.util.RedirectUrlMaker;
+import kcc.com.cmm.util.StringUtil;
+import kcc.com.utl.fcc.service.EgovStringUtil;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtAppVO;
 import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService;
 import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO;
-import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
-import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
-import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtDeptVO;
+import kcc.kccadr.adjCourtCnctn.service.AdjCourtRprtMgrVO;
+import kcc.kccadr.cmm.KccadrCourtConstants;
 import kcc.kccadr.cmm.RestResponse;
+import kcc.let.org.service.LocVO;
+import kcc.let.sec.ram.service.AuthorManageVO;
+import kcc.let.sec.ram.service.EgovAuthorManageService;
+import kcc.let.uat.uia.service.EgovLoginService;
+import kcc.let.uss.umt.service.EgovUserManageService;
+import kcc.let.uss.umt.service.UserDefaultVO;
+import kcc.let.uss.umt.service.UserManageVO;
 
 /**
  * 
@@ -43,20 +69,57 @@ public class AdjCourtCnctnController {
 	@Resource(name = "AdjCourtCnctnService")
 	private AdjCourtCnctnService adjCourtCnctnService;
 	
+	//파일정보의 관리
+	@Resource(name = "EgovFileMngService")
+	private EgovFileMngService fileService;
+	
+	@Resource(name = "loginService")
+	private EgovLoginService loginService;
+	
+	@Resource(name = "userManageService")
+	private EgovUserManageService userManageService;
+	
+	/** cmmUseService */
+	@Resource(name = "EgovCmmUseService")
+	private EgovCmmUseService cmmUseService;
+	
+	@Resource(name = "egovAuthorManageService")
+	private EgovAuthorManageService egovAuthorManageService;
+	
+	@Resource(name = "EgovFileMngService")
+    private EgovFileMngService fileMngService;
+	
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnList.do")
 	public String adjCourtCnctnList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
 		
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+		System.out.println(" :: loginVO.getOfcpsNm() :: "+loginVO.getOfcpsNm());
+		if(loginVO != null && (KccadrCourtConstants.CRT_DEPT_ORDINARY).equals(loginVO.getOfcpsNm())) {
+			adjCourtCnctnVO.setDeptOrdinaryYn("Y");
+			adjCourtCnctnVO.setUniqId(loginVO.getUniqId());
+			
+		}else if(loginVO != null && (KccadrCourtConstants.CRT_DEPT_GENERAL).equals(loginVO.getOfcpsNm())) {
+			//총괄조정일경우
+			//insttCode 해당 법원 구하는 로직
+			UserManageVO userManageVO = new UserManageVO();
+			userManageVO = userManageService.selectUser(loginVO.getUniqId());
+			System.out.println("userManageVO.getInsttCode() :: "+userManageVO.getInsttCode());
+			adjCourtCnctnVO.setCrtLinkHouse(userManageVO.getInsttCode().trim());
+			
+		}
+		model.addAttribute("ofcpsNm",loginVO.getOfcpsNm());
+		
+		adjCourtCnctnVO.setSearchStatCd("list");
+
 		if(adjCourtCnctnVO.getPageUnit() != 10) {
 			adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit());
 		}
 
 		if("".equals(adjCourtCnctnVO.getSearchSortCnd())){
-			adjCourtCnctnVO.setSearchSortCnd("COURT_SEQ");
+			adjCourtCnctnVO.setSearchSortCnd("CRT_SEQ");
 			adjCourtCnctnVO.setSearchSortOrd("desc");
 		}
 
-		System.out.println("searchMonth2 :: "+ adjCourtCnctnVO.getSearchMonth2());
-		
 		/** paging */
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(adjCourtCnctnVO.getPageIndex());
@@ -68,10 +131,37 @@ public class AdjCourtCnctnController {
 		adjCourtCnctnVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 		paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO));
 		model.addAttribute("paginationInfo", paginationInfo);
+		
+		if(StringUtil.isEmpty(adjCourtCnctnVO.getSearchMonth())) {
+			adjCourtCnctnVO.setSearchMonth("1");
+        }
+		
+		if (StringUtil.isEmpty(adjCourtCnctnVO.getSearchStartDt())) { // 조회일시가 null인경우
+            Date today = new Date();
+            int month = -1;
+            if(StringUtil.isNotEmpty(adjCourtCnctnVO.getSearchMonth())) {
+            	month = -(Integer.valueOf(adjCourtCnctnVO.getSearchMonth()));
+            }
+            adjCourtCnctnVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, month), "yyyyMMdd"));
+            adjCourtCnctnVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd"));
+            
+        }
+		
+
+		
+		
+		
 		List<AdjCourtCnctnVO> list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO);
-		// 복호화
+		
+		model.addAttribute("deptNmArr", deptNmArr(list));
+		
 		model.addAttribute("list", list);
 		
+	    ComDefaultCodeVO vo = new ComDefaultCodeVO();
+	    vo.setCodeId("CC701");
+	    List<?>  corporationCmmCode = cmmUseService.selectCmmCodeDetail(vo);
+  		model.addAttribute("corporationCmmCode", corporationCmmCode);
+		
 
 		return "kccadr/adjCourtCnctn/adjCourtCnctnList";
 	}
@@ -89,15 +179,88 @@ public class AdjCourtCnctnController {
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetail.do")
 	public String adjCourtCnctnDetail(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception {
 		
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+		model.addAttribute("ofcpsNm",loginVO.getOfcpsNm());
+		AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO);
+		
+		
+		// 처음 확인이면 확인 컬럼에 crtCnfrm = "Y" udpate
+		if("N".equals(CourtVO.getCrtCnfrm()) 
+				&& "80".equals(CourtVO.getOfcpsNm())) {
+			
+			CourtVO.setCrtCnfrm("Y");
+			CourtVO.setEsntlId(loginVO.getUniqId());
+			CourtVO.setLastUpdusrId(loginVO.getUniqId());
+			
+			adjCourtCnctnService.updateOfcpsNmFromAdrCourtDeptMgr(CourtVO);
+		}
+		
+		if(StringUtil.isEmpty(adjCourtCnctnVO.getTabSeq())) {
+			adjCourtCnctnVO.setTabSeq("0");
+		}
+		model.addAttribute("courtVO", adjCourtCnctnVO);
+		model.addAttribute("loginVO", loginVO);
+		
+		return "kccadr/adjCourtCnctn/adjCourtCnctnDetail";
+	}
+	
+	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.do")
+	public String adjCourtCnctnDetailTab0(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception {
+		
+		
+		
+		AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO);
+		adjCourtCnctnVO.setAdjCourtRprtMgrList(adjCourtCnctnService.findByIdFromAdjCourtRprtMgr(adjCourtCnctnVO));
+		
+		
+		model.addAttribute("courtVO", adjCourtCnctnVO);
+		
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+		model.addAttribute("loginVO", loginVO);
+		return "kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0";
+	}
+	
+	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.do")
+	public String adjCourtCnctnDetailTab1(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception {
+		
 		AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO);
 		model.addAttribute("courtVO", adjCourtCnctnVO);
-		return "kccadr/adjCourtCnctn/adjCourtCnctnDetail";
+		
+		List<AdjCourtCnctnVO> list = adjCourtCnctnService.selectAdjCourtCnctniFileList(CourtVO);
+		model.addAttribute("list", list);
+		
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+		model.addAttribute("loginVO", loginVO);
+		return "kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1";
+	}
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnFilePop.do")
+	public String adjCourtCnctnFilePop(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
+    	
+    	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+        String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+    	
+    	model.addAttribute("userId", userId);
+    	
+		return "kccadr/adjCourtCnctn/pop/adjCourtCnctnFilePop";
+	}
+	
+	
+	@RequestMapping("/kccadr/adjCourtCnctn/popup/adjCourtCnctnFilePopAjax.do")
+	public ResponseEntity<RestResponse> adjCourtCnctnFilePopAjax(final MultipartHttpServletRequest multiRequest, AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
+		
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId());
+		return ResponseEntity.ok().body(adjCourtCnctnService.insertCourtCnctnFile(adjCourtCnctnVO, multiRequest));
 	}
 	
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnModify.do")
 	public String adjCourtCnctnModify(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception {
 
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+		model.addAttribute("ofcpsNm",loginVO.getOfcpsNm());
 		AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO);
+		
 		model.addAttribute("courtVO", adjCourtCnctnVO);
 		return "kccadr/adjCourtCnctn/adjCourtCnctnModify";
 	}
@@ -105,17 +268,17 @@ public class AdjCourtCnctnController {
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegist.do")
 	public String adjCourtCnctnRegist(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
 
-		AdjReqMgrPastVO adjReqMgrPastVO =  new AdjReqMgrPastVO(); 
-		model.addAttribute("courtVO", adjReqMgrPastVO);
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+		model.addAttribute("ofcpsNm",loginVO.getOfcpsNm());
 		return "kccadr/adjCourtCnctn/adjCourtCnctnRegist";
 	}
 
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegistAjax.do")
-	public ResponseEntity<RestResponse> adjCourtCnctnRegistAjax(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
+	public ResponseEntity<RestResponse> adjCourtCnctnRegistAjax(final MultipartHttpServletRequest multiRequest, AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
 
 		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
 		adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId());
-		return ResponseEntity.ok().body(adjCourtCnctnService.insertCourtCnctn(adjCourtCnctnVO));
+		return ResponseEntity.ok().body(adjCourtCnctnService.insertCourtCnctn(adjCourtCnctnVO, multiRequest));
 	}
 	
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnUpdateAjax.do")
@@ -126,4 +289,394 @@ public class AdjCourtCnctnController {
 		return ResponseEntity.ok().body(adjCourtCnctnService.updateCourtCnctn(adjCourtCnctnVO));
 	}
 	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnDeptPop.do")
+    public String adjCourtCnctnDeptPop(@ModelAttribute("deptVO") AdjCourtDeptVO deptVO, ModelMap model) throws Exception {
+		
+        model.addAttribute("adjCourtDeptVO", adjCourtCnctnService.selectAdjCourtCnctniDeptPop());  
+        return "kccadr/adjCourtCnctn/pop/adjCourtCnctnDeptPop";
+    }
+	
+
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/insertAdjCourtCnctnDeptPopAjax.do")
+	public ResponseEntity<RestResponse> insertAdjCourtCnctnDeptPopAjax(@ModelAttribute("deptVO") AdjCourtDeptVO deptVO) throws Exception {
+		
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		deptVO.setLastUpdusrId(loginVO.getUniqId());
+		deptVO.setFrstRegisterId(loginVO.getUniqId());
+		
+		return ResponseEntity.ok().body(adjCourtCnctnService.insertAdjCourtCnctnDeptPopAjax(deptVO));
+	}
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnAppPop.do")
+    public String adjCourtCnctnAppPop(@RequestParam(value = "endFlag" , required = false) String endFlag, @ModelAttribute("adjCourtAppVO") AdjCourtAppVO adjCourtAppVO, ModelMap model) throws Exception {
+		
+		model.addAttribute("endFlag", endFlag);
+        model.addAttribute("list", adjCourtCnctnService.selectAdjCourtCnctnAppList(adjCourtAppVO));
+        return "kccadr/adjCourtCnctn/pop/adjCourtCnctnAppPop";
+    }
+	
+
+
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/updateCrtAdjCmsnrMenoAjax.do")
+	public ResponseEntity<RestResponse> updateCrtAdjCmsnrMenoAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
+		
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId());
+		adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId());
+		
+		return ResponseEntity.ok().body(adjCourtCnctnService.updateCrtAdjCmsnrMenoAjax(adjCourtCnctnVO));
+	}
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/updateCrtAdjAdminMenoAjax.do")
+	public ResponseEntity<RestResponse> updateCrtAdjAdminMenoAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
+		
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId());
+		adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId());
+		
+		return ResponseEntity.ok().body(adjCourtCnctnService.updateCrtAdjAdminMenoAjax(adjCourtCnctnVO));
+	}
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/updateCrtStatCdAjax.do")
+	public ResponseEntity<RestResponse> updateCrtStatCdAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
+		
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId());
+		adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId());
+		
+		return ResponseEntity.ok().body(adjCourtCnctnService.updateCrtStatCdAjax(adjCourtCnctnVO));
+	}
+	
+	
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnAppDetailPop.do")
+    public String adjCourtCnctnAppDetailPop(@ModelAttribute("adjCourtAppVO") AdjCourtAppVO adjCourtAppVO, ModelMap model) throws Exception {
+		
+		AdjCourtAppVO detailVO = adjCourtCnctnService.selectAdjCourtCnctnAppDetail(adjCourtAppVO);
+		
+		model.addAttribute("detailVO", detailVO);
+		
+		//파일 정보 가져오기
+		FileVO fileVO = new FileVO(); 
+		fileVO.setAtchFileId(detailVO.getCrtAtchFileId());
+		List<FileVO> result = fileService.selectFileInfs(fileVO);
+		model.addAttribute("fileList", result);
+		model.addAttribute("fileListCnt", result.size());
+		
+        return "kccadr/adjCourtCnctn/pop/adjCourtCnctnAppDetailPop";
+    }
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnAppRegPop.do")
+    public String adjCourtCnctnAppRegPop(@ModelAttribute("adjCourtAppVO") AdjCourtAppVO adjCourtAppVO, ModelMap model) throws Exception {
+
+		adjCourtAppVO.setCrtSn(Integer.toString(adjCourtCnctnService.selectAdjCourtCnctnAppNextSn(adjCourtAppVO)));
+		
+        return "kccadr/adjCourtCnctn/pop/adjCourtCnctnAppRegPop";
+    }
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnAppRegPopAjax.do")
+	public ResponseEntity<RestResponse> adjCourtCnctnAppRegPopAjax(final MultipartHttpServletRequest multiRequest, AdjCourtAppVO adjCourtAppVO) throws Exception {
+		
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		adjCourtAppVO.setLastUpdusrId(loginVO.getUniqId());
+		adjCourtAppVO.setFrstRegisterId(loginVO.getUniqId());
+		
+		return ResponseEntity.ok().body(adjCourtCnctnService.insertAdjCourtCnctnAppReg(adjCourtAppVO, multiRequest));
+	}
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnEndPop.do")
+    public String adjCourtCnctnEndPop(@ModelAttribute("searchVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
+		
+		model.addAttribute("adjCourtCnctnVO", adjCourtCnctnService.findByid(adjCourtCnctnVO));
+		
+        return "kccadr/adjCourtCnctn/pop/adjCourtCnctnEndRegPop";
+    }
+	
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnEndPopAjax.do")
+	public ResponseEntity<RestResponse> adjCourtCnctnEndPopAjax(final MultipartHttpServletRequest multiRequest, AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
+		
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId());
+		adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId());
+		
+		return ResponseEntity.ok().body(adjCourtCnctnService.updateAdjCourtCnctnEnd(adjCourtCnctnVO, multiRequest));
+	}
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnEndAfterPop.do")
+    public String adjCourtCnctnEndAfterPop(@ModelAttribute("searchVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
+		AdjCourtDeptVO adjCourtDeptVO = new AdjCourtDeptVO();
+		adjCourtDeptVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq());
+		model.addAttribute("adjCourtDeptVO", adjCourtCnctnService.selectCourtDept(adjCourtDeptVO));
+		model.addAttribute("adjCourtCnctnVO", adjCourtCnctnService.findByid(adjCourtCnctnVO));
+		
+        return "kccadr/adjCourtCnctn/pop/adjCourtCnctnEndAfterPop";
+    }
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnEndAfterPopAjax.do")
+	public ResponseEntity<RestResponse> adjCourtCnctnEndAfterPopAjax(AdjCourtCnctnVO adjCourtCnctnVO, AdjCourtDeptVO deptVO) throws Exception {
+		
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		deptVO.setLastUpdusrId(loginVO.getUniqId());
+		deptVO.setFrstRegisterId(loginVO.getUniqId());
+		
+		adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId());
+		adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId());
+		
+		return ResponseEntity.ok().body(adjCourtCnctnService.updateAdjCourtCnctnEndAfterPopAjax(adjCourtCnctnVO, deptVO));
+	}
+	
+	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndList.do")
+	public String adjCourtCnctnEndList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
+
+		adjCourtCnctnVO.setSearchStatCd("endList");
+		
+		if(adjCourtCnctnVO.getPageUnit() != 10) {
+			adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit());
+		}
+
+		if("".equals(adjCourtCnctnVO.getSearchSortCnd())){
+			adjCourtCnctnVO.setSearchSortCnd("CRT_SEQ");
+			adjCourtCnctnVO.setSearchSortOrd("desc");
+		}
+
+		/** paging */
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(adjCourtCnctnVO.getPageIndex());
+		paginationInfo.setRecordCountPerPage(adjCourtCnctnVO.getPageUnit());
+		paginationInfo.setPageSize(adjCourtCnctnVO.getPageSize());
+
+		adjCourtCnctnVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		adjCourtCnctnVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		adjCourtCnctnVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO));
+		model.addAttribute("paginationInfo", paginationInfo);
+		List<AdjCourtCnctnVO> list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO);
+		
+//		try {
+//		list = list.stream()
+//			.filter(t -> t.getCrtStatCd() != null)
+//			.filter(t -> Integer.parseInt(t.getCrtStatCd()) > 201050)
+//			.collect(Collectors.toList());
+//		} catch (Exception e) {
+//			System.out.println(e.getMessage());
+//		}
+		// 복호화
+		model.addAttribute("list", list);
+		model.addAttribute("endFlag", "end");
+
+		return "kccadr/adjCourtCnctn/adjCourtCnctnList";
+	}
+	
+	
+	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndDetail.do")
+	public String adjCourtCnctnEndDetail(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception {
+		
+		AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO);
+		
+		if(StringUtil.isEmpty(adjCourtCnctnVO.getTabSeq())) {
+			adjCourtCnctnVO.setTabSeq("0");
+		}
+		model.addAttribute("courtVO", adjCourtCnctnVO);
+		return "kccadr/adjCourtCnctn/adjCourtCnctnEndDetail";
+	}
+	
+	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.do")
+	public String adjCourtCnctnEndDetailTab0(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception {
+		
+		AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO);
+		model.addAttribute("courtVO", adjCourtCnctnVO);
+		
+		AdjCourtDeptVO adjCourtDeptVO = new AdjCourtDeptVO();
+		adjCourtDeptVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq());
+		model.addAttribute("adjCourtDeptVO", adjCourtCnctnService.selectCourtDept(adjCourtDeptVO));
+		
+		return "kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0";
+	}
+	
+	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab1.do")
+	public String adjCourtCnctnEndDetailTab1(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception {
+		
+		AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO);
+		model.addAttribute("courtVO", adjCourtCnctnVO);
+		
+		List<AdjCourtCnctnVO> list = adjCourtCnctnService.selectAdjCourtCnctniFileList(CourtVO);
+		model.addAttribute("list", list);
+		return "kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab1";
+	}
+	
+	
+	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtSelectUserList.do")
+	public String adjCourtSelectUserList(@ModelAttribute("userSearchVO") UserDefaultVO userSearchVO, 
+		ModelMap model, 
+		HttpServletRequest request,
+		HttpSession session) throws Exception {
+		{
+			//일반관리자가 좌측의 매뉴의 관리자 관리 클릭시 리스트가 아닌 자신의 정보수정페이지로 리로딩.
+			LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();//최고관리자의 경우 비밀번호 확인 없음.
+			loginVO.setId(loginVO.getId());
+			if(!"ROLE_ADMIN".equals(loginService.getUserAuth(loginVO).getAuthority())){//최고관리자 아닐경우
+				return "redirect:/EgovTopPageLink.do?link=/uss/umt/user/EgovUserSelectUpdtView.do?selectedId="+loginVO.getUniqId()+"&baseMenuNo=3500000" ;
+			}
+		}
+		
+		if(userSearchVO.getPageUnit() != 10) {
+			userSearchVO.setPageUnit(userSearchVO.getPageUnit());
+		}
+		
+		userSearchVO.setPageUnit(50);
+
+		/** pageing */
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(userSearchVO.getPageIndex());
+		paginationInfo.setRecordCountPerPage(userSearchVO.getPageUnit());
+		paginationInfo.setPageSize(userSearchVO.getPageSize());
+
+		userSearchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		userSearchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		userSearchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+		//userSearchVO.setAdminYn("Y");
+		if("".equals(userSearchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+			userSearchVO.setSearchSortCnd("uniqId");
+			userSearchVO.setSearchSortOrd("desc");
+		}
+		userSearchVO.setCourtYn("Y");
+		List<?> resultList = userManageService.selectUserList(userSearchVO) ;
+		model.addAttribute("resultList", resultList);
+		//paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((Long)((EgovMap)resultList.get(0)).get("totCnt")).intValue() : 0);
+		paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((int)((EgovMap)resultList.get(0)).get("totCnt")) : 0);
+		model.addAttribute("paginationInfo", paginationInfo);
+
+		//사용자상태코드를 코드정보로부터 조회
+		ComDefaultCodeVO vo = new ComDefaultCodeVO();
+		vo.setCodeId("COM038");
+		model.addAttribute("emplyrSttusCode_result", cmmUseService.selectCmmCodeDetail(vo));//사용자상태코드목록
+		
+		//권한조회
+		AuthorManageVO authorManageVO = new AuthorManageVO();
+		authorManageVO.setFirstIndex(0);
+  		authorManageVO.setLastIndex(10);
+  		authorManageVO.setRecordCountPerPage(10);
+  		authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO));
+  		model.addAttribute("authorList", authorManageVO.getAuthorManageList());
+  		
+		return "kccadr/adjCourtCnctn/adjCourtUserList";
+	}
+	
+	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtSelectUserDetail.do")
+	public String adjCourtSelectUserDetail(@RequestParam("selectedId") String uniqId, 
+			@ModelAttribute("searchVO") UserDefaultVO userSearchVO, 
+			HttpServletRequest request,
+			@RequestParam Map<String, Object> commandMap,
+			Model model) throws Exception {
+		ComDefaultCodeVO vo = new ComDefaultCodeVO();
+		//패스워드힌트목록을 코드정보로부터 조회
+		vo.setCodeId("COM022");
+		model.addAttribute("passwordHint_result", cmmUseService.selectCmmCodeDetail(vo));
+		//성별구분코드를 코드정보로부터 조회
+		vo.setCodeId("COM014");
+		model.addAttribute("sexdstnCode_result", cmmUseService.selectCmmCodeDetail(vo));
+		//사용자상태코드를 코드정보로부터 조회
+		vo.setCodeId("COM013");
+		model.addAttribute("emplyrSttusCode_result", cmmUseService.selectCmmCodeDetail(vo));
+		//소속기관코드를 코드정보로부터 조회 - COM025
+		vo.setCodeId("COM025");
+		model.addAttribute("insttCode_result", cmmUseService.selectCmmCodeDetail(vo));
+		//조직정보를 조회 - ORGNZT_ID정보
+		vo.setTableNm("LETTNORGNZTINFO");
+		model.addAttribute("orgnztId_result", cmmUseService.selectOgrnztIdDetail(vo));
+		//그룹정보를 조회 - GROUP_ID정보
+		vo.setTableNm("LETTNORGNZTINFO");
+		model.addAttribute("groupId_result", cmmUseService.selectGroupIdDetail(vo));
+
+		UserManageVO userManageVO = new UserManageVO();
+		userManageVO = userManageService.selectUser(uniqId);
+		model.addAttribute("userSearchVO", userSearchVO);
+		model.addAttribute("userManageVO", userManageVO);
+		
+		if(StringUtils.isNotBlank(userManageVO.getAtchFileId())){
+            FileVO fileVO = new FileVO();
+            fileVO.setAtchFileId(userManageVO.getAtchFileId());
+            List<FileVO> fileList = fileMngService.selectFileInfs(fileVO);
+            model.addAttribute("fileList", fileList);
+        }
+		
+		//권한조회
+		AuthorManageVO authorManageVO = new AuthorManageVO();
+		authorManageVO.setFirstIndex(0);
+  		authorManageVO.setLastIndex(10);
+  		authorManageVO.setRecordCountPerPage(10);
+  		authorManageVO.setAuthorSet("01");
+  		authorManageVO.setSearchSortCnd("sort_num");
+  		authorManageVO.setSearchSortOrd("desc");
+  		authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO));
+  		model.addAttribute("authorList", authorManageVO.getAuthorManageList());	
+  		//initRsa(request);
+  		
+  		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+  		
+  		if(!"ROLE_ADMIN".equals(loginVO.getAuthority()) && !uniqId.equals(loginVO.getUniqId())) {
+  			/*return "/cmm/main/mainPage.do";*/
+  			RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/cmm/main/mainPage.do");
+			return redirectUrlMaker.getRedirectUrl();
+  		}
+  		
+  		if("ROLE_ADMIN".equals(loginVO.getAuthority())) {
+  			model.addAttribute("isAdmin", "Y");
+  		}
+  		
+  		if("ROLE_USER_MEMBER".equals(loginVO.getAuthority())) {
+  			model.addAttribute("isMember", "Y");
+  		}
+  		
+		return "kccadr/adjCourtCnctn/adjCourtUserDetail";
+	}
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtRprtDePop.do")
+    public String adjCourtRprtDePop(@ModelAttribute("AdjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
+
+		AdjCourtRprtMgrVO adjCourtRprtMgrVO = adjCourtCnctnService.findByRprtSeqFromAdrCourtRprtMgr(adjCourtCnctnVO);
+		model.addAttribute("adjCourtRprtMgrVO", adjCourtRprtMgrVO);
+		
+        return "kccadr/adjCourtCnctn/pop/adjCourtRprtDePop";
+    }
+	
+	@RequestMapping(value = "/kccadr/adjCourtCnctn/insertAdjCourtRprtDePopAjax.do")
+	public ResponseEntity<RestResponse> insertAdjCourtRprtDePopAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception {
+		
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId());
+		adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId());
+		
+		return ResponseEntity.ok().body(adjCourtCnctnService.insertAdjCourtRprtDePopAjax(adjCourtCnctnVO));
+	}
+	
+	
+	private List<Map<String, String>> deptNmArr(List<AdjCourtCnctnVO> list){
+		List<Map<String, String>> tmp1 = new ArrayList<Map<String, String>>();
+		if(list.stream().count() > 0) {
+			String[] deptNmArr = list.get(0).getDeptNmArr().split("\\|");
+			for(String tmp : deptNmArr) {
+				String[] tmpArr = null;
+				tmpArr = tmp.split("§");
+				Map<String, String> tmpMap = new HashMap<String, String>();
+				tmpMap.put("userNm", tmpArr[0]);
+				tmpMap.put("esntlId", tmpArr[1]);
+				
+				tmp1.add(tmpMap);
+			}
+		}
+		return tmp1;
+	}
+	
+	
 }

src/main/java/kcc/kccadr/adjCs/service/AdjCsService.java

@@ -0,0 +1,32 @@
+package kcc.kccadr.adjCs.service;
+
+import java.util.List;
+
+import egovframework.rte.fdl.cmmn.exception.FdlException;
+
+public interface AdjCsService {
+
+	List<AdjCsVO> selectDetailList(AdjCsVO adjCsVO);
+
+	AdjCsVO selectAdjCsDetail(AdjCsVO adjCsVO);
+
+	List<AdjCsVO> selectAdjCsList(AdjCsVO adjCsVO);
+
+	void updateAdjCs(AdjCsVO adjCsVO);
+
+	void insertAdjCs(AdjCsVO adjCsVO) throws FdlException;
+
+
+//	public int insertGlossary(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public List<AdjCsVO> selectGlossaryList(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public AdjCsVO selectGlossaryDetail(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public void updateGlossaryModify(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public void deleteGlossary(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public List<AdjCsVO> selectGlossaryListForWeb(AdjCsVO glossaryVO) throws Exception;
+	
+}

src/main/java/kcc/kccadr/adjCs/service/AdjCsVO.java

@@ -0,0 +1,93 @@
+package kcc.kccadr.adjCs.service;
+
+import java.io.Serializable;
+
+import kcc.com.cmm.ComDefaultVO;
+
+public class AdjCsVO extends ComDefaultVO implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+	
+	private String cnt;
+	private String csSeq;
+	private String csCategory;
+	private String csSubject;
+	private String csCn;
+	private String frstRegisterId;
+	private String frstRegistPnttm;
+	private String lastUpdusrId;
+	private String lastUpdtPnttm;
+	private String useYn;
+	private String searchKeywordSearch;
+	
+
+	
+	public String getCnt() {
+		return cnt;
+	}
+	public void setCnt(String cnt) {
+		this.cnt = cnt;
+	}
+	public String getCsSeq() {
+		return csSeq;
+	}
+	public void setCsSeq(String csSeq) {
+		this.csSeq = csSeq;
+	}
+	public String getCsCategory() {
+		return csCategory;
+	}
+	public void setCsCategory(String csCategory) {
+		this.csCategory = csCategory;
+	}
+	public String getCsSubject() {
+		return csSubject;
+	}
+	public void setCsSubject(String csSubject) {
+		this.csSubject = csSubject;
+	}
+	public String getCsCn() {
+		return csCn;
+	}
+	public void setCsCn(String csCn) {
+		this.csCn = csCn;
+	}
+	public String getFrstRegisterId() {
+		return frstRegisterId;
+	}
+	public void setFrstRegisterId(String frstRegisterId) {
+		this.frstRegisterId = frstRegisterId;
+	}
+	public String getFrstRegistPnttm() {
+		return frstRegistPnttm;
+	}
+	public void setFrstRegistPnttm(String frstRegistPnttm) {
+		this.frstRegistPnttm = frstRegistPnttm;
+	}
+	public String getLastUpdusrId() {
+		return lastUpdusrId;
+	}
+	public void setLastUpdusrId(String lastUpdusrId) {
+		this.lastUpdusrId = lastUpdusrId;
+	}
+	public String getLastUpdtPnttm() {
+		return lastUpdtPnttm;
+	}
+	public void setLastUpdtPnttm(String lastUpdtPnttm) {
+		this.lastUpdtPnttm = lastUpdtPnttm;
+	}
+	public String getUseYn() {
+		return useYn;
+	}
+	public void setUseYn(String useYn) {
+		this.useYn = useYn;
+	}
+	public String getSearchKeywordSearch() {
+		return searchKeywordSearch;
+	}
+	public void setSearchKeywordSearch(String searchKeywordSearch) {
+		this.searchKeywordSearch = searchKeywordSearch;
+	}
+	
+	
+}

src/main/java/kcc/kccadr/adjCs/service/impl/AdjCsDAO.java

@@ -0,0 +1,35 @@
+package kcc.kccadr.adjCs.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
+import kcc.kccadr.adjCs.service.AdjCsVO;
+
+@Repository("AdjCsDAO")
+public class AdjCsDAO extends EgovAbstractDAO{
+
+
+	public List<AdjCsVO> selectDetailList(AdjCsVO adjCsVO) {
+		return (List<AdjCsVO>) list("adjCsDAO.selectDetailList", adjCsVO);
+	}
+
+	public AdjCsVO selectAdjCsDetail(AdjCsVO adjCsVO) {
+		return (AdjCsVO) select("adjCsDAO.selectAdjCsDetail", adjCsVO);
+	}
+
+	public List<AdjCsVO> selectAdjCsList(AdjCsVO adjCsVO) {
+		return (List<AdjCsVO>) list("adjCsDAO.selectAdjCsList", adjCsVO);
+	}
+
+	public void updateAdjCs(AdjCsVO adjCsVO) {
+		update("adjCsDAO.updateAdjCs", adjCsVO);
+	}
+
+	public void insertAdjCs(AdjCsVO adjCsVO) {
+		insert("adjCsDAO.insertAdjCs", adjCsVO);
+	}
+
+	
+}

src/main/java/kcc/kccadr/adjCs/service/impl/AdjCsServiceImpl.java

@@ -0,0 +1,65 @@
+package kcc.kccadr.adjCs.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import egovframework.rte.fdl.cmmn.exception.FdlException;
+import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import kcc.kccadr.adjCs.service.AdjCsService;
+import kcc.kccadr.adjCs.service.AdjCsVO;
+
+@Service("AdjCsService")
+public class AdjCsServiceImpl  implements AdjCsService{
+
+	/** ID Generation */    
+	@Resource(name="adjCsIdgenService")
+	private EgovIdGnrService adjCsIdgenService;
+	
+	@Resource(name = "AdjCsDAO")
+	private AdjCsDAO adjCsDAO;
+
+
+	@Override
+	public List<AdjCsVO> selectDetailList(AdjCsVO adjCsVO) {
+		return adjCsDAO.selectDetailList(adjCsVO);
+	}
+
+
+	@Override
+	public AdjCsVO selectAdjCsDetail(AdjCsVO adjCsVO) {
+		
+		
+		AdjCsVO adjCsInfoVO = adjCsDAO.selectAdjCsDetail(adjCsVO);
+		if(adjCsInfoVO != null) {
+			
+//			adjCsInfoVO.setCsCn(adjCsInfoVO.getCsCn().replace("\r\n","<br>"));
+		}
+		
+		return adjCsInfoVO;
+	}
+
+
+	@Override
+	public List<AdjCsVO> selectAdjCsList(AdjCsVO adjCsVO) {
+		return adjCsDAO.selectAdjCsList(adjCsVO);
+	}
+
+
+	@Override
+	public void updateAdjCs(AdjCsVO adjCsVO) {
+		adjCsDAO.updateAdjCs(adjCsVO);
+	}
+
+
+	@Override
+	public void insertAdjCs(AdjCsVO adjCsVO) throws FdlException {
+
+		adjCsVO.setCsSeq(adjCsIdgenService.getNextStringId());		
+		
+		adjCsDAO.insertAdjCs(adjCsVO);
+		
+	}
+}  

src/main/java/kcc/kccadr/adjCs/web/AdjCsController.java

@@ -0,0 +1,201 @@
+package kcc.kccadr.adjCs.web;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.ComDefaultCodeVO;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.EgovCmmUseService;
+import kcc.kccadr.adjCs.service.AdjCsService;
+import kcc.kccadr.adjCs.service.AdjCsVO;
+import kcc.kccadr.glossary.service.GlossaryService;
+import kcc.let.uss.ion.sat.service.EgovSatManageService;
+
+@Controller
+public class AdjCsController {
+	
+	@Resource(name = "GlossaryService")
+	private GlossaryService glossaryService;
+	
+	@Resource(name = "AdjCsService")
+	private AdjCsService adjCsService;
+
+	@Resource(name = "EgovCmmUseService")
+	private EgovCmmUseService cmmUseService;  
+	
+	@Resource(name = "egovSatManageService")
+    private EgovSatManageService egovSatManageService;
+	
+	
+
+	/**
+	* @methodName    : selectTextSenseList
+	* @author        : JunHo Lee
+	* @date        : 2023.11.03
+	* @description : 용어해설 목록
+	* @param adjCsVO
+	* @param model
+	* @return
+	* @throws Exception
+	*/
+	@RequestMapping(value="/kccadr/adjCs/adjCsList.do")
+	public String glossaryList(@ModelAttribute("searchVO") AdjCsVO adjCsVO, ModelMap model) throws Exception{
+		
+		LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		if(user == null) {
+			
+			return "redirect:/uat/uia/EgovLoginUsr.do";
+			
+		}
+		
+		if(adjCsVO.getPageUnit() != 10) {
+			adjCsVO.setPageUnit(adjCsVO.getPageUnit());
+		}
+
+		if("".equals(adjCsVO.getSearchSortCnd())){
+			adjCsVO.setSearchSortCnd("frstRegistPnttm");
+			adjCsVO.setSearchSortOrd("desc");
+		}
+		
+		/** paging */
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(adjCsVO.getPageIndex());
+		paginationInfo.setRecordCountPerPage(adjCsVO.getPageUnit());
+		paginationInfo.setPageSize(adjCsVO.getPageSize());
+
+		adjCsVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		adjCsVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		adjCsVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		adjCsVO.setFrstRegisterId(user.getUniqId());
+		
+		model.addAttribute("paginationInfo", paginationInfo);
+//		List<AdjCsVO> list = glossaryService.selectGlossaryList(adjCsVO);
+		List<AdjCsVO> list = adjCsService.selectAdjCsList(adjCsVO);
+		if(list.size() > 0) {
+			paginationInfo.setTotalRecordCount(Integer.parseInt(list.get(0).getCnt()));
+		}
+		model.addAttribute("list", list);
+		return "kccadr/adjCs/adjCsList";
+	}
+	
+	@RequestMapping(value="/kccadr/adjCs/adjCsDetail.do")
+	public String gossaryDetail(@ModelAttribute("searchVO") AdjCsVO adjCsVO, ModelMap model) throws Exception{
+		
+		LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		if(user == null) {
+			
+			return "redirect:/uat/uia/EgovLoginUsr.do";
+			
+		}
+		
+		AdjCsVO detailVO = adjCsService.selectAdjCsDetail(adjCsVO);
+		
+		model.addAttribute("adjCsVO", detailVO);
+		
+//		if("N".equals(detailVO.getUseYn())) {
+//			return "redirect:/kccadr/glossary/glossaryList.do";
+//		}
+	    ComDefaultCodeVO vo = new ComDefaultCodeVO();
+	    vo.setCodeId("CC201");
+	    List<?>  cmmCode = cmmUseService.selectCmmCodeDetail(vo);
+  		model.addAttribute("cmmCode", cmmCode);
+		
+		return "kccadr/adjCs/adjCsDetail";
+	}
+	
+	@RequestMapping(value="/kccadr/adjCs/adjCsRegist.do")
+	public String adjCsRegist(@ModelAttribute("searchVO") AdjCsVO adjCsVO, ModelMap model) throws Exception{
+		
+		LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		if(user == null) {
+			
+			return "redirect:/uat/uia/EgovLoginUsr.do";
+			
+		}
+		
+
+	    ComDefaultCodeVO vo = new ComDefaultCodeVO();
+	    vo.setCodeId("CC201");
+	    List<?>  cmmCode = cmmUseService.selectCmmCodeDetail(vo);
+  		model.addAttribute("cmmCode", cmmCode);
+		
+//		if("N".equals(detailVO.getUseYn())) {
+//			return "redirect:/kccadr/glossary/glossaryList.do";
+//		}
+		
+		return "kccadr/adjCs/adjCsRegist";
+	}
+	
+
+	@RequestMapping(value="/kccadr/adjCs/adjCsModifyAjax.do")
+	public ModelAndView adjCsModifyAjax(AdjCsVO adjCsVO) throws Exception{
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		
+		if(user == null) {
+			modelAndView.addObject("result", "FAIL");
+			modelAndView.addObject("message", "다시 로그인 해주세요.");
+			return modelAndView;
+			
+		}
+		try {
+			System.out.println("adjCsVO :: "+ adjCsVO.getCsSeq());
+			adjCsVO.setLastUpdusrId(user.getUniqId());
+			adjCsService.updateAdjCs(adjCsVO);
+			
+			modelAndView.addObject("result", "SUCCESS");
+			modelAndView.addObject("message", "수정되었습니다.");
+		} catch (Exception e) {
+			modelAndView.addObject("result", "FAIL");
+			modelAndView.addObject("message", "수정에 실패했습니다.");
+		}
+		
+		return modelAndView;
+	}
+	
+	@RequestMapping(value="/kccadr/adjCs/adjCsRegistAjax.do")
+	public ModelAndView adjCsRegistAjax(AdjCsVO adjCsVO) throws Exception{
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		
+		if(user == null) {
+			modelAndView.addObject("result", "FAIL");
+			modelAndView.addObject("message", "다시 로그인 해주세요.");
+			return modelAndView;
+			
+		}
+		try {
+			adjCsVO.setFrstRegisterId(user.getUniqId());
+			adjCsService.insertAdjCs(adjCsVO);
+			
+			modelAndView.addObject("result", "SUCCESS");
+			modelAndView.addObject("message", "등록되었습니다.");
+		} catch (Exception e) {
+			modelAndView.addObject("result", "FAIL");
+			modelAndView.addObject("message", "등록에 실패했습니다.");
+		}
+		
+		return modelAndView;
+	}
+	
+}

src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java

@@ -123,5 +123,7 @@ public interface ApmService {
 	void updtRpplPopPastAjax(RpplVO rpplVO);
 
 	Map<String, Object> findByResPonDentDIdAndFileList(RpplVO rpplVO);
+	
+	String selectSbmtRejectApproval(String param) throws Exception;
 }
 

src/main/java/kcc/kccadr/adjPgrMgr/apm/service/RpplVO.java

@@ -13,6 +13,8 @@ public class RpplVO extends PgrCmmVO implements Serializable {
     private String agntYn; /* 조정기일대리여부 */
     private String rpplUsrTy; /* 관리인분류 */
     private String rpplUsrTyTx; /* 관리인분류 */
+    private String rpplUsrDiv; /* 신청인구분 */
+    private String rpplUsrDivTx; /* 신청인구분 */
     private String adrOlYn; /* 전자조정진행여부 */
     private String rpplId; /* 조정사건관리인ID */
     private String rpplNm; /* 이름_대표자 */
@@ -87,6 +89,19 @@ public class RpplVO extends PgrCmmVO implements Serializable {
     public void setRpplUsrTyTx(String rpplUsrTyTx) {
         this.rpplUsrTyTx = rpplUsrTyTx;
     }
+    
+    public String getRpplUsrDiv() {
+		return rpplUsrDiv;
+	}
+	public void setRpplUsrDiv(String rpplUsrDiv) {
+		this.rpplUsrDiv = rpplUsrDiv;
+	}
+	public String getRpplUsrDivTx() {
+		return rpplUsrDivTx;
+	}
+	public void setRpplUsrDivTx(String rpplUsrDivTx) {
+		this.rpplUsrDivTx = rpplUsrDivTx;
+	}
 	public String getAdrOlYn() {
         return adrOlYn;
     }

src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java

@@ -232,4 +232,8 @@ public class ApmDAO extends EgovAbstractDAO {
     	return (RpplVO) select("Apm.findByResPonDentDId", rpplVO);
 	}
 	
+	public String selectSbmtRejectApproval(String param) throws Exception {
+		return (String) select("apmDAO.selectSbmtRejectApproval", param);
+	}
+
 }

src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java

@@ -640,6 +640,13 @@ public class ApmServiceImpl implements ApmService {
 	}
 	
 	
+	
+	
+	@Override
+	public String selectSbmtRejectApproval(String param) throws Exception {
+		return apmDAO.selectSbmtRejectApproval(param);
+	}
+
 	/** 
 	 * @methodName	: rpplDataEncrypt 
 	 * @author		: 이호영

src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java

@@ -44,6 +44,7 @@ import kcc.com.cmm.spring.data.util.ExcelUtil;
 import kcc.com.cmm.util.IpUtil;
 import kcc.com.cmm.util.SequenceUtil;
 import kcc.com.cmm.util.StringUtil;
+import kcc.com.cmm.util.StringUtil2;
 import kcc.com.utl.fcc.service.EgovStringUtil;
 import kcc.com.utl.user.service.CheckAdrProcessUtil;
 import kcc.com.utl.user.service.CheckFileUtil;
@@ -212,6 +213,41 @@ public class ApmController {
 	@Resource(name = "SMSOracleService")
 	private SMSOracleService sMSOracleService;
     
+	/*
+ 	//개발, local oz 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPath']}")
+	private String ozDevPath;
+	*/
+ 	
+ 	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
+ 	
     /**
      * 조정진행목록 목록
      *
@@ -221,7 +257,10 @@ public class ApmController {
      * @throws Exception
      */
     @RequestMapping(value = "apmList.do")
-    public String apmList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, ModelMap model) throws Exception {
+    public String apmList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, HttpServletRequest request, ModelMap model) throws Exception {
+        
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+    	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
     	
         /*
          * if(apmVO.getPageUnit() != 10) { apmVO.setPageUnit(apmVO.getPageUnit()); }
@@ -231,9 +270,20 @@ public class ApmController {
             cmmVO.setSearchSortOrd("DESC");
         }
         
+        String beforeUrl = request.getHeader("Referer");
+        
+        if(!beforeUrl.contains("apm")) {
+        	cmmVO.setSearchMonth("3");
+        }
+        
         if (StringUtil.isEmpty(cmmVO.getSearchStartDt())) { // 조회일시가 null인경우
             Date today = new Date();
-            cmmVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, -1), "yyyyMMdd"));
+            //조정진행목록 보이는 화면 수정 요청_230524
+            int month = -1;
+            if(StringUtil.isNotEmpty(cmmVO.getSearchMonth())) {
+            	month = -(Integer.valueOf(cmmVO.getSearchMonth()));
+            }
+            cmmVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, month), "yyyyMMdd"));
             cmmVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd"));
             
         }
@@ -271,6 +321,20 @@ public class ApmController {
         	cmmVO.setCkStsList(tmpList.toArray(new String[tmpList.size()]));
         }
         
+        //담당사건만 보기 여부 - 기본 : 전체 조회 / ROLE_ADR_ADMIN 권한에 조정조사관 or 조정팀장은 기본 : 담당사건만 조회
+        if(StringUtil2.isEmpty(cmmVO.getSearchLoginId())) {
+        	//23.8.7 요청 사항에 따라 주석 처리
+//        	if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
+//            	cmmVO.setSearchEachAdrAdminYn("Y");
+//            	cmmVO.setSearchLoginId(userId);
+//            }
+        }else {
+        	if(!"all".equals(cmmVO.getSearchLoginId())){
+        		cmmVO.setSearchEachAdrAdminYn("Y");
+        	}
+        }
+//        cmmVO.setSearchEachAdrAdminYn("Y");
+        
         /** paging */
         PaginationInfo paginationInfo = new PaginationInfo();
         paginationInfo.setCurrentPageNo(cmmVO.getPageIndex());
@@ -282,14 +346,16 @@ public class ApmController {
         cmmVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
         
         cmmVO.setReqOlCdPst("2");
-        
-        paginationInfo.setTotalRecordCount(cmmService.selectPgrCmmListCnt(cmmVO));
+        Map<String, Integer> totalRecordCountMap = cmmService.selectPgrCmmListCntForOnlineOffline(cmmVO);
+        paginationInfo.setTotalRecordCount(totalRecordCountMap.get("cnt"));
+        model.addAttribute("cntOnline",totalRecordCountMap.get("cntOnline"));
+        model.addAttribute("cntOffline",totalRecordCountMap.get("cntOffline"));
         model.addAttribute("paginationInfo", paginationInfo);
 
         // reqOlCdPst 값이 있으면 과거사건 조회하지 않음
         model.addAttribute("list", cmmService.selectPgrCmmList(cmmVO));
         
-        
+        model.addAttribute("cmmVO", cmmVO);
         
         if (!StringUtil.isEmpty(cmmVO.getSearchCondition()) && "20".equals(cmmVO.getSearchCondition())) { // 검색조건 신청인
             
@@ -298,6 +364,8 @@ public class ApmController {
             }
         }
         
+        //조정조사관 리스트
+        model.addAttribute("adrAdminList", cmmService.selectPgrCmmAdrAdminList());
         
         return "/kccadr/adjPgrMgr/apm/apmList";
     }
@@ -316,14 +384,17 @@ public class ApmController {
     public ModelAndView excel(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, ModelMap model) throws Exception {
         
         cmmVO.setExcelYn("Y");
-        List list = cmmService.selectPgrCmmList(cmmVO);
+        List list = cmmService.selectPgrCmmListForExcel(cmmVO);
         
         
         // 세팅값
         String title = "조정진행목록리스트";
-        int[] width = {4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000}; // 너비
-        String[] header = {"신청일자", "구분", "조정번호", "신청인", "신청내용", "피신청인", "조정부", "조사관", "기일", "진행차수", "조정상태"}; // 헤더에 들어갈 이름
-        String[] order = {"SbmtDeDay", "ReqOlCdTx", "AdrNo", "AppliCantNm", "CcTyTx", "ResPonDentNm", "MemDeptNm", "AdrAdmNm", "AppDeDay", "AdrSn", "StatCdTx"}; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용)
+        int[] width = {4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000}; // 너비
+        //String[] header = {"신청일자", "구분", "조정번호", "신청인", "신청내용", "피신청인", "조정부", "조사관", "기일", "진행차수", "조정상태"}; // 헤더에 들어갈 이름
+        //String[] order = {"SbmtDeDay", "ReqOlCdTx", "AdrNo", "AppliCantNm", "CcTyTx", "ResPonDentNm", "MemDeptNm", "AdrAdmNm", "AppDeDay", "AdrSn", "StatCdTx"}; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용)
+        
+        String[] header = {"신청일자", "구분", "조정번호", "신청인", "연락처", "이메일", "수신여부", "대리인", "대리인연락처", "대리인이메일", "대리인수신여부", "신청내용", "피신청인", "조정부", "조사관", "기일", "진행차수", "조정상태", "성립여부"}; // 헤더에 들어갈 이름
+        String[] order = {"SbmtDeDay", "ReqOlCdTx", "AdrNo", "AppliCantNm", "AppliCantPhone", "AppliCantEmail", "AppliCantSendYn", "AppliCantNm2", "AppliCantPhone2", "AppliCantEmail2", "AppliCantSendYn2", "CcTyTx", "ResPonDentNm", "MemDeptNm", "AdrAdmNm", "AppDeDay", "AdrSn", "StatCdTx", "FinalStatCdTxt"}; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용)
         
         // 호출
         SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(list, header, order, width, title);
@@ -355,8 +426,15 @@ public class ApmController {
     		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
         	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
         	
+        	//문자발송 팝업에 전달할 데이터
+    		model.addAttribute("adminPhone", loginVO.getPhone());
+        	
             // 조정사건일반
         	PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
+        	
+        	info.setSearchMonth(cmmVO.getSearchMonth());
+        	info.setSearchEachAdrAdminYn(cmmVO.getSearchEachAdrAdminYn());
+        	
             model.addAttribute("info", info);
             
             
@@ -499,6 +577,27 @@ public class ApmController {
             //진행상태가 결재요청상태 일때 결재결재선 중 결재 진행중인 사람 불러오기
             model.addAttribute("sbmtStatus",apmService.selectSbmtIngStatus(cmmVO.getAdrSeq()));
             
+            //결재 반려 시 결재 상세에서 반려한 사람 표시
+            String result = apmService.selectSbmtRejectApproval(cmmVO.getAdrSeq());
+            String userNm = "";
+            
+            if(result != null) {
+            	/*
+            	 * splitResult[0] -> uniqueId
+            	 * splitResult[1] -> userNm
+            	 * splitResult[2] -> userTy
+            	 * */
+            	String[] splitResult = result.split("§");
+            	userNm = splitResult[1];
+            	if("mem".equals(splitResult[2])) {
+            		userNm = egovCryptoUtil.decrypt(splitResult[1]) + " 조정부장";
+            	}else {
+            		userNm = userNm + " 관리자";
+            	}
+            }
+            
+            model.addAttribute("rejectApproval", userNm);
+            
             /*//adr_mgr_detail 첨부파일 불러오기
     		FileVO fileVO = new FileVO();
     		
@@ -524,6 +623,20 @@ public class ApmController {
     		List<AdjReqMgrVO> person  = adjReqMgrService.selectAdjstReqMgrPersonList(adjReqMgrVO);
     		decryptInfomation(person ,null);
     		model.addAttribute("person", person);
+    		
+    		//처리일자
+    		PgrCmmVO adrEndDeDayVO = new PgrCmmVO();
+    		adrEndDeDayVO.setAdrSeq(cmmVO.getAdrSeq());
+    		
+    		PgrCmmVO PgrCmmVO = new PgrCmmVO();
+    		PgrCmmVO = cmmService.selectAdrEndDeDay(adrEndDeDayVO);
+    		String adrEndDeDay = "";
+    		if(PgrCmmVO != null) {
+    			adrEndDeDay = PgrCmmVO.getAdrEndDeDay();
+    		}
+    		
+    		model.addAttribute("adrEndDeDay", adrEndDeDay);
+    		
     	}catch(Exception ex) {
     		ex.printStackTrace();
     	}
@@ -2061,7 +2174,6 @@ public class ApmController {
     			, ""
     			);
     	
-    	System.out.println("adrSn : "+ adrSn);
     	
     	apmVO.setAdrSn(adrSn);
     	
@@ -2475,12 +2587,34 @@ public class ApmController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, corReqVO.getAdrSeq()
+    			, "admin/adrJjosuReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "A250.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);
+    	
+    	/*
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrCorReqReport.ozr";
         	String savePath = corReqVO.getAdrSeq() + "/ozFile/adrCorReqReport.pdf";
+        	savePath = ozDevPath	+	corReqVO.getAdrSeq() + "/ozFile/adrCorReqReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -2489,15 +2623,14 @@ public class ApmController {
     	//실서버
     	else {
     		String ozrFilePath = "/admin/adrCorReqReport.ozr";
-        	/*String savePath = corReqVO.getAdrSeq() + "/ozFile/adrCorReqReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + corReqVO.getAdrSeq() + "\\ozFile\\adrCorReqReport.pdf";;
+        	*String savePath = corReqVO.getAdrSeq() + "/ozFile/adrCorReqReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + corReqVO.getAdrSeq() + "\\ozFile\\adrCorReqReport.pdf";;
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
     	}
-    	
-    	
+    	*/
     	
     	
     	modelAndView.addObject("result", "success");
@@ -2505,6 +2638,85 @@ public class ApmController {
         return modelAndView;
     }
     
+    
+    @SuppressWarnings("unchecked")
+	@RequestMapping(value = "corReportExportA250Ajax.do")
+    public ModelAndView crtReportExportA250Ajax(
+    		@RequestBody CorReqVO corReqVO
+    		, ModelMap model
+    		, HttpServletRequest req) throws Exception {
+
+    	ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+        
+        JSONArray jsApmCorrInfo = new JSONArray();		//경정신청서 정보
+    	
+    	
+    	List<CorReqVO> list = corReqService.selectCorReqDetail(corReqVO);
+    	
+    	for(CorReqVO result : list) {
+    		
+    		JSONObject jsTempData = new JSONObject();
+        	
+        	jsTempData = parseJsonData(result);
+        	
+        	jsApmCorrInfo.add(jsTempData);
+    		
+    	}
+    	
+    	JSONObject jsObjData = new JSONObject();
+    	
+    	jsObjData.put("jsApmCorrInfo", jsApmCorrInfo);
+    	
+    	String repStr = StringUtil.getUrlString(jsObjData.toString());
+    	
+    	//json 데이터 특수문자 치환_220215_이준호
+    	JsonStringEncoder encoder = JsonStringEncoder.getInstance();
+    	char[] escapedJson = encoder.quoteAsString(repStr);
+    	System.out.println(escapedJson); // {\"type\":\"BIG\"}
+    	String p_json;
+    	p_json = new String(escapedJson);
+    	p_json = p_json.replace("\\\\\\\\r\\\\\\\\n", "\\\\r\\\\n").replace("\'", "\\'");
+    	
+    	model.addAttribute("jsObjData", p_json);
+    	
+    	//오즈리포트 서버별 주소 셋팅해주기
+    	String serverName = req.getServerName();
+    	String ozServerNm = IpUtil.getOzServerName(serverName);
+    	model.addAttribute("ozServerNm", ozServerNm);
+    	
+    	/*
+    	 * 2022.01.06 우영두 추가
+    	 * 오즈 리포트 File Export 처리
+    	 * 
+    	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, corReqVO.getAdrSeq()
+    			, "admin/adrJjosuReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "A250.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);
+    
+    	
+    	modelAndView.addObject("status", "OK");
+
+        return modelAndView;
+    }
+    
+    
     /**
      * 경정신청서 상세 TODO daenge 경정신청서 오즈리포팅 처리
      *
@@ -2575,31 +2787,31 @@ public class ApmController {
 		String applicantNm = corReqVO.getAppliCantNm();		//신청인 이름		
 		String resPonDentNm = corReqVO.getRpplNm();			//피신청인
 		 
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!rpplChgCn1.equals("")) {
+		if(StringUtil.isNotEmpty(rpplChgCn1)) {
 			
 			oj.put("rpplChgCn1", rpplChgCn1);
 			
 		}
 		
-		if(!rpplChgCn2.equals("")) {
+		if(StringUtil.isNotEmpty(rpplChgCn2)) {
 			
 			oj.put("rpplChgCn2", rpplChgCn2);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!resPonDentNm.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			

src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -101,6 +102,41 @@ public class ArmController {
     public void setIslocal(String path) { islocal = path; }
     
 
+    /*
+ 	//개발, local oz 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPath']}")
+	private String ozDevPath;
+	*/
+ 	
+ 	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
+ 	
     /**
      * 조정권고안 등록 Form TODO daenge 조정권고안 등록
      *
@@ -375,6 +411,11 @@ public class ArmController {
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrKkaAgrReport.ozr";
         	String savePath = closeVO.getAdrSeq() + "/adrKkaAgrReport.pdf";
+        	if(req.getServerName().contains("localhost")) {
+        		savePath = ozDevPdfSavePath	+	closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";
+        	}else {
+        		savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\"	+	closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
+        	}
         	
         	String jsonData = jsObjData.toJSONString();
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -383,7 +424,7 @@ public class ArmController {
     	//실서버
     	else{
     		String ozrFilePath = "/admin/adrKkaAgrReport.ozr";
-    		String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
+    		String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
     		
     		String jsonData = jsObjData.toJSONString();
     		jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -460,12 +501,34 @@ public class ArmController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrKkaAgrReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "303050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);  
+    	
+    	/*
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrKkaAgrReport.ozr";
         	String savePath = closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";
+        	savePath = ozDevPath	+	closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";
         	
         	String jsonData = jsObjData.toJSONString();
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -474,13 +537,14 @@ public class ArmController {
     	//실서버
     	else{
     		String ozrFilePath = "/admin/adrKkaAgrReport.ozr";
-        	/*String savePath = closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
+        	*String savePath = closeVO.getAdrSeq() + "/ozFile/adrKkaAgrReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrKkaAgrReport.pdf";
         	
         	String jsonData = jsObjData.toJSONString();
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
     	}
+    	*/
     	
     	
     	
@@ -490,6 +554,82 @@ public class ArmController {
     }
 
     
+    @SuppressWarnings("unchecked")
+	@RequestMapping(value = "armOzExport303050Ajax.do")
+    public ModelAndView armOzExport303050Ajax(
+    		@RequestBody CloseVO closeVO
+    		, ModelMap model
+    		, HttpServletRequest req
+    		) throws Exception {
+
+    	ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+    	
+    	JSONObject jsArmInfo = new JSONObject();		//조정권고안 정보
+    	
+    	CloseVO result = cmmService.selectCloseDoc(closeVO);
+    	
+    	if (result==null) {
+    		modelAndView.addObject("status", "SKIP");
+    		return modelAndView;
+    	}
+    	
+    	jsArmInfo = parseJsonData(result);
+    	
+    	
+    	JSONObject jsObjData = new JSONObject();
+    	
+    	jsObjData.put("jsArmInfo", jsArmInfo);
+    	
+    	String repStr = StringUtil.getUrlString(jsObjData.toString());
+    	
+    	//json 데이터 특수문자 치환_220215_이준호
+    	JsonStringEncoder encoder = JsonStringEncoder.getInstance();
+    	char[] escapedJson = encoder.quoteAsString(repStr);
+    	System.out.println(escapedJson); // {\"type\":\"BIG\"}
+    	String p_json;
+    	p_json = new String(escapedJson);
+    	p_json = p_json.replace("\\\\\\\\r\\\\\\\\n", "\\\\r\\\\n").replace("\'", "\\'");
+    	
+    	model.addAttribute("jsObjData", p_json);
+    	
+    	//오즈리포트 서버별 주소 셋팅해주기
+    	String serverName = req.getServerName();
+    	String ozServerNm = IpUtil.getOzServerName(serverName);
+    	model.addAttribute("ozServerNm", ozServerNm);
+    	
+    	/*
+    	 * 2022.01.06 우영두 추가
+    	 * 오즈 리포트 File Export 처리
+    	 * 
+    	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrKkaAgrReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "303050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);  
+    	
+    	
+    	modelAndView.addObject("status", "OK");
+    	
+        return modelAndView;
+    }    
+    
+
     /**
      * 등록자, 수정자 정보 세팅
      *
@@ -537,80 +677,81 @@ public class ArmController {
 		List<PgrCmmVO> resultStampInfo = cmmService.selectAtchFileIdInfo(closeVO);
 		
 		String atchFileId = "";
-		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 				
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
 				
 			}
+		}
  		
-		if(!adrSeq.equals("")) {
+		if(StringUtil.isNotEmpty(adrSeq)) {
 			
 			oj.put("adrSeq", adrSeq);
 			
 		}
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!adrSn.equals("")) {
+		if(StringUtil.isNotEmpty(adrSn)) {
 			
 			oj.put("adrSn", adrSn);
 			
 		}
 		
-		if(!cctyTx.equals("")) {
+		if(StringUtil.isNotEmpty(cctyTx)) {
 			
 			oj.put("cctyTx", cctyTx);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!closeCn1.equals("")) {
+		if(StringUtil.isNotEmpty(closeCn1)) {
 			
 			oj.put("closeCn1", closeCn1);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!resPonDentNm.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			
 		}
 		
-		if(!appDeDay.equals("")) {
+		if(StringUtil.isNotEmpty(appDeDay)) {
 			
 			oj.put("appDeDay", appDeDay);
 			
 		}
 		
-		if(!rplyEndDeDay.equals("")) {
+		if(StringUtil.isNotEmpty(rplyEndDeDay)) {
 			
 			oj.put("rplyEndDeDay", rplyEndDeDay);
 			
 		}
 		
-		if(!atchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(atchFileId)) {
 			
 			String domain = "";
 			

src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java

@@ -113,6 +113,10 @@ public class ConciliatorManageVO extends ComDefaultVO  {
     private String userNm; // 결재자명
     private String procCnd; // 처리구분 I, U
     
+    private String memTeam; // 조정위원 소속
+    
+    private String searchCondition2;
+
 
     public String[] getMemSeqArr() {
     	String[]returnArr; 
@@ -378,6 +382,24 @@ public class ConciliatorManageVO extends ComDefaultVO  {
 		this.procCnd = procCnd;
 	}
 
+	public String getMemTeam() {
+		return memTeam;
+	}
+
+	public void setMemTeam(String memTeam) {
+		this.memTeam = memTeam;
+	}
+
+	public String getSearchCondition2() {
+		return searchCondition2;
+	}
+
+	public void setSearchCondition2(String searchCondition2) {
+		this.searchCondition2 = searchCondition2;
+	}
+	
+	
+	
 	
 
     

src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java

@@ -1,5 +1,7 @@
 package kcc.kccadr.adjPgrMgr.cclt.web;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -7,6 +9,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -17,6 +21,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.mysql.fabric.xmlrpc.base.Array;
+
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.EgovMessageSource;
@@ -26,6 +32,7 @@ import kcc.com.cmm.service.EgovFileMngService;
 import kcc.com.cmm.service.EgovFileMngUtil;
 import kcc.com.cmm.service.FileVO;
 import kcc.com.cmm.util.RedirectUrlMaker;
+import kcc.com.cmm.util.StringUtil;
 import kcc.kccadr.adjPgrMgr.adjDept.service.AdjustDeptManageService;
 import kcc.kccadr.adjPgrMgr.adjDept.service.AdjustDeptManageVO;
 import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageService;
@@ -84,10 +91,25 @@ public class ConciliatorManageController {
             conciliatorManageVO.setSearchSortOrd("desc");
         }
 
-        if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword())){
+        if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword()) && !"3".equals(conciliatorManageVO.getSearchCondition())){
             conciliatorManageVO.setSearchKeyword(egovCryptoUtil.encrypt(conciliatorManageVO.getSearchKeyword()));
         }
         
+        if (StringUtil.isEmpty(conciliatorManageVO.getSearchCondition2())) { // 위원임기가 null인경우
+        	conciliatorManageVO.setSearchCondition2("2");
+        }
+
+        if (StringUtil.isEmpty(conciliatorManageVO.getSearchStartDt())) { // 조회일시가 null인경우
+        	Date today = new Date();
+        	//조정진행목록 보이는 화면 수정 요청_230524
+        	int month = -1;
+        	if(StringUtil.isNotEmpty(conciliatorManageVO.getSearchMonth())) {
+        		month = -(Integer.valueOf(conciliatorManageVO.getSearchMonth()));
+        	}
+        	conciliatorManageVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, month), "yyyyMMdd"));
+        	conciliatorManageVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd"));
+        }
+        
         /** paging */
         PaginationInfo paginationInfo = new PaginationInfo();
         paginationInfo.setCurrentPageNo(conciliatorManageVO.getPageIndex());
@@ -101,12 +123,15 @@ public class ConciliatorManageController {
         model.addAttribute("paginationInfo", paginationInfo);
         List<ConciliatorManageVO> list =  conciliatorManageService.selectConciliatorManageList(conciliatorManageVO);
         this.decryptInfomation(list , null);
+        
         model.addAttribute("list", list);
 
         if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword())){
             conciliatorManageVO.setSearchKeyword(egovCryptoUtil.decrypt(conciliatorManageVO.getSearchKeyword()));
         }
         
+        
+
         return "kccadr/adjPgrMgr/cclt/ConciliatorManageList";
     }
 
@@ -130,8 +155,20 @@ public class ConciliatorManageController {
             model.addAttribute("fileList", fileList);
         }
         this.decryptInfomation(null , info);
+        
+        String memTeam = info.getMemTeam();
+        String[] memTeamArray;
+        if(StringUtil.isNotEmpty(memTeam)) {
+        	memTeamArray = memTeam.split("§");
+        }else {
+        	memTeamArray = new String[]{""};
+        }
+        
         model.addAttribute("model", info);
         model.addAttribute("list", conciliatorManageService.selectConciliatorDeptList(conciliatorManageVO));
+        
+        model.addAttribute("memTeamArray", memTeamArray);
+        
         return "kccadr/adjPgrMgr/cclt/ConciliatorManageDetail";
     }
 

src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -68,6 +69,42 @@ public class CfrmController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
     
+    /*
+ 	//개발, local oz 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPath']}")
+	private String ozDevPath;
+	*/
+ 	
+ 	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
+ 	
+ 	
     /**
      * 확정증명원 등록 Form TODO daenge 확정증명원 등록
      *
@@ -275,6 +312,11 @@ public class CfrmController {
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrHjwReport.ozr";
         	String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";
+        	if(req.getServerName().contains("localhost")) {
+        		savePath = ozDevPdfSavePath	+	cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";
+        	}else {
+        		savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\"	+	closeVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
+        	}
         	
         	ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req);
     	}
@@ -282,7 +324,7 @@ public class CfrmController {
     	else{
     		String ozrFilePath = "/admin/adrHjwReport.ozr";
         	/*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
         	
         	ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req);
     	}
@@ -347,24 +389,47 @@ public class CfrmController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrHjwReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "A500.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);    	
+    	
+    	/*
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrHjwReport.ozr";
         	String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";
+        	savePath = ozDevPath	+	cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";
         	
         	ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req);
     	}
     	//실서버
     	else{
     		String ozrFilePath = "/admin/adrHjwReport.ozr";
-        	/*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
+        	*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrHjwReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrHjwReport.pdf";
         	
         	
         	ozSchd.ozschdFileExport(ozrFilePath, repStr, savePath, req);
     	}
+    	*/    
     	
      	modelAndView.addObject("result", "success");
     	
@@ -372,6 +437,97 @@ public class CfrmController {
 
     }
     
+    @SuppressWarnings("unchecked")
+	@RequestMapping(value = "cfrmOzExportA500Ajax.do")
+    public ModelAndView cfrmOzExportA500Ajax(
+    		@RequestBody PgrCmmVO cmmVO
+    		//, DrtVO drtVO
+    		, ModelMap model
+    		, HttpServletRequest req
+    		) throws Exception {
+
+    	ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+    	
+    	JSONObject jsCfrmInfo = new JSONObject();	//전체 정보
+    	
+        PgrCmmVO result = cmmService.selectPgrCmm(cmmVO);	//조정사건 정보
+
+        
+        //종결문서에서 확정증명서 불러오기
+        CloseVO closeVO = new CloseVO();
+        closeVO.setAdrSeq(cmmVO.getAdrSeq());
+        closeVO.setAdrSn(cmmVO.getAdrSn());
+        closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80);
+        CloseVO resultDoc = cmmService.selectCloseDoc(closeVO);
+
+        
+        System.out.println("resultDoc");
+        System.out.println(resultDoc);
+        
+    	if (resultDoc==null) {
+    		modelAndView.addObject("status", "SKIP");
+    		return modelAndView;
+    	}
+        
+        
+        //확정증명원 Json 만들기
+        jsCfrmInfo = parseJsonData(result, resultDoc);
+
+    	JSONObject jsObjData = new JSONObject();
+    	
+    	jsObjData.put("jsCfrmInfo", jsCfrmInfo);
+    	
+    	String repStr = jsObjData.toString();
+    	repStr = StringUtil.getUrlString(jsObjData.toString());
+    	
+    	//json 데이터 특수문자 치환_220215_이준호
+    	JsonStringEncoder encoder = JsonStringEncoder.getInstance();
+    	char[] escapedJson = encoder.quoteAsString(repStr);
+    	System.out.println(escapedJson); // {\"type\":\"BIG\"}
+    	String p_json;
+    	p_json = new String(escapedJson);
+    	p_json = p_json.replace("\\\\\\\\r\\\\\\\\n", "\\\\r\\\\n").replace("\'", "\\'");
+    	
+    	model.addAttribute("jsObjData", p_json);
+    	
+    	//오즈리포트 서버별 주소 셋팅해주기
+    	String serverName = req.getServerName();
+    	String ozServerNm = IpUtil.getOzServerName(serverName);
+    	model.addAttribute("ozServerNm", ozServerNm);
+    	
+    	/*
+    	 * 2022.01.06 우영두 추가
+    	 * 오즈 리포트 File Export 처리
+    	 * 
+    	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrHjwReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "A500.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);    	
+    	 
+    	
+     	modelAndView.addObject("status", "OK");
+    	
+        return modelAndView;
+
+    }
+    
     /**
      * 오즈 리포트 데이터 Json 생성하기
      *
@@ -407,12 +563,13 @@ public class CfrmController {
 		cmmVO.setMemGrade("01");
 		List<PgrCmmVO> resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO);
 		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 				
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
 				
 			}
-		
+		}
 		//조정조사관 직인 이미지 불러오기
 		PgrCmmVO resultAdmStampInfo = cmmService.selectAdmAtchFileIdInfo(cmmVO);
 		
@@ -461,49 +618,49 @@ public class CfrmController {
 			
 		}
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!adrAdmNm.equals("")) {
+		if(StringUtil.isNotEmpty(adrAdmNm)) {
 			
 			oj.put("adrAdmNm", adrAdmNm);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!resPonDentNm.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			
 		}
 		
-		/*if(!resPonDentNmEtc.equals("")) {
+		/*if(StringUtil.isNotEmpty(resPonDentNmEtc)) {
 			
 			oj.put("resPonDentNmEtc", resPonDentNmEtc);
 			
 		}*/
 		
-		if(!rplyEndDeDay.equals("")) {
+		if(StringUtil.isNotEmpty(rplyEndDeDay)) {
 			
 			oj.put("rplyEndDeDay", rplyEndDeDay);
 			
@@ -514,7 +671,7 @@ public class CfrmController {
 			oj.put("recDeDay", recDeDay);
 			
 		}		
-		if(!closeCn1.equals("")) {
+		if(StringUtil.isNotEmpty(closeCn1)) {
 			
 			oj.put("closeCn1", closeCn1);
 			

src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java

@@ -36,7 +36,6 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService;
 import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
 import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService;
 import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO;
-import kcc.kccadr.cmm.KccadrConstants;
 import kcc.kccadr.kccadrCom.service.KccadrCommonService;
 import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
 import kcc.kccadr.ozSchd.web.OzSchdExportUtil;
@@ -101,6 +100,14 @@ public class ChdController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
 
+// 	//개발, local oz 저장 경로
+// 	@Value("#{globalSettings['Globals.oz.devPath']}")
+//	private String ozDevPath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
     /**
      * 기일변경통지 상세 TODO daenge 기일변경통지 상세
      *
@@ -428,6 +435,12 @@ public class ChdController {
     		String ozrFilePath = "/admin/adrAppSlctReport.ozr";
         	String savePath = cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf";
         	
+        	if(req.getServerName().contains("localhost")) {
+        		savePath = ozDevPdfSavePath	+	cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";
+        	}else {
+        		savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\"	+	cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf";
+        	}
+        	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
@@ -436,7 +449,7 @@ public class ChdController {
     	else{
     		String ozrFilePath = "/admin/adrAppSlctReport.ozr";
         	/*String savePath = cmmVO.getAdrSeq() + "/adrAppSlctReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf";
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -506,11 +519,13 @@ public class ChdController {
 		
 		String atchFileId = "";
 		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 				
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
 				
 			}
+		}
  		
 		/*if(!adrSeq.equals("")) {
 			
@@ -518,73 +533,73 @@ public class ChdController {
 			
 		}*/
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!adrSn.equals("")) {
+		if(StringUtil.isNotEmpty(adrSn)) {
 			
 			oj.put("adrSn", adrSn);
 			
 		}
 		
-		if(!cctyTx.equals("")) {
+		if(StringUtil.isNotEmpty(cctyTx)) {
 			
 			oj.put("cctyTx", cctyTx);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!adrAdmNm.equals("")) {
+		if(StringUtil.isNotEmpty(adrAdmNm)) {
 			
 			oj.put("adrAdmNm", adrAdmNm);
 			
 		}
 		
-		if(!adrAdmOffmTel.equals("")) {
+		if(StringUtil.isNotEmpty(adrAdmOffmTel)) {
 			
 			oj.put("adrAdmOffmTel", adrAdmOffmTel);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!resPonDentNm.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			
 		}
 		
-		if(!resPonDentNmEtc.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNmEtc)) {
 			
 			oj.put("resPonDentNmEtc", resPonDentNmEtc);
 			
 		}
 		
-		/*if(!appDeDay.equals("")) {
+		/*if(StringUtil.isNotEmpty(appDeDay)) {
 			
 			oj.put("appDeDay", appDeDay);
 			
 		}*/
 		
-		if(!appDeDate.equals("")) {
+		if(StringUtil.isNotEmpty(appDeDate)) {
 			
 			oj.put("appDeDate", appDeDate);
 			
@@ -602,7 +617,7 @@ public class ChdController {
 			
 		}
 		
-		if(!atchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(atchFileId)) {
 			
 			String domain = "";
 			

src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java

@@ -1,8 +1,10 @@
 package kcc.kccadr.adjPgrMgr.cmm.service;
 
 import java.util.List;
+import java.util.Map;
 
 import kcc.kccadr.adjPgrMgr.arm.service.CmntVO;
+import kcc.let.uss.umt.service.UserManageVO;
 
 public interface PgrCmmService {
 
@@ -13,6 +15,8 @@ public interface PgrCmmService {
 
     int selectPgrCmmListCnt(PgrCmmVO pgrCmmVO) throws Exception;
     
+    Map<String, Integer> selectPgrCmmListCntForOnlineOffline(PgrCmmVO pgrCmmVO) throws Exception;
+
     PgrCmmVO selectPgrCmm(PgrCmmVO pgrCmmVO) throws Exception;
     
     PgrCmmVO selectPgrCmm4DntDetail(PgrCmmVO pgrCmmVO) throws Exception;
@@ -70,5 +74,10 @@ public interface PgrCmmService {
     //배당전 취하종결 조정조사관 등록
     int updateEntBeforeDtbAdrAdminReg(PgrCmmVO pgrCmmVO) throws Exception;
     
-}
+    public List<PgrCmmVO> selectPgrCmmListForExcel(PgrCmmVO pgrCmmVO) throws Exception;
     
+    List<UserManageVO> selectPgrCmmAdrAdminList() throws Exception;
+    
+    //처리일시
+    PgrCmmVO selectAdrEndDeDay(PgrCmmVO pgrCmmVO) throws Exception;
+}

src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 import kcc.com.cmm.ComDefaultVO;
 
 @SuppressWarnings("serial")
-public class PgrCmmVO extends ComDefaultVO implements Serializable {
+public class PgrCmmVO implements Serializable {
 
     private String adrAdmId; // 조정조사관
     private String adrAdmNm; /* 조정조사관 ( LETTNEMPLYRINFO ) */
@@ -23,6 +23,8 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
     private String appliCantId; // 신청인 ID 1명
     private String appliCantNm; // 신청인
     private String appliCantBizNm; // 신청인 법인(개인사업자)명
+    private String appliCantUsrTy; // 신청인 법인(개인사업자)명
+    
 
     private String resPonDentId; // 피신청인 ID
     private String resPonDentNm; // 피신청인
@@ -77,7 +79,7 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
     private String registDay;
     private String registTime;
     private String reqCn1; // 사건내용(신청취지)
-    private String reqCn2; // 사건내용(신청원인)
+    private String reqCn2; // 사건내용(신청이유)
     private String reqOlCd; // 온_오프라인_신청구분
 
     private String reqOlCdTx;
@@ -169,6 +171,104 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
     
     private String dntDetailType;//4DntDetailType(기일지정상세화면)	/	NoDntDetailType(이외)
     
+    private String orderByYn;
+
+    private String appliCantPhone;
+    private String appliCantEmail;
+    private String appliCantSendYn;
+    
+    private String appliCantNm2;
+    private String appliCantPhone2;
+    private String appliCantEmail2;
+    private String appliCantSendYn2;
+    
+    private String finalStatCdTxt;
+    
+    /** 검색조건 */
+    private String searchCondition = "";
+
+    /** 검색Keyword */
+    private String searchKeyword = "";
+
+	/** 검색Keyword */
+	private String searchEncKeyword = "";
+
+    /** 검색사용여부 */
+    private String searchUseYn = "";
+
+    /** 현재페이지 */
+    private int pageIndex = 1;
+
+    /** 페이지갯수 */
+    private int pageUnit = 10;
+
+    /** 페이지사이즈 */
+    private int pageSize = 10;
+
+    /** firstIndex */
+    private int firstIndex = 1;
+
+    /** lastIndex */
+    private int lastIndex = 1;
+
+    /** recordCountPerPage */
+    private int recordCountPerPage = 10;
+
+    /** 검색KeywordFrom */
+    private String searchKeywordFrom = "";
+
+	/** 검색KeywordTo */
+    private String searchKeywordTo = "";
+
+    private String searchYear = "";
+    private String searchMonth2 = "";
+    private String searchQuarter = "";
+    
+    /** 엑셀용 */
+    private String excelYn = "";
+
+    private String siteId = "";
+
+    private String siteNm = "";
+
+    private String searchConditionSite;
+
+    private String  sortOver = "A"; //재정렬시 차순(A:오름차순 , D:내림차순)
+
+    private String  seCd = "";  //게시판 구분 및 게시판ID추가 구분
+
+    private int sort = 0;
+
+    private int beSort = 0;  //이전 sort번호
+
+    private int totCnt = 0;
+
+    private String searchSortCnd = "";	// 정렬 항목
+	private String searchSortOrd = "";	// 정렬 구분(오름/내림)
+
+	private String searchNm = ""; //상세검색 이름
+
+	private String tempSortNum ;
+
+
+	private String searchStartDt;	//검색시작일
+
+	private String searchEndDt;		//검색종료일
+
+	private String searchStatus;	//진행상태
+
+	private String searchSelStatus;	//셀렉트 진행상태
+
+	private String[] searchStatusArr;	//검색상태
+
+	private String searchMonth = "3";	//검색월선택
+
+	private String searchSbmtId ;	// 결제자 검색
+	
+	private String searchEachAdrAdminYn = "";	// 담당사건민 보기 여부 - 조정조사관일 시 선택 가능
+	
+	private String searchLoginId ;	// 본인 ID
+	
     public String getAdrAdmId() {
         return adrAdmId;
     }
@@ -1185,7 +1285,382 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
 		this.dntDetailType = dntDetailType;
 	}
 
+	public String getOrderByYn() {
+		return orderByYn;
+	}
 
+	public void setOrderByYn(String orderByYn) {
+		this.orderByYn = orderByYn;
+	}
+
+	public String getAppliCantPhone() {
+		return appliCantPhone;
+	}
+
+	public void setAppliCantPhone(String appliCantPhone) {
+		this.appliCantPhone = appliCantPhone;
+	}
+
+	public String getAppliCantEmail() {
+		return appliCantEmail;
+	}
+
+	public void setAppliCantEmail(String appliCantEmail) {
+		this.appliCantEmail = appliCantEmail;
+	}
+
+	public String getAppliCantSendYn() {
+		return appliCantSendYn;
+	}
+
+	public void setAppliCantSendYn(String appliCantSendYn) {
+		this.appliCantSendYn = appliCantSendYn;
+	}
+
+	public String getAppliCantPhone2() {
+		return appliCantPhone2;
+	}
+
+	public void setAppliCantPhone2(String appliCantPhone2) {
+		this.appliCantPhone2 = appliCantPhone2;
+	}
+
+	public String getAppliCantEmail2() {
+		return appliCantEmail2;
+	}
+
+	public void setAppliCantEmail2(String appliCantEmail2) {
+		this.appliCantEmail2 = appliCantEmail2;
+	}
+
+	public String getAppliCantSendYn2() {
+		return appliCantSendYn2;
+	}
+
+	public void setAppliCantSendYn2(String appliCantSendYn2) {
+		this.appliCantSendYn2 = appliCantSendYn2;
+	}
+
+	public String getAppliCantNm2() {
+		return appliCantNm2;
+	}
+
+	public void setAppliCantNm2(String appliCantNm2) {
+		this.appliCantNm2 = appliCantNm2;
+	}
+
+	public String getFinalStatCdTxt() {
+		return finalStatCdTxt;
+	}
+
+	public void setFinalStatCdTxt(String finalStatCdTxt) {
+		this.finalStatCdTxt = finalStatCdTxt;
+	}
+
+	public String getSearchCondition() {
+		return searchCondition;
+	}
+
+	public void setSearchCondition(String searchCondition) {
+		this.searchCondition = searchCondition;
+	}
+
+	public String getSearchKeyword() {
+		return searchKeyword;
+	}
+
+	public void setSearchKeyword(String searchKeyword) {
+		this.searchKeyword = searchKeyword;
+	}
+
+	public String getSearchEncKeyword() {
+		return searchEncKeyword;
+	}
+
+	public void setSearchEncKeyword(String searchEncKeyword) {
+		this.searchEncKeyword = searchEncKeyword;
+	}
+
+	public String getSearchUseYn() {
+		return searchUseYn;
+	}
+
+	public void setSearchUseYn(String searchUseYn) {
+		this.searchUseYn = searchUseYn;
+	}
+
+	public int getPageIndex() {
+		return pageIndex;
+	}
+
+	public void setPageIndex(int pageIndex) {
+		this.pageIndex = pageIndex;
+	}
+
+	public int getPageUnit() {
+		return pageUnit;
+	}
+
+	public void setPageUnit(int pageUnit) {
+		this.pageUnit = pageUnit;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public int getFirstIndex() {
+		return firstIndex;
+	}
+
+	public void setFirstIndex(int firstIndex) {
+		this.firstIndex = firstIndex;
+	}
+
+	public int getLastIndex() {
+		return lastIndex;
+	}
+
+	public void setLastIndex(int lastIndex) {
+		this.lastIndex = lastIndex;
+	}
+
+	public int getRecordCountPerPage() {
+		return recordCountPerPage;
+	}
+
+	public void setRecordCountPerPage(int recordCountPerPage) {
+		this.recordCountPerPage = recordCountPerPage;
+	}
+
+	public String getSearchKeywordFrom() {
+		return searchKeywordFrom;
+	}
+
+	public void setSearchKeywordFrom(String searchKeywordFrom) {
+		this.searchKeywordFrom = searchKeywordFrom;
+	}
+
+	public String getSearchKeywordTo() {
+		return searchKeywordTo;
+	}
+
+	public void setSearchKeywordTo(String searchKeywordTo) {
+		this.searchKeywordTo = searchKeywordTo;
+	}
+
+	public String getSearchYear() {
+		return searchYear;
+	}
+
+	public void setSearchYear(String searchYear) {
+		this.searchYear = searchYear;
+	}
+
+	public String getSearchMonth2() {
+		return searchMonth2;
+	}
+
+	public void setSearchMonth2(String searchMonth2) {
+		this.searchMonth2 = searchMonth2;
+	}
+
+	public String getSearchQuarter() {
+		return searchQuarter;
+	}
+
+	public void setSearchQuarter(String searchQuarter) {
+		this.searchQuarter = searchQuarter;
+	}
+
+	public String getExcelYn() {
+		return excelYn;
+	}
+
+	public void setExcelYn(String excelYn) {
+		this.excelYn = excelYn;
+	}
+
+	public String getSiteId() {
+		return siteId;
+	}
+
+	public void setSiteId(String siteId) {
+		this.siteId = siteId;
+	}
+
+	public String getSiteNm() {
+		return siteNm;
+	}
+
+	public void setSiteNm(String siteNm) {
+		this.siteNm = siteNm;
+	}
+
+	public String getSearchConditionSite() {
+		return searchConditionSite;
+	}
+
+	public void setSearchConditionSite(String searchConditionSite) {
+		this.searchConditionSite = searchConditionSite;
+	}
+
+	public String getSortOver() {
+		return sortOver;
+	}
+
+	public void setSortOver(String sortOver) {
+		this.sortOver = sortOver;
+	}
+
+	public String getSeCd() {
+		return seCd;
+	}
+
+	public void setSeCd(String seCd) {
+		this.seCd = seCd;
+	}
+
+	public int getSort() {
+		return sort;
+	}
+
+	public void setSort(int sort) {
+		this.sort = sort;
+	}
+
+	public int getBeSort() {
+		return beSort;
+	}
+
+	public void setBeSort(int beSort) {
+		this.beSort = beSort;
+	}
+
+	public int getTotCnt() {
+		return totCnt;
+	}
+
+	public void setTotCnt(int totCnt) {
+		this.totCnt = totCnt;
+	}
+
+	public String getSearchSortCnd() {
+		return searchSortCnd;
+	}
+
+	public void setSearchSortCnd(String searchSortCnd) {
+		this.searchSortCnd = searchSortCnd;
+	}
+
+	public String getSearchSortOrd() {
+		return searchSortOrd;
+	}
+
+	public void setSearchSortOrd(String searchSortOrd) {
+		this.searchSortOrd = searchSortOrd;
+	}
+
+	public String getSearchNm() {
+		return searchNm;
+	}
+
+	public void setSearchNm(String searchNm) {
+		this.searchNm = searchNm;
+	}
+
+	public String getTempSortNum() {
+		return tempSortNum;
+	}
+
+	public void setTempSortNum(String tempSortNum) {
+		this.tempSortNum = tempSortNum;
+	}
+
+	public String getSearchStartDt() {
+		return searchStartDt;
+	}
+
+	public void setSearchStartDt(String searchStartDt) {
+		this.searchStartDt = searchStartDt;
+	}
+
+	public String getSearchEndDt() {
+		return searchEndDt;
+	}
+
+	public void setSearchEndDt(String searchEndDt) {
+		this.searchEndDt = searchEndDt;
+	}
+
+	public String getSearchStatus() {
+		return searchStatus;
+	}
+
+	public void setSearchStatus(String searchStatus) {
+		this.searchStatus = searchStatus;
+	}
+
+	public String getSearchSelStatus() {
+		return searchSelStatus;
+	}
+
+	public void setSearchSelStatus(String searchSelStatus) {
+		this.searchSelStatus = searchSelStatus;
+	}
+
+	public String[] getSearchStatusArr() {
+		return searchStatusArr;
+	}
+
+	public void setSearchStatusArr(String[] searchStatusArr) {
+		this.searchStatusArr = searchStatusArr;
+	}
+
+	public String getSearchMonth() {
+		return searchMonth;
+	}
+
+	public void setSearchMonth(String searchMonth) {
+		this.searchMonth = searchMonth;
+	}
+
+	public String getSearchSbmtId() {
+		return searchSbmtId;
+	}
+
+	public void setSearchSbmtId(String searchSbmtId) {
+		this.searchSbmtId = searchSbmtId;
+	}
+
+	public String getAppliCantUsrTy() {
+		return appliCantUsrTy;
+	}
+
+	public void setAppliCantUsrTy(String appliCantUsrTy) {
+		this.appliCantUsrTy = appliCantUsrTy;
+	}
+
+
+	public String getSearchEachAdrAdminYn() {
+		return searchEachAdrAdminYn;
+	}
+
+	public void setSearchEachAdrAdminYn(String searchEachAdrAdminYn) {
+		this.searchEachAdrAdminYn = searchEachAdrAdminYn;
+	}
+
+	public String getSearchLoginId() {
+		return searchLoginId;
+	}
+
+	public void setSearchLoginId(String searchLoginId) {
+		this.searchLoginId = searchLoginId;
+	}
 	
 	
 

src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java

@@ -1,6 +1,7 @@
 package kcc.kccadr.adjPgrMgr.cmm.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.stereotype.Repository;
 
@@ -8,6 +9,7 @@ import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
 import kcc.kccadr.adjPgrMgr.arm.service.CmntVO;
 import kcc.kccadr.adjPgrMgr.cmm.service.CloseVO;
 import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
+import kcc.let.uss.umt.service.UserManageVO;
 
 @Repository("PgrCmmDAO")
 public class PgrCmmDAO extends EgovAbstractDAO {
@@ -17,6 +19,12 @@ public class PgrCmmDAO extends EgovAbstractDAO {
         return (List<PgrCmmVO>) list("Cmm.selectPgrCmmList", pgrCmmVO);
     }
     
+    @SuppressWarnings("unchecked")
+    public List<PgrCmmVO> selectPgrCmmListForExcel(PgrCmmVO pgrCmmVO) throws Exception {
+        return (List<PgrCmmVO>) list("Cmm.selectPgrCmmListForExcel", pgrCmmVO);
+    }
+    
+
     public List<PgrCmmVO> selectPgrCmmDeptList(PgrCmmVO pgrCmmVO) throws Exception {
         return (List<PgrCmmVO>) list("Cmm.selectPgrCmmDeptList", pgrCmmVO);
     }
@@ -25,6 +33,10 @@ public class PgrCmmDAO extends EgovAbstractDAO {
         return (Integer) select("Cmm.selectPgrCmmListCnt", pgrCmmVO);
     }
     
+    public Map<String, Integer> selectPgrCmmListCntForOnlineOffline(PgrCmmVO pgrCmmVO) throws Exception {
+        return (Map) select("Cmm.selectPgrCmmListCntForOnlineOffline", pgrCmmVO);
+    }
+
     /**
      * TODO daenge 신청인피신청인 아이디는 어느것으로 하나?? RPPL_ID , RPPL_SEQ
      *
@@ -106,4 +118,12 @@ public class PgrCmmDAO extends EgovAbstractDAO {
 		return (Integer) update("Cmm.updateEntBeforeDtbAdrAdminReg",pgrCmmVO);
 	}
 	
+	public List<UserManageVO> selectPgrCmmAdrAdminList() throws Exception {
+		return (List<UserManageVO>) list("Cmm.selectPgrCmmAdrAdminList");
+	}
+	
+	public PgrCmmVO selectAdrEndDeDay(PgrCmmVO pgrCmmVO) throws Exception {
+		return (PgrCmmVO) select("Cmm.selectAdrEndDeDay", pgrCmmVO);
+	}
+    
 }

src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java

@@ -1,6 +1,7 @@
 package kcc.kccadr.adjPgrMgr.cmm.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -21,6 +22,7 @@ import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
 import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
 import kcc.kccadr.cmm.KccadrConstants;
 import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
+import kcc.let.uss.umt.service.UserManageVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 @Repository("pgrCmmService")
@@ -47,6 +49,10 @@ public class PgrCmmServiceImpl implements PgrCmmService {
     @Resource(name = "adrHstryMgrDAO")
     private AdrHstryMgrDAO adrHstryMgrDAO;
     
+	//조정사건 이력관리 일련번호
+	@Resource(name="adrHstryMgrSeqGnrService")
+	private EgovIdGnrService adrHstryMgrSeqGnrService;
+    
     @Override
     public List<PgrCmmVO> selectPgrCmmList(PgrCmmVO pgrCmmVO) throws Exception {
 
@@ -61,6 +67,58 @@ public class PgrCmmServiceImpl implements PgrCmmService {
         return list;
     }
     
+    @Override
+    public List<PgrCmmVO> selectPgrCmmListForExcel(PgrCmmVO pgrCmmVO) throws Exception {
+
+        setDayInfo(pgrCmmVO);
+
+        List<PgrCmmVO> list = pgrCmmDAO.selectPgrCmmListForExcel(pgrCmmVO);
+
+        for (PgrCmmVO item : list) {
+            decpyptVo(item);
+            
+            String[] statCd = item.getFinalStatCd() != null ? item.getFinalStatCd().split(",") : new String[] {""};
+            for(String tmpString : statCd) {
+            	switch (tmpString) {
+					case KccadrConstants.ADR_DEPTBFRCNCL_PAY_COMP:
+						item.setFinalStatCdTxt("배당 전 취하종결");
+						break;
+					case KccadrConstants.ADR_DEPTBFRCNCL_ADR_RCPT_COMP:
+						item.setFinalStatCdTxt("배당 전 취하종결");
+						break;
+					case KccadrConstants.ADR_DEPTBFRCNCL_RCPT_APPR_REQ:
+						item.setFinalStatCdTxt("배당 전 취하종결");
+						break;
+					case KccadrConstants.ADR_DEPTBFRCNCL_RCPT_APPR_COMP:
+						item.setFinalStatCdTxt("배당 전 취하종결");
+						break;
+					case KccadrConstants.ADR_DEPTBFRCNCL_ADR_RCPT_DTB_REQ:
+						item.setFinalStatCdTxt("배당 전 취하종결");
+						break;
+					case KccadrConstants.ADR_CNCLTBS_APPR_COMP:
+						item.setFinalStatCdTxt("취하종결");
+						break;
+					case KccadrConstants.ADR_BSRTBS_APPR_REQ:
+						item.setFinalStatCdTxt("불성립종결");
+						break;
+					case KccadrConstants.ADR_JJOSU_APPR_COMP:
+						item.setFinalStatCdTxt("성립종결");
+						break;
+					case KccadrConstants.ADR_JKKJS_APPR_COMP:
+						item.setFinalStatCdTxt("직권조정 성립");
+						break;
+	
+					default:
+						break;
+				}
+            }
+            
+            System.out.println("FinalStatCdTxt  ::  " + item.getFinalStatCdTxt());
+        }
+
+        return list;
+    }
+    
     @Override
     public List<PgrCmmVO> selectPgrCmmDeptList(PgrCmmVO pgrCmmVO) throws Exception {
 
@@ -81,6 +139,12 @@ public class PgrCmmServiceImpl implements PgrCmmService {
         return pgrCmmDAO.selectPgrCmmListCnt(pgrCmmVO);
     }
     
+    @Override
+    public Map<String, Integer> selectPgrCmmListCntForOnlineOffline(PgrCmmVO pgrCmmVO) throws Exception {
+        setDayInfo(pgrCmmVO);
+        return pgrCmmDAO.selectPgrCmmListCntForOnlineOffline(pgrCmmVO);
+    }
+
     @Override
     public PgrCmmVO selectPgrCmm(PgrCmmVO pgrCmmVO) throws Exception {
 
@@ -187,6 +251,35 @@ public class PgrCmmServiceImpl implements PgrCmmService {
                 result.setAppliCantNm(egovCryptoUtil.decrypt(result.getAppliCantNm()));
             }
             
+            if (!StringUtil.isEmpty(result.getAppliCantPhone())) {
+            	result.setAppliCantPhone(egovCryptoUtil.decrypt(result.getAppliCantPhone()));
+            }
+            
+            if (!StringUtil.isEmpty(result.getAppliCantEmail())) {
+            	result.setAppliCantEmail(egovCryptoUtil.decrypt(result.getAppliCantEmail()));
+            }
+            
+            if (!StringUtil.isEmpty(result.getAppliCantSendYn())) {
+            	result.setAppliCantSendYn(egovCryptoUtil.decrypt(result.getAppliCantSendYn()));
+            }
+            
+            if (!StringUtil.isEmpty(result.getAppliCantNm2())) {
+                result.setAppliCantNm2(egovCryptoUtil.decrypt(result.getAppliCantNm2()));
+            }
+            
+            if (!StringUtil.isEmpty(result.getAppliCantPhone2())) {
+            	result.setAppliCantPhone2(egovCryptoUtil.decrypt(result.getAppliCantPhone2()));
+            }
+            
+            if (!StringUtil.isEmpty(result.getAppliCantEmail2())) {
+            	result.setAppliCantEmail2(egovCryptoUtil.decrypt(result.getAppliCantEmail2()));
+            }
+            
+            if (!StringUtil.isEmpty(result.getAppliCantSendYn2())) {
+            	result.setAppliCantSendYn2(egovCryptoUtil.decrypt(result.getAppliCantSendYn2()));
+            }
+            
+
             if (!StringUtil.isEmpty(result.getResPonDentNm())) {
                 String[] resPonArr = result.getResPonDentNm().split(", ");
 
@@ -448,13 +541,18 @@ public class PgrCmmServiceImpl implements PgrCmmService {
 		adjReqMgrVO.setStatCd(statCd); // 최종 변경 상태값
 		adjReqMgrVO.setLastUpdusrId(userId); // 최종 변경자
 		
+		// 배당전 취하종결 adrHstryMgrSeq 없어서 나는 에러 수정_230615
+		String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId();
+		
 		//step1.statCd 30000X 로 update
-		int resultCnt = kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, "");
+		int resultCnt = kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, s_adrHstryMgrSeq);
+		
+		String s_adrHstryMgrSeq2 = adrHstryMgrSeqGnrService.getNextStringId();
 		
 		//step2.statCd 400000 로 update
 		statCd = KccadrConstants.ADR_CLOSE;
 		adjReqMgrVO.setStatCd(statCd); // 최종 변경 상태값
-		resultCnt += kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, "");
+		resultCnt += kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, s_adrHstryMgrSeq2);
 		
 		//step3.접수결재 요청(ADR_RCPT_APPR_REQ, 201010), 배당결재요청(ADR_RCPT_DTB_REQ, 202010) 일 경우 결재 요청 delete 처리
 		if(closeVO.getStatCd().equals(KccadrConstants.ADR_RCPT_APPR_REQ)
@@ -475,5 +573,16 @@ public class PgrCmmServiceImpl implements PgrCmmService {
 		return (Integer) pgrCmmDAO.updateEntBeforeDtbAdrAdminReg(pgrCmmVO);
 	}
 
+	@Override
+	public List<UserManageVO> selectPgrCmmAdrAdminList() throws Exception {
+		return pgrCmmDAO.selectPgrCmmAdrAdminList();
+	}
+
+	@Override
+	public PgrCmmVO selectAdrEndDeDay(PgrCmmVO pgrCmmVO) throws Exception {
+		return pgrCmmDAO.selectAdrEndDeDay(pgrCmmVO);
+	}
+	
+	
 
 }

src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -84,6 +85,39 @@ public class CrtController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
     
+    /*
+ 	//개발, local oz 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPath']}")
+	private String ozDevPath;
+	*/ 	
+ 	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
  	
     /**
      * 불성립종결통보서 등록 Form TODO daenge 불성립종결통보서 등록
@@ -314,6 +348,11 @@ public class CrtController {
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr";
         	String savePath = closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf";
+        	if(req.getServerName().contains("localhost")) {
+        		savePath = ozDevPdfSavePath	+	closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";
+        	}else {
+        		savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\"	+	closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
+        	}
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -323,7 +362,7 @@ public class CrtController {
     	else{
     		String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr";
         	/*String savePath = closeVO.getAdrSeq() + "/adrBsrtbsApprReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -385,12 +424,34 @@ public class CrtController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrBsrtbsApprReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "307050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);    	
+    	
+    	/*
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr";
         	String savePath = closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";
+        	savePath = ozDevPath	+	closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -399,13 +460,14 @@ public class CrtController {
     	//실서버
     	else{
     		String ozrFilePath = "/admin/adrBsrtbsApprReport.ozr";
-        	/*String savePath = closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
+        	*String savePath = closeVO.getAdrSeq() + "/ozFile/adrBsrtbsApprReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrBsrtbsApprReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
     	}
+    	*/
     	
     	
 
@@ -414,6 +476,81 @@ public class CrtController {
         return modelAndView;
     }
 
+    @SuppressWarnings("unchecked")
+	@RequestMapping(value = "crtOzExport307050Ajax.do")
+    public ModelAndView crtOzExport307050Ajax(
+    		@RequestBody CloseVO closeVO
+    		, ModelMap model
+    		, HttpServletRequest req) throws Exception {
+
+    	ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+    	
+    	JSONObject jsCrtInfo = new JSONObject();		//불성립종결통보 정보
+    	
+    	CloseVO result = cmmService.selectCloseDoc(closeVO);
+    	
+    	if (result==null) {
+    		modelAndView.addObject("status", "SKIP");
+    		return modelAndView;
+    	}
+    	
+    	
+    	jsCrtInfo = parseJsonData(result);
+    	
+    	
+    	JSONObject jsObjData = new JSONObject();
+    	
+    	jsObjData.put("jsCrtInfo", jsCrtInfo);
+    	
+    	String repStr = StringUtil.getUrlString(jsObjData.toString());
+    	
+    	//json 데이터 특수문자 치환_220215_이준호
+    	JsonStringEncoder encoder = JsonStringEncoder.getInstance();
+    	char[] escapedJson = encoder.quoteAsString(repStr);
+    	System.out.println(escapedJson); // {\"type\":\"BIG\"}
+    	String p_json;
+    	p_json = new String(escapedJson);
+    	p_json = p_json.replace("\\\\\\\\r\\\\\\\\n", "\\\\r\\\\n").replace("\'", "\\'");
+    	
+    	model.addAttribute("jsObjData", p_json);
+    	
+        //model.addAttribute("info", cmmService.selectCloseDoc(closeVO));
+        
+        //오즈리포트 서버별 주소 셋팅해주기
+    	String serverName = req.getServerName();
+    	String ozServerNm = IpUtil.getOzServerName(serverName);
+    	model.addAttribute("ozServerNm", ozServerNm);
+    	
+    	/*
+    	 * 2022.01.06 우영두 추가
+    	 * 오즈 리포트 File Export 처리
+    	 * 
+    	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrBsrtbsApprReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "307050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);    	
+    	
+    	modelAndView.addObject("status", "OK");
+    	
+        return modelAndView;
+    }
 
     /**
      * 등록자, 수정자 정보 세팅
@@ -455,68 +592,68 @@ public class CrtController {
 		List<PgrCmmVO> resultStampInfo = cmmService.selectAtchFileIdInfo(closeVO);
 		
 		String atchFileId = "";
-		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 				
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
 				
 			}
- 		
-		if(!adrSeq.equals("")) {
+		}
+		if(StringUtil.isNotEmpty(adrSeq)) {
 			
 			oj.put("adrSeq", adrSeq);
 			
 		}
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!adrSn.equals("")) {
+		if(StringUtil.isNotEmpty(adrSn)) {
 			
 			oj.put("adrSn", adrSn);
 			
 		}
 		
-		if(!cctyTx.equals("")) {
+		if(StringUtil.isNotEmpty(cctyTx)) {
 			
 			oj.put("cctyTx", cctyTx);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!closeCn1.equals("")) {
+		if(StringUtil.isNotEmpty(closeCn1)) {
 			
 			oj.put("closeCn1", closeCn1);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!resPonDentNm.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			
 		}
 		
-		if(!atchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(atchFileId)) {
 			
 			String domain = "";
 			

src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java

@@ -167,8 +167,11 @@ public class DlvinfoController {
      */
     @RequestMapping(value = "dlvinfoDetail.do")
     public String dlvinfoDetail(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception {
+    	DlvinfoVO info = dlvinfoService.selectAdjustDeliveryInfo(dlvinfoVO);
     	
-        model.addAttribute("info", dlvinfoService.selectAdjustDeliveryInfo(dlvinfoVO));
+    	System.out.println("info.getRecDeTime() ::  "+info.getRecDeTime());
+    	
+        model.addAttribute("info", info);
 
         return "/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail";
     }
@@ -299,11 +302,13 @@ public class DlvinfoController {
         // 신청인 add
         for(int i = 0 ; i  < appliCantNmList.length; i++) {
         	String[] appliCantNmListInfo = appliCantNmList[i].split("!");
+        	if(appliCantNmListInfo.length > 0) {
 	        	DlvinfoVO rpplInfo = new DlvinfoVO();
 	        	rpplInfo.setRpplNm(appliCantNmListInfo[0]);
 	        	rpplInfo.setRpplTy(appliCantNmListInfo[1]);
 	        	rpplList.add(rpplInfo);
         	}
+        }
         
         
         String[] resPonDentNmList = info.getResPonDentNm().split(",");
@@ -311,11 +316,13 @@ public class DlvinfoController {
         //피신청인 add
         for(int i = 0 ; i < resPonDentNmList.length; i++) {
         	String[] resPonDentNmInfo = resPonDentNmList[i].split("!");
+        	if(resPonDentNmInfo.length > 0) {
         		DlvinfoVO rpplInfo = new DlvinfoVO();
         		rpplInfo.setRpplNm(resPonDentNmInfo[0]);
         		rpplInfo.setRpplTy(resPonDentNmInfo[1]);
         		rpplList.add(rpplInfo);
         	}
+        }   
         
         String[] appliCantDNmList = new String[5];
         if((info.getAppliCantDNm() != null) && (!"".equals(info.getAppliCantDNm()))) {
@@ -328,12 +335,14 @@ public class DlvinfoController {
         	//신청대리인 add
             for(int i = 0 ; i < appliCantDNmList.length; i++) {
             	String[] appliCantDNmInfo = appliCantDNmList[i].split("!");
+            	if(appliCantDNmInfo.length > 0) {
 	            	DlvinfoVO rpplInfo = new DlvinfoVO();
 	            	rpplInfo.setRpplNm(appliCantDNmInfo[0]);
 	            	rpplInfo.setRpplTy(appliCantDNmInfo[1]);
 	                rpplList.add(rpplInfo);
             	}
             }
+        }
         String[] resPonDentDNm = new String[5];
         if((info.getResPonDentDNm() != null) && (!"".equals(info.getResPonDentDNm()))) {
         	resPonDentDNm = info.getResPonDentDNm().split(",");
@@ -341,12 +350,14 @@ public class DlvinfoController {
         	//피신청대리인 add
             for(int i = 0 ; i < resPonDentDNm.length; i++) {
             	String[] resPonDentDNmInfo = resPonDentDNm[i].split("!");
+            	if(resPonDentDNmInfo.length > 0) {
 	            	DlvinfoVO rpplInfo = new DlvinfoVO();
 	            	rpplInfo.setRpplNm(resPonDentDNmInfo[0]);
 	            	rpplInfo.setRpplTy(resPonDentDNmInfo[1]);
 	                rpplList.add(rpplInfo);
             	}
             }
+        }
         
         modelAndView.addObject("rpplList", rpplList);
         
@@ -512,10 +523,11 @@ public class DlvinfoController {
         /*
          * if(apmVO.getPageUnit() != 10) { apmVO.setPageUnit(apmVO.getPageUnit()); }
          */
-        if (StringUtil.isEmpty(cmmVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List
-            cmmVO.setSearchSortCnd("M.ADR_SEQ");
+//        if (StringUtil.isEmpty(cmmVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List
+    		cmmVO.setOrderByYn("Y");
+            cmmVO.setSearchSortCnd("M.ADR_NO");
             cmmVO.setSearchSortOrd("desc");
-        }
+//        }
         
         if (StringUtil.isEmpty(cmmVO.getSearchStartDt())) { // 조회일시가 null인경우 디폴트로 12개월 동안의 기간으로 검색함
             Date today = new Date();

src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -118,6 +119,40 @@ public class DntController {
  	@Value("#{globalSettings['Globals.ozFontPath']}")
 	private String ozFontPath;
 
+// 	//개발, local oz 저장 경로
+// 	@Value("#{globalSettings['Globals.oz.devPath']}")
+//	private String ozDevPath;
+ 	
+ 	
+ 	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
+ 	
     /**
      * 기일지정 상세 TODO daenge 기일지정 상세
      *
@@ -604,13 +639,17 @@ public class DntController {
      */
     @SuppressWarnings("unchecked")
 	@RequestMapping(value = "dntOzExportAjax.do")
-    public ModelAndView dntOzExportAjax(PgrCmmVO cmmVO, HttpServletRequest req, ModelMap model) throws Exception {
+    public ModelAndView dntOzExportAjax(
+    		PgrCmmVO cmmVO, HttpServletRequest req, ModelMap model) throws Exception {
 
     	ModelAndView modelAndView = new ModelAndView();
         modelAndView.setViewName("jsonView");
     	
     	JSONObject jsDntInfo = new JSONObject();		//조정권고안 정보
     	
+    	System.out.println("cmmVO.toString()");
+    	System.out.println(cmmVO.getAdrSeq());
+    	
     	PgrCmmVO result = cmmService.selectPgrCmm(cmmVO);
     	
     	jsDntInfo = parseJsonData(result);
@@ -642,12 +681,37 @@ public class DntController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	String serverName = req.getServerName();
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, cmmVO.getAdrSeq()
+    			, "admin/adrAppSlctReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "205050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);
+    	
+    	/*
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrAppSlctReport.ozr";
         	String savePath = cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";
+        	savePath = ozDevPath	+	cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";
+        	
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -656,13 +720,14 @@ public class DntController {
     	//실서버
     	else{
     		String ozrFilePath = "/admin/adrAppSlctReport.ozr";
-        	/*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf";
+        	//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrAppSlctReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrAppSlctReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
     	}
+    	*/
     	
     	
     	
@@ -671,6 +736,73 @@ public class DntController {
         return modelAndView;
     }
     
+    @SuppressWarnings("unchecked")
+	@RequestMapping(value = "dntOzExport205050Ajax.do")    
+    public ModelAndView dntOzExport205050Ajax(
+    		@RequestBody PgrCmmVO cmmVO, HttpServletRequest req, ModelMap model) throws Exception {
+
+    	ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+    	
+    	JSONObject jsDntInfo = new JSONObject();		//조정권고안 정보
+    	
+    	System.out.println("cmmVO.toString()");
+    	System.out.println(cmmVO.getAdrSeq());
+    	
+    	PgrCmmVO result = cmmService.selectPgrCmm(cmmVO);
+    	
+    	jsDntInfo = parseJsonData(result);
+    	
+    	JSONObject jsObjData = new JSONObject();
+    	
+    	jsObjData.put("jsDntInfo", jsDntInfo);
+    	
+    	String repStr = jsObjData.toString();
+    	repStr = StringUtil.getUrlString(jsObjData.toString());
+    	
+    	//json 데이터 특수문자 치환_220215_이준호
+    	JsonStringEncoder encoder = JsonStringEncoder.getInstance();
+    	char[] escapedJson = encoder.quoteAsString(repStr);
+    	System.out.println(escapedJson); // {\"type\":\"BIG\"}
+    	String p_json;
+    	p_json = new String(escapedJson);
+    	p_json = p_json.replace("\\\\\\\\r\\\\\\\\n", "\\\\r\\\\n").replace("\'", "\\'");
+    	
+    	model.addAttribute("jsObjData", repStr);
+    	
+    	/*
+    	 * 2022.01.06 우영두 추가
+    	 * 오즈 리포트 File Export 처리
+    	 * 
+    	 * */
+    	
+    	String serverName = req.getServerName();
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, cmmVO.getAdrSeq()
+    			, "admin/adrAppSlctReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "205050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);
+    	
+    	
+    	modelAndView.addObject("status", "OK");
+    	
+        return modelAndView;
+    }
+    
     /**
      * 오즈 리포트 데이터 Json 생성하기
      *
@@ -732,11 +864,10 @@ public class DntController {
 		List<PgrCmmVO> resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO);
 		
 		String atchFileId = "";
-		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
-			
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
-			
+			}
 		}
  		
 		/*if(!adrSeq.equals("")) {
@@ -745,85 +876,86 @@ public class DntController {
 			
 		}*/
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!adrSn.equals("")) {
+		if(StringUtil.isNotEmpty(adrSn)) {
 			
 			oj.put("adrSn", adrSn);
 			
 		}
 		
-		if(!cctyTx.equals("")) {
+		if(StringUtil.isNotEmpty(cctyTx)) {
 			
 			oj.put("cctyTx", cctyTx);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+//		if(StringUtil.isNotEmpty(memDeptNm)) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!adrAdmNm.equals("")) {
+		if(StringUtil.isNotEmpty(adrAdmNm)) {
 			
 			oj.put("adrAdmNm", adrAdmNm);
 			
 		}
 		
-		if(!adrAdmOffmTel.equals("")) {
+		if(StringUtil.isNotEmpty(adrAdmOffmTel)) {
 			
 			oj.put("adrAdmOffmTel", adrAdmOffmTel);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!resPonDentNm.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			
 		}
 		
-		if(!resPonDentNmEtc.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNmEtc)) {
 			
 			oj.put("resPonDentNmEtc", resPonDentNmEtc);
 			
 		}
 		
-		/*if(!appDeDay.equals("")) {
+		/*if(StringUtil.isNotEmpty(appDeDay)) {
 			
 			oj.put("appDeDay", appDeDay);
 			
 		}*/
 		
-		if(!appDeDate.equals("")) {
+		if(StringUtil.isNotEmpty(appDeDate)) {
 			
 			oj.put("appDeDate", appDeDate);
 			
 		}
 		
-		if(!appPlace.equals("")) {
+		if(StringUtil.isNotEmpty(appPlace)) {
 			
 			oj.put("appPlace", appPlace);
 			
 		}
 		
-		if(!appPlaceAddr.equals("")) {
+		if(StringUtil.isNotEmpty(appPlaceAddr)) {
 			
 			oj.put("appPlaceAddr", appPlaceAddr);
 			

src/main/java/kcc/kccadr/adjPgrMgr/drt/service/AgntVO.java

@@ -37,6 +37,8 @@ public class AgntVO extends PgrCmmVO implements Serializable {
     private String agntRealPost;
     private String agntRealAddr;
     private String agntRealAddrDtl;
+    private String agntRelation;
+    private String agntRelationEtc;
     public String getAdrSeq() {
         return adrSeq;
     }
@@ -229,7 +231,16 @@ public class AgntVO extends PgrCmmVO implements Serializable {
     public void setAgntRealAddrDtl(String agntRealAddrDtl) {
         this.agntRealAddrDtl = agntRealAddrDtl;
     }
-    
-    
-    
+	public String getAgntRelation() {
+		return agntRelation;
+	}
+	public void setAgntRelation(String agntRelation) {
+		this.agntRelation = agntRelation;
+	}
+	public String getAgntRelationEtc() {
+		return agntRelationEtc;
+	}
+	public void setAgntRelationEtc(String agntRelationEtc) {
+		this.agntRelationEtc = agntRelationEtc;
+	}
 }

src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtServiceImpl.java

@@ -15,6 +15,8 @@ import kcc.kccadr.adjPgrMgr.drt.service.AgntVO;
 import kcc.kccadr.adjPgrMgr.drt.service.AssVO;
 import kcc.kccadr.adjPgrMgr.drt.service.DrtService;
 import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
+import kcc.kccadr.adjst.service.AdjstReqVO;
+import kcc.kccadr.adjst.service.impl.AdjstReqDAO;
 import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
@@ -31,6 +33,8 @@ public class DrtServiceImpl implements DrtService {
     @Resource(name = "egovCryptoUtil")
     EgovCryptoUtil egovCryptoUtil;
     
+    @Resource(name="rpplGnrService")
+	private EgovIdGnrService rpplIdgenService;
     
     @Resource(name = "egovAssMgrManageGnrService")
     private EgovIdGnrService idgenAssSeqService;
@@ -42,6 +46,9 @@ public class DrtServiceImpl implements DrtService {
     @Resource(name = "adrHstryMgrDAO")
     private AdrHstryMgrDAO adrHstryMgrDAO;
     
+    // 조정신청 DAO
+    @Resource(name = "AdjstReqDAO")
+    private AdjstReqDAO adjstReqDAO;
 
 
     @Transactional
@@ -449,22 +456,53 @@ public class DrtServiceImpl implements DrtService {
 			, String p_adrHstryMgrSeq
     		) throws Exception {
         
-        agntVO.setAgntAddr(egovCryptoUtil.encrypt(agntVO.getAgntAddr()));
     	
-        agntVO.setAgntAddrDtl(egovCryptoUtil.encrypt(agntVO.getAgntAddrDtl()));
+    	String agntPost = egovCryptoUtil.encrypt(agntVO.getAgntPost());					// 우편번호
+    	String agntAddr = egovCryptoUtil.encrypt(agntVO.getAgntAddr());					// 주소
+        String agntAddrDtl = egovCryptoUtil.encrypt(agntVO.getAgntAddrDtl());			// 상세주소
+        String agntNm = egovCryptoUtil.encrypt(agntVO.getAgntNm());						// 이름
+        String agntEmail = egovCryptoUtil.encrypt(agntVO.getAgntEmail());				// 이메일
+        String agntPhone = egovCryptoUtil.encrypt(agntVO.getAgntPhone());				// 전화번호
+        String agntRealPost = egovCryptoUtil.encrypt(agntVO.getAgntRealPost());			// 대리인 실제 우편번호
+        String agntRealAddr = egovCryptoUtil.encrypt(agntVO.getAgntRealAddr());			// 대리인 실제주소
+        String agntRealAddrDtl = egovCryptoUtil.encrypt(agntVO.getAgntRealAddrDtl());	// 대리인 실제상세주소
     	
-        agntVO.setAgntEmail(egovCryptoUtil.encrypt(agntVO.getAgntEmail()));
+    	agntVO.setAgntPost(agntPost);				// 우편번호
+        agntVO.setAgntAddr(agntAddr);				// 주소
+        agntVO.setAgntAddrDtl(agntAddrDtl);			// 상세주소
+        agntVO.setAgntNm(agntNm);					// 이름
         
-        agntVO.setAgntNm(egovCryptoUtil.encrypt(agntVO.getAgntNm()));
-        agntVO.setAgntPhone(egovCryptoUtil.encrypt(agntVO.getAgntPhone()));
-        agntVO.setAgntPost(egovCryptoUtil.encrypt(agntVO.getAgntPost()));
-        agntVO.setAgntRealAddr(egovCryptoUtil.encrypt(agntVO.getAgntRealAddr()));
-        agntVO.setAgntRealAddrDtl(egovCryptoUtil.encrypt(agntVO.getAgntRealAddrDtl()));
-        agntVO.setAgntRealPost(egovCryptoUtil.encrypt(agntVO.getAgntRealPost()));
+        agntVO.setAgntEmail(agntEmail);				// 이메일
+        agntVO.setAgntPhone(agntPhone);				// 전화번호
+        
+        agntVO.setAgntRealPost(agntRealPost);		// 대리인 실제 우편번호
+        agntVO.setAgntRealAddr(agntRealAddr);		// 대리인 실제주소
+        agntVO.setAgntRealAddrDtl(agntRealAddrDtl);	// 대리인 실제상세주소
         
         drtDAO.addAgntPopAjax(agntVO);
 
         
+        AdjstReqVO adjstReqVO = new AdjstReqVO();
+        adjstReqVO.setRpplSeq(rpplIdgenService.getNextStringId());
+        adjstReqVO.setAdrSeq(agntVO.getAdrSeq());
+        
+        adjstReqVO.setRpplNm(agntNm);
+		adjstReqVO.setRpplEmail(agntEmail);
+		adjstReqVO.setRpplPhone(agntPhone);
+		adjstReqVO.setRpplPost(agntPost);
+		adjstReqVO.setRpplAddr(agntAddr);
+		adjstReqVO.setRpplAddrDtl(agntAddrDtl);
+		adjstReqVO.setRpplRealPost(agntPost);
+		adjstReqVO.setRpplRealAddr(agntAddr);
+		adjstReqVO.setRpplRealAddrDtl(agntAddrDtl);
+		adjstReqVO.setRpplRelation(agntVO.getAgntRelation());
+		adjstReqVO.setRpplRelationEtc(agntVO.getAgntRelationEtc());
+		
+		adjstReqVO.setFrstRegisterId(agntVO.getFrstRegisterId());
+		adjstReqVO.setLastUpdusrId(agntVO.getLastUpdusrId());
+		
+		adjstReqDAO.insertAdrRppl(adjstReqVO);
+        
     	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
 		//adr_hstry_mgr에 값 넣기	-	시작    	
 		adrHstryMgrDAO.insert4Func(agntVO.getAdrSeq()

src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -124,6 +125,35 @@ public class DrtController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
      	
+ 	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
+ 	
     /**
      * 기일조서 등록 Form TODO daenge 기일조서 등록
      *
@@ -551,13 +581,19 @@ public class DrtController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrKjosuReport.ozr";
         	String savePath = cmmVO.getAdrSeq() + "/adrKjosuReport.pdf";
-        	
+        	if(req.getServerName().contains("localhost")) {
+        		savePath = ozDevPdfSavePath	+	cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";
+        	}else {
+        		savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\"	+	cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
+        	}
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
@@ -566,7 +602,7 @@ public class DrtController {
     	else{
     		String ozrFilePath = "/admin/adrKjosuReport.ozr";
         	/*String savePath = cmmVO.getAdrSeq() + "/adrKjosuReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -691,12 +727,36 @@ public class DrtController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	//String serverName = req.getServerName();
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, cmmVO.getAdrSeq()
+    			, "admin/adrAppSlctReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "302050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);
+    	
+    	/*    	
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrKjosuReport.ozr";
         	String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";
+        	savePath = ozDevPath	+	cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -705,13 +765,14 @@ public class DrtController {
     	//실서버
     	else{
     		String ozrFilePath = "/admin/adrKjosuReport.ozr";
-        	/*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
+        	//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
     	}
+    	*/
     	
     	modelAndView.addObject("result", "SUCCESS");
     	
@@ -719,6 +780,172 @@ public class DrtController {
 
     }
     
+    @SuppressWarnings("unchecked")
+	@RequestMapping(value = "drtOzExport302050Ajax.do")
+    public ModelAndView drtOzExport302050Ajax(
+    		@RequestBody PgrCmmVO cmmVO
+    		, DrtVO drtVO
+    		, ModelMap model
+    		, HttpServletRequest req
+    		) throws Exception {
+
+    	System.out.println("-102303-");
+    	
+    	ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+    	
+    	JSONObject jsDrtInfo = new JSONObject();	//전체 정보
+    	JSONArray jsReqInfo = new JSONArray();		//신청인 정보
+    	JSONArray jsReqDepInfo = new JSONArray();		//대리인 정보
+    	JSONArray jsRespInfo = new JSONArray();		//피신청인 정보
+    	JSONArray jsJoMemInfo = new JSONArray();	//조정위원 정보
+    	
+    	List<AssVO> assList = drtService.selectAssList(drtVO);	//신청인, 대리인, 피신청인 정보
+    	
+    	
+    	for(int i=0; i< assList.size(); i++) {
+    		
+    		JSONObject oj = new JSONObject();
+    		String usrTy = assList.get(i).getAssUsrTy();	//사용자 구분 : 신청인, 대리인, 피신청인
+    		String addYn = assList.get(i).getAddYn() == null ? "N" : assList.get(i).getAddYn();		//공개여부 : Null 인 경우가 있어서 처리해줌
+    		String addUsrNm = assList.get(i).getAddUsrNm() == null ? "" : assList.get(i).getAddUsrNm();		//사용자 이름 : Null 인 경우가 있어서 처리해줌
+    		String addYnStr = "불출석";
+    		
+    		if(addYn.equals("Y")) {
+    			
+    			addYnStr = "출석";
+    			
+    		}
+    		
+    		if(usrTy.equals("30") || usrTy.equals("40")) { 	//대리인 및 피신청 대리인 정보 입력
+    			
+    			oj.put("rpplNm", addUsrNm);
+    			oj.put("addYnStr", addYnStr);
+    			jsReqDepInfo.add(oj);
+    			
+    		}
+    		
+    		if(usrTy.equals("20")) {		//피신청인 정보 입력
+    			
+    			oj.put("rpplNm", addUsrNm);
+    			oj.put("addYnStr", addYnStr);
+    			jsRespInfo.add(oj);
+    			
+    		}
+    		
+    		if(usrTy.equals("10")) {		//신청인 정보 입력
+    			
+    			oj.put("rpplNm", addUsrNm);
+    			oj.put("addYnStr", addYnStr);
+    			jsReqInfo.add(oj);
+    			
+    		}
+    		
+    	}
+    	
+        		
+        PgrCmmVO result = cmmService.selectPgrCmm(cmmVO);	//조정기일조서 정보
+        
+        /*String[] strMemName = result.getMemNames().split(",");*/
+        String[] strMemName;
+        
+        if(result.getMemNames() != null || result.getMemName() != null) {
+	        //조정부가 단독부 일경우 조정부장이 조정위원도 포함
+	        if(StringUtil.isNotEmpty(result.getMemNames())) {
+	        	strMemName = result.getMemNames().split(",");
+	        }else {
+	        	strMemName = result.getMemName().split(",");
+	        }
+        
+	        //조정위원 리스트 처리
+	        for(String name : strMemName) {
+	        	
+	        	JSONObject ojs = new JSONObject();
+	        	
+	        	ojs.put("memName", name);
+	        	jsJoMemInfo.add(ojs);
+	        	
+	        }
+        }
+    	
+    	jsDrtInfo = parseJsonData(result);
+
+    	JSONObject jsObjData = new JSONObject();
+    	
+    	jsObjData.put("jsDrtInfo", jsDrtInfo);
+    	jsObjData.put("jsReqInfo", jsReqInfo);			//신청인 정보
+    	jsObjData.put("jsReqDepInfo", jsReqDepInfo);	//대리인 정보
+    	jsObjData.put("jsRespInfo", jsRespInfo);		//피신청인 정보
+    	jsObjData.put("jsJoMemInfo", jsJoMemInfo);		//조정위원 정보
+    	
+    	String repStr = jsObjData.toString();
+    	repStr = StringUtil.getUrlString(jsObjData.toString());
+    	
+    	model.addAttribute("jsObjData", repStr);
+    	
+    	//오즈리포트 서버별 주소 셋팅해주기
+    	String serverName = req.getServerName();
+    	String ozServerNm = IpUtil.getOzServerName(serverName);
+    	model.addAttribute("ozServerNm", ozServerNm);
+    	
+    	/*
+    	 * 2022.01.06 우영두 추가
+    	 * 오즈 리포트 File Export 처리
+    	 * 
+    	 * */
+    	
+    	//String serverName = req.getServerName();
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, cmmVO.getAdrSeq()
+    			, "admin/adrAppSlctReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "302050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);
+    	
+    	/*    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	//로컬, 개발 서버
+    	if("local".equals(islocal)) {
+    		String ozrFilePath = "/admin/adrKjosuReport.ozr";
+        	String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";
+        	savePath = ozDevPath	+	cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";
+        	
+        	String jsonData = repStr;
+        	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
+        	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
+    	}
+    	//실서버
+    	else{
+    		String ozrFilePath = "/admin/adrKjosuReport.ozr";
+        	//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrKjosuReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrKjosuReport.pdf";
+        	
+        	String jsonData = repStr;
+        	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
+        	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
+    	}
+    	*/
+    	
+    	modelAndView.addObject("status", "OK");
+    	
+        return modelAndView;
+
+    }
+    
     /**
      * 오즈 리포트 데이터 Json 생성하기
      *
@@ -788,12 +1015,13 @@ public class DrtController {
 		List<PgrCmmVO> resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO);
 		
 		String atchFileId = "";
-		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 				
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
 				
 			}
+		}
 		
 		//조정조사관 직인 이미지 불러오기
 		PgrCmmVO resultAdmStampInfo = cmmService.selectAdmAtchFileIdInfo(cmmVO);
@@ -807,6 +1035,7 @@ public class DrtController {
 			
 		}
 		
+		if(StringUtil.isNotEmpty(openYn)) {
 			if(openYn.equals("Y")) {
 				
 				openYn = "공개";
@@ -816,107 +1045,111 @@ public class DrtController {
 				openYn = "비공개";
 				
 			}
+		}
 		
-		String prtclCn = cmmVO.getPrtclCn().replaceAll("\r\n", "\\\\r\\\\n");	//기일조서 내용
+		String prtclCn = "";
+		if(StringUtil.isNotEmpty(cmmVO.getPrtclCn())) {
+			prtclCn = cmmVO.getPrtclCn().replaceAll("\r\n", "\\\\r\\\\n");	//기일조서 내용
+		}
  		
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!adrSn.equals("")) {
+		if(StringUtil.isNotEmpty(adrSn)) {
 			
 			oj.put("adrSn", adrSn);
 			
 		}
 		
-		if(!cctyTx.equals("")) {
+		if(StringUtil.isNotEmpty(cctyTx)) {
 			
 			oj.put("cctyTx", cctyTx);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!adrAdmNm.equals("")) {
+		if(StringUtil.isNotEmpty(adrAdmNm)) {
 			
 			oj.put("adrAdmNm", adrAdmNm);
 			
 		}
 		
-		/*if(!adrAdmOffmTel.equals("")) {
+		/*if(StringUtil.isNotEmpty(adrAdmOffmTel)) {
 			
 			oj.put("adrAdmOffmTel", adrAdmOffmTel);
 			
 		}*/
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		/*if(!resPonDentNm.equals("")) {
+		/*if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			
 		}
 		
-		if(!resPonDentNmEtc.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNmEtc)) {
 			
 			oj.put("resPonDentNmEtc", resPonDentNmEtc);
 			
 		}*/
 		
-		if(!appDeDate.equals("")) {
+		if(StringUtil.isNotEmpty(appDeDate)) {
 			
 			oj.put("appDeDate", appDeDate);
 			
 		}
 		
-		if(!nextAppDate.equals("")) {
+		if(StringUtil.isNotEmpty(nextAppDate)) {
 			
 			oj.put("nextAppDate", nextAppDate);
 			
 		}
 		
-		if(!appPlaceInfo.equals("")) {
+		if(StringUtil.isNotEmpty(appPlaceInfo)) {
 			
 			oj.put("appPlaceInfo", appPlaceInfo);
 			
 		}
 		
-		/*if(!appPlaceAddr.equals("")) {
+		/*if(StringUtil.isNotEmpty(appPlaceAddr)) {
 			
 			oj.put("appPlaceAddr", appPlaceAddr);
 			
 		}*/
 		
-		if(!openYn.equals("")) {
+		if(StringUtil.isNotEmpty(openYn)) {
 			
 			oj.put("openYn", openYn);
 			
 		}
 		
-		if(!prtclCn.equals("")) {
+		if(StringUtil.isNotEmpty(prtclCn)) {
 			
 			oj.put("prtclCn", prtclCn);
 			
 		}		
 		
-		if(!atchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(atchFileId)) {
 			
 			String domain = "";
 			
@@ -935,7 +1168,7 @@ public class DrtController {
 			
 		}
 		
-		if(!admAtchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(admAtchFileId)) {
 			
 			String domain = "";
 			

src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -107,6 +108,40 @@ public class DrtCtrController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
 
+    /*
+ 	//개발, local oz 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPath']}")
+	private String ozDevPath;
+	*/
+ 	
+ 	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
  	
     /**
      * 조정조서 등록 Form TODO daenge 조정조서 등록
@@ -538,6 +573,11 @@ public class DrtCtrController {
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrJjosuReport.ozr";
         	String savePath = cmmVO.getAdrSeq() + "/adrJjosuReport.pdf";
+        	if(req.getServerName().contains("localhost")) {
+        		savePath = ozDevPdfSavePath	+	cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";
+        	}else {
+        		savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\"	+	cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
+        	}
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -547,7 +587,7 @@ public class DrtCtrController {
     	else{
     		String ozrFilePath = "/admin/adrJjosuReport.ozr";
         	/*String savePath = cmmVO.getAdrSeq() + "/adrJjosuReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -733,12 +773,34 @@ public class DrtCtrController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, cmmVO.getAdrSeq()
+    			, "admin/adrJjosuReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "304050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);
+    	
+    	/*
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrJjosuReport.ozr";
         	String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";
+        	savePath = ozDevPath	+	cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -747,13 +809,14 @@ public class DrtCtrController {
     	//실서버
     	else{
     		String ozrFilePath = "/admin/adrJjosuReport.ozr";
-        	/*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
+        	//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
     	}
+    	*/
     	
     	modelAndView.addObject("result", "SUCCESS");
     	
@@ -761,6 +824,243 @@ public class DrtCtrController {
 
     }
     
+    @SuppressWarnings("unchecked")
+	@RequestMapping(value = "drtCtrOzExport304050Ajax.do")
+    public ModelAndView drtCtrOzExport304050Ajax(
+    		PgrCmmVO cmmVO
+    		, @RequestBody DrtCtrVO drtCtrVO
+    		, ModelMap model
+    		, HttpServletRequest req) throws Exception {
+
+    	System.out.println("-=-=-=-=");
+    	
+    	
+    	ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+    	
+    	JSONObject jsDrtCtrInfo = new JSONObject();	//전체 정보
+    	JSONArray jsReqInfo = new JSONArray();		//신청인 정보
+    	JSONArray jsReqDepInfo = new JSONArray();		//대리인 정보
+    	JSONArray jsRespInfo = new JSONArray();		//피신청인 정보
+    	JSONArray jsJoMemInfo = new JSONArray();	//조정위원 정보
+    	
+    	List<AssCtrVO> assList = drtCtrService.selectAssList(drtCtrVO);	//신청인, 대리인, 피신청인 정보
+    	
+    	for(int i=0; i< assList.size(); i++) {
+    		
+    		JSONObject oj = new JSONObject();
+    		String usrTy = assList.get(i).getAssUsrTy();	//사용자 구분 : 신청인, 대리인, 피신청인
+    		String addYn = assList.get(i).getAddYn() == null ? "N" : assList.get(i).getAddYn();		//공개여부 : Null 인 경우가 있어서 처리해줌
+    		String addUsrNm = assList.get(i).getAddUsrNm() == null ? "" : assList.get(i).getAddUsrNm();		//사용자 이름 : Null 인 경우가 있어서 처리해줌
+    		String addYnStr = "불출석";
+    		
+    		String post = assList.get(i).getRpplPost() == null ? "" : assList.get(i).getRpplPost();		//사용자 우편번호 : Null 인 경우가 있어서 처리해줌
+    		String addr = assList.get(i).getRpplAddr() == null ? "" : assList.get(i).getRpplAddr();		//사용자 주소 : Null 인 경우가 있어서 처리해줌
+    		String addrDtl = assList.get(i).getRpplAddrDtl() == null ? "" : assList.get(i).getRpplAddrDtl();		//사용자 상세 주소 : Null 인 경우가 있어서 처리해줌
+    		
+    		String fullAddr = "( " + post + " ) " + addr + " " + addrDtl;
+    		
+    		if(addYn.equals("Y")) {
+    			
+    			addYnStr = "출석";
+    			
+    		}
+    		
+    		if(usrTy.equals("30") || usrTy.equals("40")) { 	//대리인 및 피신청 대리인 정보 입력
+    			
+    			oj.put("rpplNm", addUsrNm);
+    			oj.put("addYnStr", addYnStr);
+    			oj.put("addr", fullAddr);
+    			
+    			jsReqDepInfo.add(oj);
+    			
+    		}
+    		
+    		if(usrTy.equals("20")) {		//피신청인 정보 입력
+    			
+    			oj.put("rpplNm", addUsrNm);
+    			oj.put("addYnStr", addYnStr);
+    			oj.put("addr", fullAddr);
+    			
+    			jsRespInfo.add(oj);
+    			
+    		}
+    		
+    		if(usrTy.equals("10")) {		//신청인 정보 입력
+    			
+    			oj.put("rpplNm", addUsrNm);
+    			oj.put("addYnStr", addYnStr);
+    			oj.put("addr", fullAddr);
+    			
+    			jsReqInfo.add(oj);
+    			
+    		}
+    		
+    	}
+    	
+    	
+        
+		cmmVO.setAdrSeq(drtCtrVO.getAdrSeq());
+		cmmVO.setAdrSn(drtCtrVO.getAdrSn());		
+    	
+        PgrCmmVO result = cmmService.selectPgrCmm(cmmVO);	//조정조정조서 정보
+        
+        //조정위원의 직인 이미지 불러오기
+    	cmmVO.setMemGrade("02");
+    	cmmVO.setMemDeptSeq(result.getMemDeptSeq());
+		List<PgrCmmVO> resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO);
+		
+		String atchFileId = "";
+		int stmpCnt = resultStampInfo.size();
+        
+        if(result.getMemNames() != null) {
+        	
+        	//조정위원 리스트 처리
+        	String[] strMemName = result.getMemNames().split(",");
+        	
+        	for(String name : strMemName) {
+        		
+        		JSONObject ojs = new JSONObject();
+        		
+        		//조정위원 직인 이미지 경로 불러오기
+		    	for(int i=0; i<stmpCnt; i++) {
+		    		
+		    		String memName = resultStampInfo.get(i).getMemName();
+		    		
+		    		if(name.equals(memName)) {
+		    			
+		    			if(StringUtil.isNotEmpty(resultStampInfo.get(i).getAtchFileId())) {
+		    				
+		    				atchFileId = resultStampInfo.get(i).getAtchFileId();
+		    				
+		    			}
+		    			
+		    		}
+		    		
+		    	}
+		    	
+		    	String joStampPath = "";
+		    	String domain = "";
+		    	
+		    	if(!atchFileId.equals("")) {
+					
+					if ("real".equals(prodIsLocal)) {
+						
+						domain = "hosts_real";
+						
+					}else {
+						
+						domain = "host_dev";
+						
+					}
+					
+					joStampPath = domain + "&url&" + atchFileId;
+					
+				}
+        		
+        		ojs.put("memName", name);
+        		ojs.put("joStampPath", joStampPath);
+        		jsJoMemInfo.add(ojs);
+        		
+        	}
+        	
+        }else {
+        	
+        	JSONObject ojs = new JSONObject();
+    		
+    		ojs.put("memName", "");
+    		ojs.put("joStampPath", "");
+    		jsJoMemInfo.add(ojs);
+        	
+        }
+        
+        
+    	DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO);
+        String ctrCn = "";	//조정조항 내용  
+        
+        try {
+        	ctrCn = resultDrtCtrVO.getCtrCn();	//조정조항 내용
+        }catch(Exception ex) {
+        	//ex.printStackTrace();
+        }
+    	
+    	jsDrtCtrInfo = parseJsonData(result, ctrCn);
+
+    	
+    	JSONObject jsObjData = new JSONObject();
+    	
+    	jsObjData.put("jsDrtCtrInfo", jsDrtCtrInfo);
+    	jsObjData.put("jsReqInfo", jsReqInfo);			//신청인 정보
+    	jsObjData.put("jsReqDepInfo", jsReqDepInfo);	//대리인 정보
+    	jsObjData.put("jsRespInfo", jsRespInfo);		//피신청인 정보
+    	jsObjData.put("jsJoMemInfo", jsJoMemInfo);		//조정위원 정보
+    	
+    	String repStr = StringUtil.getUrlString(jsObjData.toString());
+    	
+    	model.addAttribute("jsObjData", repStr);
+
+    	//오즈리포트 서버별 주소 셋팅해주기
+    	String serverName = req.getServerName();
+    	String ozServerNm = IpUtil.getOzServerName(serverName);
+    	model.addAttribute("ozServerNm", ozServerNm);
+    	
+    	/*
+    	 * 2022.01.06 우영두 추가
+    	 * 오즈 리포트 File Export 처리
+    	 * 
+    	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, cmmVO.getAdrSeq()
+    			, "admin/adrJjosuReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "304050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);
+    	
+    	/*
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	//로컬, 개발 서버
+    	if("local".equals(islocal)) {
+    		String ozrFilePath = "/admin/adrJjosuReport.ozr";
+        	String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";
+        	savePath = ozDevPath	+	cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";
+        	
+        	String jsonData = repStr;
+        	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
+        	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
+    	}
+    	//실서버
+    	else{
+    		String ozrFilePath = "/admin/adrJjosuReport.ozr";
+        	//*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrJjosuReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrJjosuReport.pdf";
+        	
+        	String jsonData = repStr;
+        	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
+        	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
+    	}
+    	*/
+    	
+    	//modelAndView.addObject("result", "SUCCESS");
+    	modelAndView.addObject("status", "OK");
+    	
+        return modelAndView;
+
+    }
+    
     /**
      * 오즈 리포트 데이터 Json 생성하기
      *
@@ -831,11 +1131,13 @@ public class DrtCtrController {
 		
 		String atchFileId = "";
 		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 				
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
 				
 			}
+		}
 		
 		//조정조사관 직인 이미지 불러오기
 		PgrCmmVO resultAdmStampInfo = cmmService.selectAdmAtchFileIdInfo(cmmVO);
@@ -862,86 +1164,86 @@ public class DrtCtrController {
 		String prtclCn = cmmVO.getPrtclCn().replaceAll("\r\n", "\\\\r\\\\n");	//조정조서 내용
  		
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!adrSn.equals("")) {
+		if(StringUtil.isNotEmpty(adrSn)) {
 			
 			oj.put("adrSn", adrSn);
 			
 		}
 		
-		if(!cctyTx.equals("")) {
+		if(StringUtil.isNotEmpty(cctyTx)) {
 			
 			oj.put("cctyTx", cctyTx);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!adrAdmNm.equals("")) {
+		if(StringUtil.isNotEmpty(adrAdmNm)) {
 			
 			oj.put("adrAdmNm", adrAdmNm);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!appDeDate.equals("")) {
+		if(StringUtil.isNotEmpty(appDeDate)) {
 			
 			oj.put("appDeDate", appDeDate);
 			
 		}
 		
-		if(!nextAppDate.equals("")) {
+		if(StringUtil.isNotEmpty(nextAppDate)) {
 			
 			oj.put("nextAppDate", nextAppDate);
 			
 		}
 		
-		if(!appPlaceInfo.equals("")) {
+		if(StringUtil.isNotEmpty(appPlaceInfo)) {
 			
 			oj.put("appPlaceInfo", appPlaceInfo);
 			
 		}
 		
-		if(!openYn.equals("")) {
+		if(StringUtil.isNotEmpty(openYn)) {
 			
 			oj.put("openYn", openYn);
 			
 		}
 		
-		if(!prtclCn.equals("")) {
+		if(StringUtil.isNotEmpty(prtclCn)) {
 			
 			oj.put("prtclCn", prtclCn);
 			
 		}		
 		
-		if(!ctrCn.equals("")) {
+		if(StringUtil.isNotEmpty(ctrCn)) {
 			
 			oj.put("ctrCn", ctrCn.replaceAll("\r\n", "\\\\r\\\\n"));
 			
 		}
 		
 		
-		if(!atchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(atchFileId)) {
 			
 			String domain = "";
 			
@@ -960,7 +1262,7 @@ public class DrtCtrController {
 			
 		}
 		
-		if(!admAtchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(admAtchFileId)) {
 			
 			String domain = "";
 			
@@ -1026,4 +1328,59 @@ public class DrtCtrController {
         model.addAttribute("result", result);
         return "/kccadr/adjPgrMgr/drtCtr/cmmtPop";
     }
+    
+    /**
+     * 조정조서 등록 Form TODO daenge 조정조서 등록
+     *
+     * @param drtVO
+     * @param model
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "drtCtrReg_for_ApprovManageEndDetail.do") 
+    public String drtCtrReg_for_ApprovManageEndDetail(PgrCmmVO cmmVO, DrtCtrVO drtCtrVO, ModelMap model) throws Exception {
+
+    	DrtCtrVO drtCtrVO4Chk = drtCtrService.selectDrtCtrReportLast(drtCtrVO);
+    	
+    	List<AssCtrVO> assListChk = drtCtrService.selectAssList(drtCtrVO); //수정용
+    	List<AssCtrVO> assList = null;
+    	
+    	//기일변경 일자 정보 불러오기
+        List<PgrCmmVO> apmChgInfo = apmService.selectApmChgDateInfo(cmmVO);
+        model.addAttribute("apmChgInfo", apmChgInfo.get(0));
+    	
+    	//사건정보 불러오기
+    	PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
+    	drtCtrVO.setPrtclSeq(info.getPrtclSeq());
+    	
+    		
+		assList = drtCtrService.selectAssList(drtCtrVO4Chk);
+		
+		//조정조서 정보 불러오기
+        DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO4Chk);
+        model.addAttribute("drtCtrVO", resultDrtCtrVO);
+        
+        String pageUrl = "/kccadr/adjPgrMgr/drtCtr/drtCtrDetail"; //수정화면으로 이동한다.
+        
+      //송달정보 count 조회해오기
+        DlvinfoVO dlvInfoVO = new DlvinfoVO();
+        dlvInfoVO.setSrcCon("10");
+        dlvInfoVO.setSrcTxt(cmmVO.getAdrNo());
+        dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq());
+        dlvInfoVO.setAdrSn(cmmVO.getAdrSn());
+        dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_40);
+        int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO);
+        model.addAttribute("dlvCnt", dlvCnt);
+        
+        if(dlvCnt > 0) {
+        	model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO));
+        }
+        
+        model.addAttribute("egovCryptoUtil",egovCryptoUtil);
+        
+        model.addAttribute("assList", assList);
+        model.addAttribute("info", info);
+    	
+    	return pageUrl;
+    }
 }

src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -86,6 +87,40 @@ public class EntController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
 
+    /*
+ 	//개발, local oz 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPath']}")
+	private String ozDevPath;
+	*/
+
+ 	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
  	
     /**
      * 취하종결통보서 등록 Form TODO daenge 취하종결통보서 등록
@@ -317,6 +352,11 @@ public class EntController {
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrCncltbsReport.ozr";
         	String savePath = closeVO.getAdrSeq() + "/adrCncltbsReport.pdf";
+        	if(req.getServerName().contains("localhost")) {
+        		savePath = ozDevPdfSavePath	+	closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";
+        	}else {
+        		savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\"	+	closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
+        	}
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -326,7 +366,7 @@ public class EntController {
     	else{
     		String ozrFilePath = "/admin/adrCncltbsReport.ozr";
         	/*String savePath = closeVO.getAdrSeq() + "/adrCncltbsReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -409,12 +449,34 @@ public class EntController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrCncltbsReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "305050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);  
+    	
+    	/*
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
 
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrCncltbsReport.ozr";
         	String savePath = closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";
+        	savePath = ozDevPath	+	closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -423,13 +485,14 @@ public class EntController {
     	//실서버
     	else{
     		String ozrFilePath = "/admin/adrCncltbsReport.ozr";
-        	/*String savePath = closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
+        	*String savePath = closeVO.getAdrSeq() + "/ozFile/adrCncltbsReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrCncltbsReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
     	}
+    	*/
     	
     	
     	
@@ -438,6 +501,87 @@ public class EntController {
         return modelAndView;
     }
 
+    @SuppressWarnings("unchecked")
+	@RequestMapping(value = "entOzExport305050Ajax.do")
+    public ModelAndView entOzExport305050Ajax(
+    		@RequestBody CloseVO closeVO
+    		, ModelMap model
+    		, HttpServletRequest req) throws Exception {
+
+    	ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+    	
+        JSONObject jsEntInfo = new JSONObject();
+        JSONArray jsRespInfo = new JSONArray();		//피신청인 정보
+    	
+        CloseVO result = cmmService.selectCloseDoc(closeVO); //취하종결통보서 정보
+    	
+        
+    	if (result==null) {
+    		modelAndView.addObject("status", "SKIP");
+    		return modelAndView;
+    	}
+        
+        
+        //피신청인 처리
+        String[] arrResp = result.getResPonDentNm().split(",");
+        
+        for(String respName : arrResp) {
+        	
+        	JSONObject oj = new JSONObject();
+        	
+        	oj.put("rpplNm", respName);
+			jsRespInfo.add(oj);
+        	
+        }
+        
+    	jsEntInfo = parseJsonData(result);
+    	
+    	
+    	JSONObject jsObjData = new JSONObject();
+    	
+    	jsObjData.put("jsEntInfo", jsEntInfo);
+    	jsObjData.put("jsRespInfo", jsRespInfo);
+    	
+    	String repStr = StringUtil.getUrlString(jsObjData.toString());
+    	
+    	model.addAttribute("jsObjData", repStr);
+    	
+    	//오즈리포트 서버별 주소 셋팅해주기
+    	String serverName = req.getServerName();
+    	String ozServerNm = IpUtil.getOzServerName(serverName);
+    	model.addAttribute("ozServerNm", ozServerNm);
+    	
+    	/*
+    	 * 2022.01.06 우영두 추가
+    	 * 오즈 리포트 File Export 처리
+    	 * 
+    	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrCncltbsReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "305050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);  
+    	    	
+    	
+    	modelAndView.addObject("status", "OK");
+    	
+        return modelAndView;
+    }
 
     /**
      * 등록자, 수정자 정보 세팅
@@ -489,68 +633,70 @@ public class EntController {
 		
 		String atchFileId = "";
 		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 				
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
 				
 			}
+		}
 		
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!adrSn.equals("")) {
+		if(StringUtil.isNotEmpty(adrSn)) {
 			
 			oj.put("adrSn", adrSn);
 			
 		}
 		
-		if(!cctyTx.equals("")) {
+		if(StringUtil.isNotEmpty(cctyTx)) {
 			
 			oj.put("cctyTx", cctyTx);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!resPonDentNm.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			
 		}
 		
-		if(!resPonDentNmEtc.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNmEtc)) {
 			
 			oj.put("resPonDentNmEtc", resPonDentNmEtc);
 			
 		}
 
-		if(!closeCn1.equals("")) {
+		if(StringUtil.isNotEmpty(closeCn1)) {
 			
 			oj.put("closeCn1", closeCn1);
 			
 		}
 		
-		if(!atchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(atchFileId)) {
 			
 			String domain = "";
 			

src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java

@@ -13,7 +13,7 @@ import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageVO;
  * @description :  
  * @exmp_cd                             
  *  - 01 : 신청취지                         
- *  - 02 : 신청원인                         
+ *  - 02 : 신청이유                         
  *  - 03 : 의견                           
  *  - 04 : 답변서                          
  *  - 05 : 사건진행도움말      

src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalAppovManageServiceImpl.java

@@ -161,17 +161,20 @@ public class InternalAppovManageServiceImpl implements InternalApprovManageServi
 		switch (resultVO.get(0).getStatCd()) {
 			case KccadrConstants.ADR_JJOSU_APPR_COMP :
 				//조정조서 성립
-				endResult = "조정조서 성립";
+//				endResult = "조정조서 성립";
+				endResult = "성립(기일 합의)";
 				for(InternalApprovManageVO tmpVO2 : resultVO) {
 					//조정권고 성립
 					if(tmpVO2.getStatCd().equals(KccadrConstants.ADR_KKA_APPR_COMP)){
-						endResult = "조정권고 성립";
+//						endResult = "조정권고 성립";
+						endResult = "성립(권고 수락)";
 					}
 				}
 				break;
 			case KccadrConstants.ADR_JKKJS_APPR_COMP :
 				//직권조정 성립
-				endResult = "직권조정 성립";
+//				endResult = "직권조정 성립";
+				endResult = "성립(직권 결정)";
 				break;
 			case KccadrConstants.ADR_BSRTBS_APPR_COMP :
 				//불성립

src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java

@@ -5,8 +5,17 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Properties;
 
 import javax.annotation.Resource;
+import javax.mail.Authenticator;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -23,7 +32,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
-import ch.qos.logback.classic.Logger;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
@@ -33,6 +41,7 @@ import kcc.com.cmm.service.FileVO;
 import kcc.com.cmm.util.DateUtil;
 import kcc.com.cmm.util.IpUtil;
 import kcc.com.cmm.util.StringUtil;
+import kcc.com.utl.fcc.service.EgovStringUtil;
 import kcc.com.utl.user.service.CheckAdrProcessUtil;
 import kcc.kccadr.adjPgrMgr.apm.service.ApmService;
 import kcc.kccadr.adjPgrMgr.apm.service.ApmVO;
@@ -40,6 +49,8 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService;
 import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
 import kcc.kccadr.adjPgrMgr.drt.service.DrtService;
 import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
+import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService;
+import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO;
 import kcc.kccadr.adjPgrMgr.ent.service.EntService;
 import kcc.kccadr.adjPgrMgr.ent.service.EntVO;
 import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageService;
@@ -56,6 +67,7 @@ import kcc.kccadr.cmm.CmmUtil;
 import kcc.kccadr.cmm.KccadrConstants;
 import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
 import kcc.kccadr.ozSchd.web.OzSchdExportUtil;
+import kcc.kccadr.sendMgr.service.SendMgrService;
 import kcc.let.uss.umt.service.EgovUserManageService;
 import kcc.let.uss.umt.service.UserManageVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
@@ -111,12 +123,47 @@ public class InternalApprovManageController {
 	@Resource(name="adjRpplService")
 	private AdjRpplService adjRpplService;
 	
+	@Resource(name = "drtCtrService")
+    private DrtCtrService drtCtrService;
+	
+	@Resource(name = "SendMgrService")
+	private SendMgrService SendMgrService;
+	
 	// 실서버 개발서버 구분
 	private static String islocal;	//	/pdf/out/
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
     
  	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
+ 	
+ 	
     @RequestMapping(value = "/kccadr/adjPgrMgr/iam/internalApprovManageList.do")
     public String internalApprovManageList(
     		@ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO 
@@ -251,7 +298,7 @@ public class InternalApprovManageController {
         // 법인일 경우 법인명+대표자명 노출
 		AdjRpplVO rpplVO = adjRpplService.findOfRpplBizNm(info.getAdrSeq());
 		info.setRpplUsrTy(rpplVO.getRpplUsrTy());
-		info.setRpplBizNm(rpplVO.getRpplBizNm());
+		info.setRpplBizNm(egovCryptoUtil.decrypt(rpplVO.getRpplNm()));
         
         model.addAttribute("info", info);
         model.addAttribute("approvLine", approvLine);
@@ -337,6 +384,15 @@ public class InternalApprovManageController {
         model.addAttribute("aftThree", aftThree); 		//접수일로 3개월 뒤 날짜 정보
         //22.02.08 최고관리자의 경우 반려 결재 버튼 미노출 처리 
         model.addAttribute("auth", loginVO.getAuthority());
+        
+        DrtCtrVO drtCtrVO = new DrtCtrVO();
+        drtCtrVO.setAdrSeq(internalApprovManageVO.getAdrSeq());
+        drtCtrVO.setAdrSn(internalApprovManageVO.getAdrSn());
+        
+        //조정조서 뿌리기
+        DrtCtrVO drtCtrVO4Chk = drtCtrService.selectDrtCtrReportLast(drtCtrVO);
+        String drtCtrYn = drtCtrVO4Chk != null ? "Y":"N";
+        model.addAttribute("drtCtrYn", drtCtrYn);
         return "kccadr/adjPgrMgr/iam/internalApprovManageEndDetail";
     }
     
@@ -410,8 +466,50 @@ public class InternalApprovManageController {
 					kccadrMgrUdtService.updateAdrMgrUdt(arv
 							, s_adrHstryMgrSeq
 							);
+				}else if (	//2022-12-14 new one
+						arv.getStatCd().equals("201050")	//접수결재완료
+						) {
+					//pdf 문서를 만든다.
+			    	/*
+			    	 * 2022.01.06 우영두 추가
+			    	 * 오즈 리포트 File Export 처리
+			    	 * 
+			    	 * */
+					String serverName = request.getServerName();
+					String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+					
+			    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+			    	
+			    	JSONObject jsObjData	=	ozSchd.makeReqReport(
+			    				userId
+			    			, internalApprovManageVO.getAdrSeq()
+			    			, adjstReqService			    			
+			    			, fileService
+			    			, egovCryptoUtil
+			    			);
+			    	
+			    	ozSchd.checkOzEnvNMakePDF(
+			    			islocal
+			    			, internalApprovManageVO.getAdrSeq()
+			    			, "adjReqReport.ozr"			//oz template file
+			    			, ozDevPdfSavePath
+			    			, ozRealPdfSavePath
+			    			, jsObjData.toJSONString()
+			    			, serverName
+			    			//, "adjReqReport.pdf"			//oz to pdf save file name
+			    			, "201050.pdf"
+			    			, ozDevServerIp
+			    			, ozDevSchedulerIp
+			    			, ozRealServerIp
+			    			, ozRealSchedulerIp
+			    			, devServerCheckString
+			    			);
+					
 				}
 				
+				System.out.println("arv.getStatCd()");
+				System.out.println(arv.getStatCd());
+				
 			}else if("Y".equals(statInfo.getRejectYn())){
                 AdjReqMgrVO arv = new AdjReqMgrVO();
                 arv.setAdrSeq(internalApprovManageVO.getAdrSeq()); // 조정일련번호
@@ -420,6 +518,19 @@ public class InternalApprovManageController {
                 kccadrMgrUdtService.updateAdrMgrUdt(arv
                 		, s_adrHstryMgrSeq
                 		);
+            }else if(StringUtils.isNotEmpty(statInfo.getNextSbmtId())) {
+            	
+            	UserManageVO userManageVO = userManageService.selectUser(statInfo.getNextSbmtId());
+            	String address = userManageVO.getEmailAdres();
+            	try {
+            		emailSend(address);
+            	}catch (Exception e) {
+					// TODO: handle exception
+				}
+            	
+            	
+            	
+            	
             }
 			modelAndView.addObject("rs", (rs>0));
 			modelAndView.addObject("result", KccadrConstants.SUCCESS);
@@ -826,6 +937,11 @@ public class InternalApprovManageController {
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrFrontReport.ozr";
         	String savePath = cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png";
+        	if(req.getServerName().contains("localhost")) {
+        		savePath = ozDevPdfSavePath	+	cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png";
+        	}else {
+        		savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\"	+	cmmVO.getAdrSeq() + "\\ozFile\\adrFrontReport.png";
+        	}
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -835,7 +951,7 @@ public class InternalApprovManageController {
     	else{
     		String ozrFilePath = "/admin/adrFrontReport.ozr";
         	/*String savePath = cmmVO.getAdrSeq() + "/ozFile/adrFrontReport.png";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrFrontReport.png";
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + cmmVO.getAdrSeq() + "\\ozFile\\adrFrontReport.png";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -1017,6 +1133,11 @@ public class InternalApprovManageController {
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/adjReqReport.ozr";
         	String savePath = adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png";
+        	if(req.getServerName().contains("localhost")) {
+        		savePath = ozDevPdfSavePath	+	adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png";
+        	}else {
+        		savePath = "\\\\192.168.0.176\\shared_folder_176\\out\\"	+	adjReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.png";
+        	}
         	
         	String jsonData = jsObjData.toJSONString();
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -1026,7 +1147,7 @@ public class InternalApprovManageController {
     	else{
     		String ozrFilePath = "/adjReqReport.ozr";
         	/*String savePath = adjReqVO.getAdrSeq() + "/ozFile/adjReqReport.png";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + adjReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.png";
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + adjReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.png";
         	
         	String jsonData = jsObjData.toJSONString();
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -1091,12 +1212,13 @@ public class InternalApprovManageController {
 			
 			cmmVO.setMemGrade("01");
 			List<PgrCmmVO> resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO);
-			
+			if(resultStampInfo.size() > 0) {
 				if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 					
 					atchFileId = resultStampInfo.get(0).getAtchFileId();
 					
 				}
+			}
 			
 			//조정조사관 직인 이미지 불러오기
 			PgrCmmVO resultAdmStampInfo = cmmService.selectAdmAtchFileIdInfo(cmmVO);
@@ -1459,4 +1581,59 @@ public class InternalApprovManageController {
 		return adjstReqVO;
 	}
 	
+	private void emailSend(String address) {
+		String emailFrom = "no-reply@copyright.or.kr";	// 추후 globals.properties 를 이용하여 변경
+		String emailPs =  "Copycopy12!";				// 추후 globals.properties 를 이용하여 변경
+		
+		Properties props = new Properties();
+		props.put("mail.transport.protocol", "smtp");
+		props.put("mail.smtp.host", "smtp.gov-dooray.com");
+		props.put("mail.smtp.port", "465");
+		props.put("mail.smtp.auth", "true");
+		props.put("mail.smtp.ssl.enable", "true");
+		
+		props.put("mail.smtp.ssl.protocols", "TLSv1");
+		props.put("mail.smtp.ssl.protocols", "TLSv1.1");
+		props.put("mail.smtp.ssl.protocols", "TLSv1.2");
+		props.put("mail.debug", "true");
+		Authenticator authenticator = new Authenticator(){
+			protected PasswordAuthentication getPasswordAuthentication(){
+				return new PasswordAuthentication(emailFrom,emailPs);
+			}
+		};
+		
+		try {
+		Session session = Session.getInstance(props, authenticator) ;
+		InternetAddress fromAddress = new InternetAddress(emailFrom);
+		
+		String result = "";
+		String emailTo = "";
+		
+		AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO();
+		
+		adjReqMgrVO.setEmailTitle("전자조정시스템 결재 순서 입니다.");
+		adjReqMgrVO.setEmailSendContent("전자조정시스템 결재 대상자 입니다. 결재 목록을 확인해주세요.");
+		
+			emailTo = address;
+			InternetAddress toAddress   = new InternetAddress(emailTo);
+			MimeMessage message = new MimeMessage(session);
+			message.setFrom(fromAddress);
+			message.addRecipient(Message.RecipientType.TO, toAddress );
+			message.setSubject(adjReqMgrVO.getEmailTitle());
+			message.setContent(adjReqMgrVO.getEmailSendContent()," text/html; charset=KSC5601");
+			System.out.println("------------------ 메일발송 시작 ----------------");
+			Transport.send(message);
+			System.out.println("------------------ 메일발송 끝 ----------------");
+			
+			System.out.println("------------------ 메일발송Log 추가 시작----------------");
+			String encEmailFrom = egovCryptoUtil.encrypt(emailFrom);	// email 수신자 주소 암호화
+			String encEmailTo = egovCryptoUtil.encrypt(emailTo);		// email 발신자 주소 암호화
+			adjReqMgrVO.setEmailFrom(encEmailFrom);
+			adjReqMgrVO.setEmailTo(encEmailTo);
+			result = SendMgrService.insertAdrEmailLog(adjReqMgrVO);
+			System.out.println("------------------ 메일발송Log 추가 끝----------------");
+		} catch (Exception e) {
+		}
+	}
+    
 }

src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -93,6 +94,41 @@ public class OadController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
 
+    /*
+ 	//개발, local oz 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPath']}")
+	private String ozDevPath;
+	*/
+ 	
+ 	
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath; 	
+ 	
     /**
      * 직권조정결정서 등록 Form TODO daenge 직권조정결정서 등록
      *
@@ -476,12 +512,34 @@ public class OadController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrJkkjsReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "306050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);    	    	
+    	
+    	/*
     	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
     	//로컬, 개발 서버
     	if("local".equals(islocal)) {
     		String ozrFilePath = "/admin/adrJkkjsReport.ozr";
         	String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";
+        	savePath = ozDevPath	+	closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
@@ -490,13 +548,14 @@ public class OadController {
     	//실서버
     	else{
     		String ozrFilePath = "/admin/adrJkkjsReport.ozr";
-        	/*String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";*/
-        	String savePath = "\\\\192.168.39.125\\data3\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf";
+        	*String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf";
         	
         	String jsonData = repStr;
         	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
         	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
     	}
+    	*/
     	
     	
     	
@@ -505,6 +564,181 @@ public class OadController {
         return modelAndView;
     }
     
+    @SuppressWarnings("unchecked")
+	@RequestMapping(value = "oadOzExport306050Ajax.do")
+    public ModelAndView oadOzExport306050Ajax(
+    		@RequestBody CloseVO closeVO
+    		, ModelMap model
+    		, HttpServletRequest req
+    		) throws Exception {
+
+    	ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+    	
+        JSONObject jsOadInfo = new JSONObject();
+        JSONArray jsRespInfo = new JSONArray();		//피신청인 정보
+        JSONArray jsJoMemInfo = new JSONArray();	//조정위원 정보
+    	
+        CloseVO result = cmmService.selectCloseDoc(closeVO); //취하종결통보서 정보
+        
+    	if (result==null) {
+    		modelAndView.addObject("status", "SKIP");
+    		return modelAndView;
+    	}
+    	
+        //조정위원의 직인 이미지 불러오기
+		closeVO.setMemGrade("02");
+		closeVO.setMemDeptSeq(result.getMemDeptSeq());
+		List<PgrCmmVO> resultStampInfo = cmmService.selectAtchFileIdInfo(closeVO);
+		
+		String atchFileId = "";
+		int stmpCnt = resultStampInfo.size();
+		
+        //피신청인 리스트 처리
+        String[] arrResp = result.getResPonDentNm().split(",");
+        
+        for(String respName : arrResp) {
+        	
+        	JSONObject oj = new JSONObject();
+        	
+        	oj.put("rpplNm", respName);
+			jsRespInfo.add(oj);
+        	
+        }
+        if(result.getMemNames() != null) {
+        	
+	        //조정위원 리스트 처리
+		    String[] strMemName = result.getMemNames().split(",");
+		    
+		    for(String name : strMemName) {
+		    	
+		    	JSONObject ojs = new JSONObject();
+		    	
+		    	//조정위원 직인 이미지 경로 불러오기
+		    	for(int i=0; i<stmpCnt; i++) {
+		    		
+		    		String memName = resultStampInfo.get(i).getMemName();
+		    		
+		    		if(name.equals(memName)) {
+		    			
+		    			if(StringUtil.isNotEmpty(resultStampInfo.get(i).getAtchFileId())) {
+		    				
+		    				atchFileId = resultStampInfo.get(i).getAtchFileId();
+		    				
+		    			}
+		    			
+		    		}
+		    		
+		    	}
+		    	
+		    	String joStampPath = "";
+		    	String domain = "";
+		    	
+		    	if(!atchFileId.equals("")) {
+					
+					if ("real".equals(prodIsLocal)) {
+						
+						domain = "hosts_real";
+						
+					}else {
+						
+						domain = "host_dev";
+						
+					}
+					
+					joStampPath = domain + "&url&" + atchFileId;
+					
+				}
+		    	
+		    	ojs.put("memName", name);
+		    	ojs.put("joStampPath", joStampPath);
+		    	jsJoMemInfo.add(ojs);
+		    	
+		    }
+		    
+        }else {
+        	
+        	JSONObject ojs = new JSONObject();
+    		
+    		ojs.put("memName", "");
+    		jsJoMemInfo.add(ojs);
+        	
+        }
+        
+	    jsOadInfo = parseJsonData(result);
+    	
+    	JSONObject jsObjData = new JSONObject();
+    	
+    	jsObjData.put("jsOadInfo", jsOadInfo);			//직권조정 정보
+    	jsObjData.put("jsRespInfo", jsRespInfo);		//피신청인 정보
+    	jsObjData.put("jsJoMemInfo", jsJoMemInfo);		//조정위원 정보
+    	
+    	String repStr = StringUtil.getUrlString(jsObjData.toString());
+    	
+    	model.addAttribute("jsObjData", repStr);
+    	
+    	//오즈리포트 서버별 주소 셋팅해주기
+    	String serverName = req.getServerName();
+    	String ozServerNm = IpUtil.getOzServerName(serverName);
+    	model.addAttribute("ozServerNm", ozServerNm);
+    	
+    	/*
+    	 * 2022.01.06 우영두 추가
+    	 * 오즈 리포트 File Export 처리
+    	 * 
+    	 * */
+    	
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, closeVO.getAdrSeq()
+    			, "admin/adrJkkjsReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			//, "adjReqReport.pdf"			//oz to pdf save file name
+    			, "306050.pdf"
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);    	    	
+    	
+    	/*
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
+    	
+    	//로컬, 개발 서버
+    	if("local".equals(islocal)) {
+    		String ozrFilePath = "/admin/adrJkkjsReport.ozr";
+        	String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";
+        	savePath = ozDevPath	+	closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";
+        	
+        	String jsonData = repStr;
+        	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
+        	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
+    	}
+    	//실서버
+    	else{
+    		String ozrFilePath = "/admin/adrJkkjsReport.ozr";
+        	*String savePath = closeVO.getAdrSeq() + "/ozFile/adrJkkjsReport.pdf";*
+        	String savePath = "\\\\192.168.39.130\\data\\out\\" + closeVO.getAdrSeq() + "\\ozFile\\adrJkkjsReport.pdf";
+        	
+        	String jsonData = repStr;
+        	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
+        	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
+    	}
+    	*/
+    	
+    	
+    	
+    	modelAndView.addObject("status", "OK");
+    	
+        return modelAndView;
+    }
+    
     /**
      * 직권조정결정서 수정 TODO daenge 직권조정결정서 오즈리포트
      *
@@ -696,86 +930,88 @@ public class OadController {
 		
 		String atchFileId = "";
 		
+		if(resultStampInfo.size() > 0) {
 			if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) {
 				
 				atchFileId = resultStampInfo.get(0).getAtchFileId();
 				
 			}
+		}
 		
-		if(!adrNo.equals("")) {
+		if(StringUtil.isNotEmpty(adrNo)) {
 			
 			oj.put("adrNo", adrNo);
 			
 		}
 		
-		if(!adrSn.equals("")) {
+		if(StringUtil.isNotEmpty(adrSn)) {
 			
 			oj.put("adrSn", adrSn);
 			
 		}
 		
-		if(!cctyTx.equals("")) {
+		if(StringUtil.isNotEmpty(cctyTx)) {
 			
 			oj.put("cctyTx", cctyTx);
 			
 		}
 		
-		if(!memDeptNm.equals("")) {
+		if(StringUtil.isNotEmpty(memDeptNm)) {
 			
 			oj.put("memDeptNm", memDeptNm);
 			
 		}
 		
-		if(!memName.equals("")) {
+		if(StringUtil.isNotEmpty(memName)) {
 			
 			oj.put("memName", memName);
 			
 		}
 		
-		if(!applicantNm.equals("")) {
+		if(StringUtil.isNotEmpty(applicantNm)) {
 			
 			oj.put("applicantNm", applicantNm);
 			
 		}
 		
-		if(!resPonDentNm.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNm)) {
 			
 			oj.put("resPonDentNm", resPonDentNm);
 			
 		}
 		
-		if(!resPonDentNmEtc.equals("")) {
+		if(StringUtil.isNotEmpty(resPonDentNmEtc)) {
 			
 			oj.put("resPonDentNmEtc", resPonDentNmEtc);
 			
 		}
 		
-		if(!appDeDay.equals("")) {
+		if(StringUtil.isNotEmpty(appDeDay)) {
 			
 			oj.put("appDeDay", appDeDay);
 			
 		}
 		
-		if(!closeCn1.equals("")) {
+		if(StringUtil.isNotEmpty(closeCn1)) {
 			
 			oj.put("closeCn1", closeCn1);
 			
 		}
 		
-		if(!closeCn2.equals("")) {
+		if(StringUtil.isNotEmpty(closeCn2)) {
 			
 			oj.put("closeCn2", closeCn2);
 			
 		}
 
 
-		if(!closeCn3.equals("")) {
+		if(StringUtil.isNotEmpty(closeCn3)) {
 			
 			oj.put("closeCn3", closeCn3);
 			
 		}
 		
-		if(!atchFileId.equals("")) {
+		if(StringUtil.isNotEmpty(atchFileId)) {
 			
 			String domain = "";
 			

src/main/java/kcc/kccadr/adjPgrMgr/ojct/web/OjctMgrController.java

@@ -147,20 +147,22 @@ public class OjctMgrController {
 			
 		}
 		
-		String atchFileId = ""; 
-		final Map<String, MultipartFile> files = multiRequest.getFileMap();
-		if (!files.isEmpty()) {
-			//조정신청_로 첨부파일 네이밍
-			List<FileVO> result = fileUtil.parseFileInf(files, "이의 신청_", 0, "", "", "");
-			atchFileId = fileMngService.insertFileInfs(result);
-			//첨부파일Id(atchFileId)를 해당 VO atchFileId변수에 저장
-			ojctMgrVO.setAtchFileId(atchFileId);
-		}
+//		String atchFileId = ""; 
+//		final Map<String, MultipartFile> files = multiRequest.getFileMap();
+//		if (!files.isEmpty()) {
+//			//조정신청_로 첨부파일 네이밍
+//			List<FileVO> result = fileUtil.parseFileInf(files, "이의 신청_", 0, "", "", "");
+//			atchFileId = fileMngService.insertFileInfs(result);
+//			//첨부파일Id(atchFileId)를 해당 VO atchFileId변수에 저장
+//			ojctMgrVO.setAtchFileId(atchFileId);
+//		}
 		
+		System.out.println(" + ojctMgrVO.setAtchFileId() :: " + ojctMgrVO.getAtchFileId());
+//		
 		//사용자 유니크 아이디 받아오기 
 		ojctMgrVO.setLastUpdusrId(userId);
 		ojctMgrVO.setFrstRegisterId(userId);
- 		ojctMgrVO.setAtchFileId(atchFileId);
+// 		ojctMgrVO.setAtchFileId(atchFileId);
 
  		if(ojctMgrVO.getAdrSeq() != null) {
  			

src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineService.java

@@ -39,4 +39,7 @@ public interface AdjReqMgrOffLineService {
 	String selectAdjstReqMgrOffStatCdYn(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception;
 
 	List<String> findByApprDeList();
+	
+	//관리자 보완완료 상태변경 수정 처리 
+	int updateAdjReqMgrState(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception;
 }

src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java

@@ -31,7 +31,7 @@ public class AdjReqMgrOffLineVO  extends ComDefaultVO implements Serializable {
 	private String statCd = ""; // 조정사건상태
 	private String reqOlCd = ""; // 온_오프라인_신청구분
 	private String reqCn1 = ""; // 신청취지
-	private String reqCn2 = ""; // 신청원인
+	private String reqCn2 = ""; // 신청이유
 	private String reqTy = ""; // 신청유형
 	private String ccTy = ""; // 저작물종류
 	private String sbmtYn = ""; // 제출여부
@@ -58,6 +58,7 @@ public class AdjReqMgrOffLineVO  extends ComDefaultVO implements Serializable {
 	private String rpplTy = ""; // 관리인구분
 	private String agntYn = ""; // 조정기일대리여부
 	private String rpplUsrTy = ""; // 관리인분류
+	private String rpplUsrDiv = ""; // 관리인분류
 	private String adrOlYn = ""; // 전자조정진행여부
 	private String rpplId = ""; // 조정사건관리인ID
 	private String rpplNm = ""; // 이름_대표자
@@ -403,6 +404,12 @@ public class AdjReqMgrOffLineVO  extends ComDefaultVO implements Serializable {
 	public void setRpplUsrTy(String rpplUsrTy) {
 		this.rpplUsrTy = rpplUsrTy;
 	}
+	public String getRpplUsrDiv() {
+		return rpplUsrDiv;
+	}
+	public void setRpplUsrDiv(String rpplUsrDiv) {
+		this.rpplUsrDiv = rpplUsrDiv;
+	}
 	public String getAdrOlYn() {
 		return adrOlYn;
 	}

src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java

@@ -684,7 +684,6 @@ public String insertAdjReqMgrRpplReq(AdjReqMgrOffLineVO adjReqMgrOffLineVO) thro
 		adjReqMgrOffLineVO.setRpplRealPost(rpplRealPost);
 		adjReqMgrOffLineVO.setRpplRealAddr(rpplRealAddr);
 		adjReqMgrOffLineVO.setRpplRealAddrDtl(rpplRealAddrDtl);
-		
 		//디비에 수정해 주기
 		int resultCnt = adjReqMgrOffLineDAO.updateAdjReqMgrOffRppl(adjReqMgrOffLineVO);
 		
@@ -1119,4 +1118,77 @@ public String insertAdjReqMgrRpplReq(AdjReqMgrOffLineVO adjReqMgrOffLineVO) thro
 		return adjReqMgrOffLineDAO.findByApprDeList();
 	}
 
+
+	@Override
+	public int updateAdjReqMgrState(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception {
+		int rs = 0;
+		
+		// 조정사건이력업데이트
+    	{
+    		AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO();
+    		adjReqMgrVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq());
+    		adjReqMgrVO.setAdrSn(adjReqMgrOffLineVO.getAdrSn());
+    		adjReqMgrVO.setLastUpdusrId(adjReqMgrOffLineVO.getLastUpdusrId());
+    		adjReqMgrVO.setStatCd(KccadrConstants.ADR_REQ_COMP);
+    		
+    		adjReqMgrVO = checkAdrProcessUtil.getAdrHstryCn(adjReqMgrVO); // 이력 내용 확인
+    		
+    		//하기 내용으로 변경
+    		CmmnDetailCodeVO cmmnDetailCodeVO = new CmmnDetailCodeVO();  
+    		cmmnDetailCodeVO.setCodeId("CC022");
+    		cmmnDetailCodeVO.setCode(KccadrConstants.ADR_REQ_COMP);
+    		CmmnDetailCode  cmmnDetailCode = new CmmnDetailCode();
+    		cmmnDetailCode = cmmnDetailCodeManageService.selectCmmnDetailCodeDetail(cmmnDetailCodeVO);
+    		
+    		adjReqMgrVO.setHstryCn(cmmnDetailCode.getCodeNm());
+    		
+    		System.out.println("cmmnDetailCode.getCodeNm()");
+    		System.out.println(cmmnDetailCode.getCodeNm());
+    		
+    		try {
+    			adjReqMgrDAO.insertAdrHstry(adjReqMgrVO); // 이력 등록
+    			rs++;
+    		}catch(Exception ex) {
+    			ex.printStackTrace();
+    		}
+    		
+    	}
+    	
+    	//조정 사건 상태(stat_cd) 업데이트
+    	{
+    		AdjstReqVO adjstReqVO = new AdjstReqVO();
+    		adjstReqVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq());
+    		adjstReqVO.setLastUpdusrId(adjReqMgrOffLineVO.getLastUpdusrId());
+    		adjstReqVO.setEdtSn(adjReqMgrOffLineVO.getEdtSn());
+    		adjstReqVO.setEdtTy(adjReqMgrOffLineVO.getEdtTy());
+    		
+			// 조정 마스터 정보 업데이트
+    		adjstReqVO.setStatCd(KccadrConstants.ADR_REQ_COMP);	// 제출완료상태
+			if(StringUtils.isNotBlank(adjstReqVO.getEdtSn()) ){
+				adjstReqVO.setEdtStatus("02");	// 수정, 보완 완료상태로 변경
+				adjstReqDAO.updateAdrMgrEditInfo(adjstReqVO);
+				//adr_hstry_mgr에 값 넣기	-	시작
+    			adrHstryMgrDAO.insert4Func(adjReqMgrOffLineVO.getAdrSeq(), "조정신청서 보완완료-관리자"
+    					, adjReqMgrOffLineVO.getStatCd()
+    					, adjReqMgrOffLineVO.getFrstRegisterId()
+    					, adjReqMgrOffLineVO.getLastUpdusrId()
+    					
+    					, ""	//, String p_adrHstryMgrSeq
+    					, "U"	//, String p_useCd		I/U/UI/II/RE
+    					, "ADR_MGR_MASTER"	//, String p_tableName
+    					, ""	//, String p_updateQuery
+    					
+    					);
+    			//adr_hstry_mgr에 값 넣기	-	끝
+    			
+    			// 보완요청을 했을경우 상태를 보완요청완료로 변경
+				if("S".equals(adjstReqVO.getEdtTy())){
+					adjstReqVO.setStatCd(KccadrConstants.ADR_SUPP_COMP);
+				}
+			}
+			rs += adjstReqDAO.updateAdrMgrMasterComplete(adjstReqVO);
+    	}
+		return rs;
+	}
+	
 }

src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java

@@ -978,6 +978,22 @@ public class AdjReqMgrOffLineController {
 		return modelAndView;
 	}
 	
+	
+	/*
+	 * 
+	 * 조정신청 양식에 맞는 첨부파일을
+	 * OCR로 읽어온다
+	 * 
+	 * */
+	@RequestMapping("/kccadr/adjReqMgOff/adjReqMgrOffOcrPopAjax.do")
+	public String adjReqMgrOffOcrPopAjax(@ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO, ModelMap model) throws Exception {
+		
+//		AdjReqMgrOffLineVO master = adjReqMgrOffLineService.selectAdjstReqMgrOffMasterInfo(adjReqMgrOffLineVO);
+//		model.addAttribute("master", master);
+
+		return "kccadr/adjReqMgrOff/popup/adjReqMgrOffOcrPop";
+	}
+	
 	public void decryptInfomation(List<AdjReqMgrOffLineVO> list, AdjReqMgrOffLineVO info){
 		if(CollectionUtils.isNotEmpty(list)){
 			for(AdjReqMgrOffLineVO model : list){

src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java

@@ -55,7 +55,7 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 	private String statTx = ""; // 조정사건상태
 	private String reqOlCd = ""; // 온_오프라인_신청구분
 	private String reqCn1 = ""; // 신청취지
-	private String reqCn2 = ""; // 신청원인
+	private String reqCn2 = ""; // 신청이유
 	private String reqTy = ""; // 신청유형
 	private String ccTy = ""; // 저작물종류
 	private String sbmtYn = ""; // 제출여부

src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java

@@ -116,8 +116,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		List<AdjReqMgrPastVO> resultAdjReqMgrList = new ArrayList<AdjReqMgrPastVO>();
 		resultAdjReqMgrList = adjReqMgrPastDAO.selectAdjReqMgrListInfo(adjReqMgrPastVO);
 		
-		if(resultAdjReqMgrList != null) {
-			
+//		if(resultAdjReqMgrList != null) {
+		if(resultAdjReqMgrList.size() > 0) {
 			
 			String rpplTy = resultAdjReqMgrList.get(0).getRpplTy();
 			int listCnt = resultAdjReqMgrList.size();
@@ -1028,25 +1028,32 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		List<AdjReqMgrPastVO> adjReqMgrPastList = adjReqMgrPastDAO.selectAdjReqMgrPastList(adjReqMgrPastVO); 
 		
 		// 신청인 피신청인 select
-		adjReqMgrPastList.stream()
-						.forEach(t-> t.setAdjReqMgrVoList(adjReqMgrPastDAO.selectRpplList(t)));
+//		adjReqMgrPastList.stream()
+//						.forEach(t-> t.setAdjReqMgrVoList(adjReqMgrPastDAO.selectRpplList(t)));
 		
+		try {
+			// 신청인 피신청인 select
+			adjReqMgrPastList.stream()
+							.forEach(t-> {
+								t.setAdjReqMgrVoList(adjReqMgrPastDAO.selectRpplList(t));
+								/* 
+								 * 조정결과 상태값 select
+								 * code -> text 변환 
+								 * */
+								if(StringUtils.isNotEmpty(t.getStatCd())) {
+									t.setStatTx(HstryStatEnumVO.getStatCdSwitching(t.getStatCd()));
+								}
+								// 리스트에서 피신청인 갯수 count
+								t.setpRpplCnt(t.getAdjReqMgrVoList().stream()
+										  .filter(c ->  "20".equals(c.getRpplTy()))
+										  .count());
 								
 								/* 
 								 * 조정결과 상태값 select
 								 * code -> text 변환 
 								 * */
-		adjReqMgrPastList.stream()
-						.forEach(t-> {
-							if(StringUtils.isNotEmpty(t.getStatCd()))
-								t.setStatTx(HstryStatEnumVO.getStatCdSwitching(t.getStatCd()));
-						});
-
-		// 리스트에서 피신청인 갯수 count
-		adjReqMgrPastList.stream().forEach(t-> {
-			t.setpRpplCnt(t.getAdjReqMgrVoList().stream()
-					  .filter(c ->  "20".equals(c.getRpplTy()))
-					  .count());
+								if(StringUtils.isNotEmpty(t.getAssPstUsrNm()))
+									t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm()));
 							});
 			
 			// 외 N명 로직
@@ -1063,11 +1070,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 						PrpplNm =  adjRppl.getRpplNm();
 						break;
 					}
-			}
 					// 신청인 이름 추출
-			for(AdjReqMgrPastVO adjRppl : adjRpplVO.getAdjReqMgrVoList()) 
-			{
-				if("10".equals(adjRppl.getRpplTy()))
+					else if("10".equals(adjRppl.getRpplTy()))
 					{
 						adjRpplVO.setRpplNm(egovCryptoUtil.decrypt(adjRppl.getRpplNm()));
 						break;
@@ -1082,17 +1086,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 				adjRpplVO.setPrpplNm(egovCryptoUtil.decrypt(PrpplNm) + etcStr);
 			}
 			
-
-		/* 
-		 * 조정결과 상태값 select
-		 * code -> text 변환 
-		 * */
-		try {
-			adjReqMgrPastList.stream()
-			.forEach(t-> {
-				if(StringUtils.isNotEmpty(t.getAssPstUsrNm()))
-					t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm()));
-			});
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java

@@ -2,7 +2,6 @@ package kcc.kccadr.adjReqMgrPast.web;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -13,7 +12,6 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.env.SystemEnvironmentPropertySource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -24,12 +22,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.dreamsecurity.magicline.util.Log;
-
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.LoginVO;
-import kcc.com.cmm.service.AdrInnorixFileVO;
 import kcc.com.cmm.service.EgovCmmUseService;
 import kcc.com.cmm.service.EgovFileMngService;
 import kcc.com.cmm.service.EgovFileMngUtil;
@@ -122,6 +117,7 @@ public class AdjReqMgrPastController {
 	@RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastBasicRegist.do")
 	public String adjReqMgrPastBasicRegist(@ModelAttribute("searchVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception {
 		
+		
 		//TODO TEST 
 //		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
 		
@@ -137,7 +133,7 @@ public class AdjReqMgrPastController {
 		int reqPerTotCnt = 0;
 	
 		if(StringUtils.isNotBlank(adjReqMgrPastVO.getAdrSeq())) {
-			
+			System.out.println("=========================");
 			//오프라인 조정 신청 정보 불러오기.
 			AdjReqMgrPastVO resultAdjReqMgrPast = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO);
 			AdjReqMgrPastVO statCdInfo = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO);
@@ -650,7 +646,13 @@ public class AdjReqMgrPastController {
 		
 		//사용자 유니크 아이디 받아오기
 		adjReqMgrPastVO.setFrstRegisterId(userId);
+		if("".equals(adjReqMgrPastVO.getFrstRegistPnttm())) {
+			adjReqMgrPastVO.setFrstRegistPnttm(null);
+		}
 		adjReqMgrPastVO.setLastUpdusrId(userId);
+		if("".equals(adjReqMgrPastVO.getLastUpdtPnttm())) {
+			adjReqMgrPastVO.setLastUpdtPnttm(null);
+		}
 		//조정신청, 대리인, 신청인 등록 처리
 		return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO);
 	}

src/main/java/kcc/kccadr/adjcclt/service/AdjstConciliatorVO.java

@@ -318,6 +318,8 @@ public class AdjstConciliatorVO extends ComDefaultVO implements Serializable {
     private String openYn;		//공개여부
     private String prtclCn;		//조서내용
     
+    private String nextSbmtId;
+    
 
     public String getAdrSeq() {
         return adrSeq;
@@ -1873,6 +1875,15 @@ public class AdjstConciliatorVO extends ComDefaultVO implements Serializable {
 		this.cmntOftenFlag = cmntOftenFlag;
 	}
 
+	public String getNextSbmtId() {
+		return nextSbmtId;
+	}
+
+	public void setNextSbmtId(String nextSbmtId) {
+		this.nextSbmtId = nextSbmtId;
+	}
+	
+	
 	
 	
 	

src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java

@@ -1,10 +1,12 @@
 package kcc.kccadr.adjcclt.web;
 
+import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.TextStyle;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -59,6 +61,7 @@ import kcc.kccadr.cmm.RestResponse;
 import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
 import kcc.kccadr.ojct.service.OjctService;
 import kcc.kccadr.ojct.service.OjctVO;
+import kcc.kccadr.sch.service.SchduleManageService;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 /**
@@ -126,6 +129,8 @@ public class AdjstConciliatorController {
 	@Resource(name="adrHstryMgrService")
 	private AdrHstryMgrService adrHstryMgrService;
 	
+    @Resource(name = "schduleManageService")
+    private SchduleManageService schduleManageService;
 	/**
 	 * 조정위원 대시보드 화면
 	 */
@@ -1038,6 +1043,58 @@ public class AdjstConciliatorController {
 		return "/web/kccadr/adjcclt/popup/adjstOjctDetail";
 	}
 
+	@RequestMapping("/kccadr/adjcclt/ai/insertschMgrAjax.do")
+	public ModelAndView insertschMgrAjax( @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO) throws Exception {
+
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+
+		try {
+			String tilte = adjstConciliatorVO.getAdrNo()+" "+adjstConciliatorVO.getAdrSn()+"차 기일";
+			String id = adjstConciliatorVO.getAdrAdmId();
+			String dntDay = adjstConciliatorVO.getAppDe();
+			dntDay = dntDay.replaceAll("/", "-");
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+			Date formatDate = simpleDateFormat.parse(dntDay);
+			dntDay = simpleDateFormat.format(formatDate);
+			
+			schduleManageService.insertSchManageByDnt(tilte, dntDay, id);
+		
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+		}
+		modelAndView.addObject("result", "SUCCESS");
+	
+		return modelAndView;
+
+	}
+	
+	@RequestMapping("/kccadr/adjcclt/ai/insertschMgrChgAjax.do")
+	public ModelAndView insertschMgrChgAjax( @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		try {
+			String tilte = adjstConciliatorVO.getAdrNo()+" "+adjstConciliatorVO.getAdrSn()+"차 기일 변경";
+			String id = adjstConciliatorVO.getAdrAdmId();
+			String dntDay = adjstConciliatorVO.getAppDe();
+			dntDay = dntDay.replaceAll("/", "-");
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+			Date formatDate = simpleDateFormat.parse(dntDay);
+			dntDay = simpleDateFormat.format(formatDate);
+			
+			schduleManageService.insertSchManageByDnt(tilte, dntDay, id);
+			
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+		}
+		modelAndView.addObject("result", "SUCCESS");
+		
+		return modelAndView;
+		
+	}
+	
 	public void decryptInfomation(List<AdjstConciliatorVO> list, AdjstConciliatorVO info) {
 		if (CollectionUtils.isNotEmpty(list)) {
 			for (AdjstConciliatorVO model : list) {

src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java

@@ -34,6 +34,7 @@ import egovframework.rte.fdl.string.EgovStringUtil;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.LoginVO;
 import kcc.com.cmm.util.StringUtil;
+import kcc.com.cmm.util.StringUtil2;
 import kcc.kccadr.accdnt.ars.service.AdjstReqStatusService;
 import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO;
 import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService;
@@ -128,6 +129,34 @@ public class AdjClsMgrController {
 			log.debug("commandMap : {}", commandMap);
 			log.debug("commandMap.isEmpty() : {}", commandMap.isEmpty());
 			
+			//조정조사관, 조정팀장일 시 조정조사관 조회 구분 추가
+			LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+	    	String userId = loginVO == null ? "" : loginVO.getUniqId().toString().trim();
+//	    	commandMap.put("searchLoginId", userId);
+//	    	
+//	        if(("".equals(commandMap.get("searchEachAdrAdminYn")) ||  commandMap.get("searchEachAdrAdminYn") == null)&& "ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
+//	        	commandMap.put("searchEachAdrAdminYn", "Y");
+//	        }
+//	        
+//	        if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
+//	        	commandMap.put("searchEachAdrAdminBtnYn", "Y");
+//	        }
+	        
+	        //담당사건만 보기 여부 - 기본 : 전체 조회 / ROLE_ADR_ADMIN 권한에 조정조사관 or 조정팀장은 기본 : 담당사건만 조회
+	    	// -> 2023.10.12 전체가 초기값으로 조회가 되도록 수정요청
+	        if(StringUtil2.isEmpty((String)commandMap.get("searchLoginId"))) {
+	        	commandMap.put("searchLoginId", "all");
+	        	/*if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
+	        		commandMap.put("searchEachAdrAdminYn", "Y");
+	        		commandMap.put("searchLoginId", userId);
+	            }*/
+	        }else {
+	        	if(!"all".equals((String)commandMap.get("searchLoginId"))){
+	        		commandMap.put("searchEachAdrAdminYn", "Y");
+	        	}
+	        }
+	        
+	        
 			//기본값설정
 			commandMap.put("rangeView", "kcc_adr_advc");
 			String searchWrd =  (String) commandMap.get("q");
@@ -191,6 +220,8 @@ public class AdjClsMgrController {
 			
 			model.addAttribute("commandMap", commandMap);
 			model.addAttribute("totalRecordCount", totalRecordCount);
+			//조정조사관 리스트
+	        model.addAttribute("adrAdminList", cmmService.selectPgrCmmAdrAdminList());
 		}catch(Exception ex) {
 			ex.printStackTrace();
 		}

src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java

@@ -41,7 +41,7 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
 	private String statCd = ""; // 조정사건상태
 	private String reqOlCd = ""; // 온_오프라인_신청구분
 	private String reqCn1 = ""; // 신청취지
-	private String reqCn2 = ""; // 신청원인
+	private String reqCn2 = ""; // 신청이유
 	private String reqTy = ""; // 신청유형
 	private String ccTy = ""; // 저작물종류
 	private String sbmtYn = ""; // 제출여부
@@ -149,6 +149,8 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
 
 	private String rpplUsrTyNm;
 	
+	private String rpplUsrDivNm;
+				
 	private String edtSn;
 
 	private String edtTy;
@@ -256,7 +258,64 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
 	private String userId;
 	private String smsSendTypeCd; // 발송유형 - CC052
 	private String certNum;  // 인증번호
+	private String[] phoneList; //수신번호 리스트
 	
+	//저작위 email 발송 
+	/*
+	 * emailTy ( 확인필요 )
+	 * 	000 - 관리자발송
+	 * 	001 - 보완요청
+	 * 	002 - 수수료납부요청
+	 * 	003 - 조정접수
+	 * 	004 - 기일통지서승인
+	 * 	005 - 기일조서 결재완료
+	 * 	006 - 조정조서 결재완료
+	 * 	007 - 직권조정결정서 확인완료
+	 * 	008 - 없음
+	 * 	009 - 조정불성립
+	 * 
+	 * */
+	
+	private String[] emailList;		// 수신이메일 리스트
+	private String emailTitle;		// 이메일 제목
+	private String emailContent;	// 이메일 내용
+	private String emailTy;			// 이메일 발송 유형
+	private String emailTo;			// 이메일 발송 수신자
+	private String emailFrom;		// 이메일 발송 발신자
+	private String emailSendContent;		// 이메일 발송내용
+	
+	private String adminPhone; //관리자 전화번호
+	
+	public String getEmailSendContent() {
+		return emailSendContent;
+	}
+	public void setEmailSendContent(String emailSendContent) {
+		this.emailSendContent = emailSendContent;
+	}
+	public String getEmailTitle() {
+		return emailTitle;
+	}
+	public void setEmailTitle(String emailTitle) {
+		this.emailTitle = emailTitle;
+	}
+	public String getEmailContent() {
+		return emailContent;
+	}
+	public void setEmailContent(String emailContent) {
+		this.emailContent = emailContent;
+	}
+	public String[] getEmailList() {
+		return emailList;
+	}
+	public void setEmailList(String[] emailList) {
+		this.emailList = emailList;
+	}
+	public String[] getPhoneList() {
+		return phoneList;
+	}
+	public void setPhoneList(String[] phoneList) {
+		this.phoneList = phoneList;
+	}
 	public AdjReqMgrVO getAdrVO() {
 		return adrVO;
 	}
@@ -806,6 +865,14 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
 		this.rpplUsrTyNm = rpplUsrTyNm;
 	}
 
+	public String getRpplUsrDivNm() {
+		return rpplUsrDivNm;
+	}
+	
+	public void setRpplUsrDivNm(String rpplUsrDivNm) {
+		this.rpplUsrDivNm = rpplUsrDivNm;
+	}
+	
 	public String getEdtSn() {
 		return edtSn;
 	}
@@ -1221,6 +1288,31 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
 	public void setCertNum(String certNum) {
 		this.certNum = certNum;
 	}
+	public String getEmailTy() {
+		return emailTy;
+	}
+	public void setEmailTy(String emailTy) {
+		this.emailTy = emailTy;
+	}
+	public String getEmailTo() {
+		return emailTo;
+	}
+	public void setEmailTo(String emailTo) {
+		this.emailTo = emailTo;
+	}
+	public String getEmailFrom() {
+		return emailFrom;
+	}
+	public void setEmailFrom(String emailFrom) {
+		this.emailFrom = emailFrom;
+	}
+	public String getAdminPhone() {
+		return adminPhone;
+	}
+	public void setAdminPhone(String adminPhone) {
+		this.adminPhone = adminPhone;
+	}
+	
 	
 	
 }

src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java

@@ -133,6 +133,44 @@ public class AdjReqMgrController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
 
+    
+ 	//개발, local oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devServerIp']}")
+	private String ozDevServerIp;
+
+ 	//개발, local oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.devSchedulerIp']}")
+	private String ozDevSchedulerIp;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devPdfSavePath']}")
+	private String ozDevPdfSavePath;
+ 	
+ 	//개발, local oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.devServerCheckString']}")
+	private String devServerCheckString;
+ 	
+ 	//real oz 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realServerIp']}")
+	private String ozRealServerIp;
+
+ 	//real oz 스케쥴러 서버 IP + port
+ 	@Value("#{globalSettings['Globals.oz.realSchedulerIp']}")
+	private String ozRealSchedulerIp;
+ 	
+ 	//real oz to pdf 저장 경로
+ 	@Value("#{globalSettings['Globals.oz.realPdfSavePath']}")
+	private String ozRealPdfSavePath;
+ 	
+ 	/*
+ 	Globals.oz.devServerIp=192.168.0.176:8091
+ 			Globals.oz.devSchedulerIp=192.168.0.176
+ 			Globals.oz.devPath=/usr/local/tomcat/webapps/data
+ 			Globals.oz.realServerIp=192.168.39.145:8080
+ 			Globals.oz.realSchedulerIp=192.168.39.147
+ 			Globals.oz.realPath=\\data3\\out
+ 			*/		 	
+ 	
 	/**
 	 * 조정신청 정보 입력 화면
 	 */
@@ -727,109 +765,29 @@ public class AdjReqMgrController {
 		//로그인 권한정보 불러오기
     	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
     	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
-		//System.out.println("adjstReqVO.getAdrSeq()");
-		//System.out.println(adjstReqVO.getAdrSeq());
-		//String userId = "123";
     	
     	AdjstReqVO adjstMsrMasterVO = new AdjstReqVO();
     	//adjstMsrMasterVO.setAdrSeq("ADR_0000000000000381");
     	adjstMsrMasterVO.setAdrSeq(adjstReqVO.getAdrSeq());
-    	JSONObject jsMaster = new JSONObject();
-    	JSONObject jsDepInfo = new JSONObject();
-    	JSONObject jsReqInfo = new JSONObject();
-    	JSONArray jsRespInfo = new JSONArray();
-    	JSONArray jsAtchFileInfo = new JSONArray();
     	
-    	if(!userId.equals("")) {
+    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
     	
-    		//임시 저장중인 데이터가 있는지 확인 
-    		//조정사건 번호 조회하기
-    		AdjstReqVO adjMsrMaster = adjstReqService.selectAdjsMgrMasterByAdrSeq(adjstMsrMasterVO);
+    	JSONObject jsObjData	=	ozSchd.makeReqReport(
+    				userId
+    			, adjstReqVO.getAdrSeq()
+    			, adjstReqService
+    			//, adjstReqVO
+    			, fileService
+    			, egovCryptoUtil
+    			);
     	
-    		jsMaster = parseJsonData(adjMsrMaster);
+    	JSONObject jsMaster 		= (JSONObject) jsObjData.get("jsMaster");
+    	JSONObject jsDepInfo 		= (JSONObject) jsObjData.get("jsDepInfo");
+    	JSONObject jsReqInfo 		= (JSONObject) jsObjData.get("jsReqInfo");
     	
-			//첨부파일이 있는경우 파일 이름 처리해주기
-			if(adjMsrMaster.getAtchFileId() != null || adjMsrMaster.getAtchFileId().equals("")) {
-				FileVO fileVO = new FileVO();
-				fileVO.setAtchFileId(adjMsrMaster.getAtchFileId());
-				List<FileVO> fileList = fileService.selectFileInfs(fileVO);
-				JSONObject jsFile = new JSONObject();
+    	JSONArray	jsRespInfo 		= (JSONArray) jsObjData.get("jsRespInfo");
+    	JSONArray	jsAtchFileInfo 	= (JSONArray) jsObjData.get("jsAtchFileInfo");
     	
-				for(int i=0; i< fileList.size(); i++) {
-					JSONObject oj = new JSONObject();
-					String fileNm = fileList.get(i).getOrignlFileNm();
-					
-					oj.put("atchFile", fileNm);
-					jsAtchFileInfo.add(oj);
-				}
-			}
-    		
-    		if(adjMsrMaster != null) {
-				// 조정사건번호 입력해주기
-				adjstReqVO.setAdrSeq(adjMsrMaster.getAdrSeq());
-    			
-    			//임시저장중인 대리인, 신청인, 피신청인 정보 리스트로 불러오기
-    			List<AdjstReqVO> adjstReqUserList = adjstReqService.selectAdjsReqUserListByadjSeq(adjMsrMaster);
-    			
-    			if(adjstReqUserList.size() > 0) { //신청인 정보가 있는 경우 실행
-    				
-    				//신청 대리인이 포함되어 있는지 확인 - 리스트 정렬을 rpplTy desc 정렬을 해서 첫번째 리스트가 대리인이 있는지 확인
-        			String rpplTy = adjstReqUserList.get(0).getRpplTy();
-        			int listCnt = adjstReqUserList.size();
-        			
-        			AdjstReqVO adjReqDepInfo = new AdjstReqVO();	//대리인 정보
-        			AdjstReqVO adjReqInfo = new AdjstReqVO();		//신청인 정보
-        			AdjstReqVO adjReqRespInfo = new AdjstReqVO();	//피신청인 정보
-        			
-        			for(int i=0; i < listCnt; i++) {
-        				
-        				AdjstReqVO temp = new AdjstReqVO();
-        				String rpplTy1 = adjstReqUserList.get(i).getRpplTy();
-        				
-        				if(rpplTy1.equals("30")) {	//대리인 정보 담기
-        					
-        					//신청 대리인 정보 추가해주기
-            				temp = adjstReqUserList.get(i);
-            				adjReqDepInfo.getAdjstReqVoList().add(decryptAdjReqMgrReturn(temp));
-            				
-            				jsDepInfo = parseJsonData(temp);
-            				
-        				}else if(rpplTy1.equals("10")) {	//신청인 정보 담기
-        					
-        					//신청인 정보 추가해주기
-            				temp = adjstReqUserList.get(i);
-            				adjReqInfo.getAdjstReqVoList().add(decryptAdjReqMgrReturn(temp));
-            				jsReqInfo = parseJsonData(temp);
-            				
-        				}else if(rpplTy1.equals("20")) {
-        					
-        					//피신청인 정보 추가해주기
-            				temp = adjstReqUserList.get(i);
-            				adjReqRespInfo.getAdjstReqVoList().add(decryptAdjReqMgrReturn(temp));
-            				
-            				JSONObject jsTemp = new JSONObject();
-            				
-            				jsTemp = parseJsonData(temp);
-            				jsRespInfo.add(jsTemp);
-            				
-        				}
-        				
-        			}
-        			
-    			}
-    			
-    		}
-    		
-    	}
-    	
-    	
-    	JSONObject jsObjData = new JSONObject();
-    	
-    	jsObjData.put("jsMaster", jsMaster);
-    	jsObjData.put("jsDepInfo", jsDepInfo);
-    	jsObjData.put("jsReqInfo", jsReqInfo);
-    	jsObjData.put("jsRespInfo", jsRespInfo);
-    	jsObjData.put("jsAtchFileInfo", jsAtchFileInfo);
     	
     	//json 데이터 특수문자 치환_220215_이준호
     	JsonStringEncoder encoder = JsonStringEncoder.getInstance();
@@ -849,6 +807,9 @@ public class AdjReqMgrController {
     	
     	//오즈리포트 서버별 주소 셋팅해주기
     	String serverName = req.getServerName();
+    	
+    	System.out.println("++++++++++++++++++++++++++++++++++++++++++  serverName : "+ serverName);
+    	
     	String ozServerNm = IpUtil.getOzServerName(serverName);
     	model.addAttribute("ozServerNm", ozServerNm);
     	
@@ -857,82 +818,22 @@ public class AdjReqMgrController {
     	 * 오즈 리포트 File Export 처리
     	 * 
     	 * */
-    	OzSchdExportUtil ozSchd = new OzSchdExportUtil();
-    	
-    	//로컬, 개발 서버
-    	if("local".equals(islocal)) {
-    		System.out.println(islocal + "환경입니다.");
-    		
-    		String ozrFilePath = "/adjReqReport.ozr";
-    		//이준호 오즈리포트 export 경로 앞에 "/"추가 테스트_220310
-    		/*String savePath = adjstReqVO.getAdrSeq() + "/adjReqReport.pdf";*/
-    		String savePath = "/" + adjstReqVO.getAdrSeq() + "/adjReqReport.pdf";
-    		String jsonData = jsObjData.toJSONString();
-    		
-    		jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
-    		ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);
-    	}
-    	//실서버
-    	else {
-    		System.out.println("#################################" + islocal + "환경입니다.");
-    		
-    		//이준호 오즈리포트 export 추가 ozFile폴더에도 생성
-    		String ozrFilePath2 = "/adjReqReport.ozr";
-    		
-    		//이준호 오즈리포트 export_0406_nas에 파일 저장 성공
-    		String savePath2 = "\\\\192.168.39.125\\data3\\out\\" + adjstReqVO.getAdrSeq() + "\\ozFile\\adjReqReport.pdf";
-    		
-    		String jsonData2 = jsObjData.toJSONString();
-    		
-    		jsonData2 = jsonData2.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
-    		ozSchd.ozschdFileExport(ozrFilePath2, jsonData2, savePath2, req);
-    		
-    		
-    		
-    		//=============================================테스트 소스 시작=====================================================================
-			
-    		/*//이준호 오즈리포트 export 추가 ozFile폴더에도 생성
-    		String ozrFilePath2 = "/adjReqReport.ozr";
-    		
-    		//이준호 오즈리포트 export 경로 앞에 "/"추가 테스트_220310
-    		String savePath2 = "\\\\192.168.39.125\\data3\\out\\adjReqReport2.pdf";
-    		System.out.println("@@@@@@@@@@@@@@@@@@adjstReqVO.getAdrSeq()   ::     @@@@@ =" + adjstReqVO.getAdrSeq());
-    		
-    		System.out.println("@@@@@@@@@@@@@@@@@@   savePath2   ::     @@@@@ =  " + savePath2);
-    		
-    		String jsonData2 = jsObjData.toJSONString();
-    		
-    		jsonData2 = jsonData2.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
-    		ozSchd.ozschdFileExport(ozrFilePath2, jsonData2, savePath2, req);
-    		
-    		//이준호 오즈리포트 export 추가 ozFile폴더에도 생성
-    		String ozrFilePath3 = "/adjReqReport.ozr";
-    		
-    		//이준호 오즈리포트 export 경로 앞에 "/"추가 테스트_220310
-    		String savePath3 = "adjReqReport3.pdf";
-    		
-    		System.out.println("@@@@@@@@@@@@@@@@@@   savePath3   ::     @@@@@ =  " + savePath3);
-    		
-    		String jsonData3 = jsObjData.toJSONString();
-    		
-    		jsonData3 = jsonData3.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
-    		ozSchd.ozschdFileExport(ozrFilePath3, jsonData3, savePath3, req);
-    		
-    		//이준호 오즈리포트 export 추가 ozFile폴더에도 생성
-    		String ozrFilePath4 = "/adjReqReport.ozr";
-    		
-    		//이준호 오즈리포트 export 경로 앞에 "/"추가 테스트_220310
-    		String savePath4 = "\\\\192.168.39.125\\data3\\out/adjReqReport4.pdf";
-    		
-    		System.out.println("@@@@@@@@@@@@@@@@@@   savePath4   ::     @@@@@ =  " + savePath4);
-    		
-    		String jsonData4 = jsObjData.toJSONString();
-    		
-    		jsonData4 = jsonData4.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
-    		ozSchd.ozschdFileExport(ozrFilePath4, jsonData4, savePath4, req);
-    		//=============================================테스트 소스 끝=====================================================================
-*/    	}
     	
+    	ozSchd.checkOzEnvNMakePDF(
+    			islocal
+    			, adjstReqVO.getAdrSeq()
+    			, "adjReqReport.ozr"			//oz template file
+    			, ozDevPdfSavePath
+    			, ozRealPdfSavePath
+    			, jsObjData.toJSONString()
+    			, serverName
+    			, "adjReqReport.pdf"			//oz to pdf save file name
+    			, ozDevServerIp
+    			, ozDevSchedulerIp
+    			, ozRealServerIp
+    			, ozRealSchedulerIp
+    			, devServerCheckString
+    			);
     	
 		//adr_hstry_mgr에 값 넣기	-	시작
 		adrHstryMgrService.insert4Func(adjstReqVO.getAdrSeq(), "신청서출력-관리자"
@@ -980,7 +881,7 @@ public class AdjReqMgrController {
 		
 		//조정 신청 정보 불러오기.
 		AdjReqMgrOffLineVO resultAdjReqMgrOffLine = adjReqMgrOffLineService.selectAdjReqMgrOffLineInfo(adjReqMgrOffLineVO);
-		
+		System.out.println("==========================");
 		FileVO fileVO = new FileVO();
 
 		if(resultAdjReqMgrOffLine.getAdjReqMgrVoList().get(0).getAtchFileId() != null){
@@ -1007,6 +908,8 @@ public class AdjReqMgrController {
 		List<?> codeResult = cmmUseService.selectCmmCodeDetail("CC001");
 		model.addAttribute("CC001", codeResult);
 		
+		model.addAttribute("CC007", cmmUseService.selectCmmCodeDetail("CC007"));
+		
 		System.out.println("resultAdjReqMgrOffLine :: "+ resultAdjReqMgrOffLine.getAdjReqMgrVoList().get(2));
 		
 		model.addAttribute("adrVO", resultAdjReqMgrOffLine);
@@ -1138,6 +1041,42 @@ public class AdjReqMgrController {
   		return modelAndView;
 	}
 	
+	/**
+     * 조정신청 보완요청 수정 Ajax
+     * 
+     */
+	@RequestMapping(value = {"/kccadr/adjReqMgr/adjReqMgrStateUpdateAjax.do"})
+	public ModelAndView adjReqMgrStateUpdateAjax(
+			@ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO
+			, HttpServletRequest request) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		//로그인 권한정보 불러오기
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+		if(userId.equals("")) {
+			modelAndView.addObject("adjStatus", "loginFail");
+			return modelAndView;
+		}
+		adjReqMgrOffLineVO.getEdtSn();
+		adjReqMgrOffLineVO.getAdrSeq();
+		
+		
+		adjReqMgrOffLineVO.setFrstRegisterId(userId);
+		adjReqMgrOffLineVO.setLastUpdusrId(userId);
+		
+		int resultCnt = adjReqMgrOffLineService.updateAdjReqMgrState(adjReqMgrOffLineVO);
+		
+		if(resultCnt > 0) {
+			modelAndView.addObject("result", KccadrConstants.SUCCESS);	// 성공메세지
+		}else {
+			modelAndView.addObject("result", KccadrConstants.FAIL);		// 실패메세지
+		}
+		
+		return modelAndView;
+	}
+	
 	@SuppressWarnings("unchecked")
 	public JSONObject parseJsonData(AdjstReqVO adjReqVO) throws Exception{
 		
@@ -1155,46 +1094,46 @@ public class AdjReqMgrController {
 		String adrNo = adjReqVO.getAdrNo();												//조정사건번호
 		//엔터문자 변경해주기 - \n\r -> \\n\\r로 json 데이터 전달해야한다고 함(오즈리포트)
 		String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n");				//신청취지
-		String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n");				//신청원인
+		String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n");				//신청이유
 		
  		
-		if(!rpplNm.equals("")) {
+		if(StringUtil.isNotEmpty(rpplNm)) {
 			
 			oj.put("rpplNm", rpplNm);
 			
 		}
 		
-		if(!rpplPost.equals("")) {
+		if(StringUtil.isNotEmpty(rpplPost)) {
 			
 			oj.put("rpplPost", rpplPost);
 			
 		}
 		
-		if(!rpplPhone.equals("")) {
+		if(StringUtil.isNotEmpty(rpplPhone)) {
 			
 			oj.put("rpplPhone", rpplPhone);
 			
 		}
 		
-		if(!rpplAddr.equals("") && !rpplAddr.equals(" ")) {
+		if(StringUtil.isNotEmpty(rpplAddr) && !" ".equals(rpplAddr)) {
 			
 			oj.put("rpplAddr", rpplAddr);
 			
 		}
 		
-		if(!rpplEmail.equals("")) {
+		if(StringUtil.isNotEmpty(rpplEmail)) {
 			
 			oj.put("rpplEmail", rpplEmail);
 			
 		}
 		
-		if(!reqCn1.equals("")) {
+		if(StringUtil.isNotEmpty(reqCn1)) {
 			
 			oj.put("reqCn1", reqCn1);
 			
 		}
 		
-		if(!reqCn2.equals("")) {
+		if(StringUtil.isNotEmpty(reqCn2)) {
 			
 			oj.put("reqCn2", reqCn2);
 			

src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java

@@ -45,7 +45,7 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable {
 	private String statNm = ""; // 조정사건상태명
 	private String reqOlCd = ""; // 온_오프라인_신청구분
 	private String reqCn1 = ""; // 신청취지
-	private String reqCn2 = ""; // 신청원인
+	private String reqCn2 = ""; // 신청이유
 	private String reqTy = ""; // 신청유형
 	private String ccTy = ""; // 저작물종류
 	private String sbmtYn = ""; // 제출여부
@@ -72,6 +72,7 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable {
 	private String rpplTy = ""; // 관리인구분
 	private String agntYn = ""; // 조정기일대리여부
 	private String rpplUsrTy = ""; // 관리인분류
+	private String rpplUsrDiv = ""; // 관리인구분 (01:한국인, 02:외국인) 
 	private String adrOlYn = ""; // 전자조정진행여부
 	private String rpplId = ""; // 조정사건관리인ID
 	private String rpplNm = ""; // 이름_대표자
@@ -173,6 +174,8 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable {
 	private String codeId;
 	private String loginNextUrl;
 	
+	private String countryCode;
+	
 	
 	
 	public String getSrchYear() {
@@ -403,6 +406,12 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable {
 	public void setRpplUsrTy(String rpplUsrTy) {
 		this.rpplUsrTy = rpplUsrTy;
 	}
+	public String getRpplUsrDiv() {
+		return rpplUsrDiv;
+	}
+	public void setRpplUsrDiv(String rpplUsrDiv) {
+		this.rpplUsrDiv = rpplUsrDiv;
+	}
 	public String getAdrOlYn() {
 		return adrOlYn;
 	}
@@ -888,6 +897,12 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable {
 	public void setExmpMgrId(String exmpMgrId) {
 		this.exmpMgrId = exmpMgrId;
 	}
+	public String getCountryCode() {
+		return countryCode;
+	}
+	public void setCountryCode(String countryCode) {
+		this.countryCode = countryCode;
+	}
 	
 	
 }

src/main/java/kcc/kccadr/adjst/service/PayVO.java

@@ -48,6 +48,9 @@ public class PayVO extends ComDefaultVO implements Serializable {
 	private String lastUpdusrId = "" ; //수정자
 	private String merchantData = ""; //고객사 임의데이터
 	
+	private String prcsnStatCd = ""; //고객사 임의데이터
+	
+	
 	
 	public String getPaySeq() {
 		return paySeq;
@@ -271,6 +274,12 @@ public class PayVO extends ComDefaultVO implements Serializable {
 	public void setMerchantData(String merchantData) {
 		this.merchantData = merchantData;
 	}
+	public String getPrcsnStatCd() {
+		return prcsnStatCd;
+	}
+	public void setPrcsnStatCd(String prcsnStatCd) {
+		this.prcsnStatCd = prcsnStatCd;
+	}
 	
 	
 	

src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java

@@ -599,6 +599,7 @@ public class AdjstReqServiceImpl  extends EgovAbstractServiceImpl implements Adj
 		adjstReqVO.setRpplRealPost(rpplRealPost);
 		adjstReqVO.setRpplRealAddr(rpplRealAddr);
 		adjstReqVO.setRpplRealAddrDtl(rpplRealAddrDtl);
+		System.out.println("adjstReqVO.getRpplUsrDiv() :: "+ adjstReqVO.getRpplUsrDiv());
 		
 		//디비에 수정해 주기
 		int resultCnt = adjstReqDAO.updateAdrRppl(adjstReqVO);
@@ -918,6 +919,13 @@ public class AdjstReqServiceImpl  extends EgovAbstractServiceImpl implements Adj
 
 		if(CollectionUtils.isNotEmpty(adjstReqVO.getAdjstRpplList())){
 			for(AdjstReqVO  model : adjstReqVO.getAdjstRpplList()){
+				
+				if(StringUtils.isNotEmpty(model.getCountryCode())) {
+					model.setRpplPost("["+model.getCountryCode() + "] " +model.getRpplPost());
+				}
+
+				System.out.println(" model.getRpplPost() :: "+ model.getRpplPost());
+				
 				model.setAdrSeq(adjstReqVO.getAdrSeq());
 				// 관련인 키 생성
 				model.setRpplSeq(rpplIdgenService.getNextStringId());
@@ -973,6 +981,13 @@ public class AdjstReqServiceImpl  extends EgovAbstractServiceImpl implements Adj
 		int rs = 0;
 		if(CollectionUtils.isNotEmpty(adjstReqVO.getAdjstRpplList())){
 			for(AdjstReqVO  model : adjstReqVO.getAdjstRpplList()){
+
+				if(StringUtils.isNotEmpty(model.getCountryCode())) {
+					model.setRpplPost("["+model.getCountryCode() + "] " +model.getRpplPost());
+				}
+				System.out.println("model.getRpplPost() ::" + model.getRpplPost());
+				
+				
 				model.setAdrSeq(adjstReqVO.getAdrSeq());
 				// 최초등록자
 				model.setFrstRegisterId(adjstReqVO.getFrstRegisterId());

src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java

@@ -7,6 +7,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -373,6 +375,29 @@ public class AdjstReqWebController {
 				req.setRpplTy(KccadrConstants.ADR_RPPL_TY_REQ);
 				list.add(req);
 			}
+			
+			int cnt = 0;
+			for(AdjstReqVO adj : list) {
+				if("10".equals(adj.getRpplTy()) 
+						&& "02".equals(adj.getRpplUsrDiv())) {
+					
+			        Pattern pattern = Pattern.compile("\\[(.*?)\\]");
+			        Matcher matcher = pattern.matcher(adj.getRpplPost());
+
+			        if (matcher.find()) {
+			            String extracted = matcher.group(1);
+//			            list.get(cnt).setCountryCode(extracted);
+			            adj.setCountryCode(extracted);
+			            System.out.println(" :: adj.getCountryCode() :: "+adj.getCountryCode());
+			        }
+//			        list.get(cnt).setRpplPost(adj.getRpplPost().replaceAll("\\[.*?\\]", ""));
+			        adj.setRpplPost(adj.getRpplPost().replaceAll("\\[.*?\\]", "").trim());
+					
+				}
+				cnt++;
+			}
+			
+			
 			model.addAttribute("editInfo", adjstReqService.checkAdjsReqEditStatus(adjstReqVO));
 			model.addAttribute("master", adjMsrMaster);
 		}else{
@@ -582,7 +607,8 @@ public class AdjstReqWebController {
 		 * @ 조정상태를 신청전 - 접수후 - 종결 이렇게 하고 써보자. 다른구조 필요하면 나중에 바꾸지뭐
 		 */
 		
-		return "/web/kccadr/adjst/adjstReq1Regist";
+//		return "/web/kccadr/adjst/adjstReq1Regist";
+		return "redirect:/web/kccadr/adjst/adjstReqRegistInformation.do";
 	}
 
 	/**
@@ -1684,7 +1710,8 @@ public class AdjstReqWebController {
 		JSONObject oj = new JSONObject();
 		
 
-		String rpplNm = adjReqVO.getRpplNm();											//이름
+		String rpplNm = "02".equals(adjReqVO.getRpplUsrTy()) ? adjReqVO.getRpplBizNm() : adjReqVO.getRpplNm();	//이름
+//		String rpplNm = adjReqVO.getRpplNm();											//이름
 		String rpplPost = adjReqVO.getRpplPost();										//우편번호
 		String rpplPhone = stUtil.addDash(adjReqVO.getRpplPhone());						//핸드폰 번호 '-' 문자 추가해 주기
 		String rpplAddr = adjReqVO.getRpplAddr() + " " + adjReqVO.getRpplAddrDtl();		//주소 + 상세주소 합치기
@@ -1707,46 +1734,55 @@ public class AdjstReqWebController {
 		String adrNo = adjReqVO.getAdrNo();												//조정사건번호
 		//엔터문자 변경해주기 - \n\r -> \\n\\r로 json 데이터 전달해야한다고 함(오즈리포트)
 		String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n");				//신청취지
-		String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n");				//신청원인
+		String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n");				//신청이유
 		
+		// 조정신청 3step 미리보기 시 신청 취지/원인에 데이터가 없으면 'null data'로 찍혀서 공백을 띄어쓰기 한칸으로 넣기_이준호_221226
+		if("".equals(reqCn1)) {
+			reqCn1 = " ";
+		}
 		
-		if(!rpplNm.equals("")) {
+		if("".equals(reqCn2)) {
+			reqCn2 = " ";
+		}
+		
+ 		System.out.println("rpplNm :"+ rpplNm);
+		if(StringUtil.isNotEmpty(rpplNm)) {
 			
 			oj.put("rpplNm", rpplNm);
 			
 		}
 		
-		if(!rpplPost.equals("")) {
+		if(StringUtil.isNotEmpty(rpplPost)) {
 			
 			oj.put("rpplPost", rpplPost);
 			
 		}
 		
-		if(!rpplPhone.equals("")) {
+		if(StringUtil.isNotEmpty(rpplPhone)) {
 			
 			oj.put("rpplPhone", rpplPhone);
 			
 		}
 		
-		if(!rpplAddr.equals("") && !rpplAddr.equals(" ")) {
+		if(StringUtil.isNotEmpty(rpplAddr) && !" ".equals(rpplAddr)) {
 			
 			oj.put("rpplAddr", rpplAddr);
 			
 		}
 		
-		if(!rpplEmail.equals("")) {
+		if(StringUtil.isNotEmpty(rpplEmail)) {
 			
 			oj.put("rpplEmail", rpplEmail);
 			
 		}
 		
-		if(!reqCn1.equals("")) {
+		if(StringUtil.isNotEmpty(reqCn1)) {
 			
 			oj.put("reqCn1", reqCn1);
 			
 		}
 		
-		if(!reqCn2.equals("")) {
+		if(StringUtil.isNotEmpty(reqCn2)) {
 			
 			oj.put("reqCn2", reqCn2);
 			
@@ -1760,7 +1796,7 @@ public class AdjstReqWebController {
 			
 		}
 		
-		if(!appDeDate.equals("")) {
+		if(StringUtil.isNotEmpty(appDeDate)) {
 			
 			oj.put("apprDe", appDeDate);
 			
@@ -1778,4 +1814,13 @@ public class AdjstReqWebController {
 		return "/web/kccadr/adjst/adjstReqRegistTutorial";
 	}
 	
+	/**
+		나의 조정사건 목록 - 튜토리얼
+	 */
+	@RequestMapping("/web/kccadr/adjst/adjstProgressTutorial.do")
+	public String adjstProgressTutorial() throws Exception {
+		
+		return "/web/kccadr/adjst/adjstProgressTutorial";
+	}
+	
 }

src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -107,13 +108,18 @@ public class AdjstExpController {
 	 * 체험하기 로그인 페이지
 	 */
 	@RequestMapping("/web/kccadr/adjstExp/SsoLoginUsr.do")
-	public String SsoLoginUsr(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, HttpServletRequest request, ModelMap model) throws Exception {
+	public String SsoLoginUsr(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, HttpServletRequest request, ModelMap model, HttpServletResponse response) throws Exception {
 
 		System.out.println("adjstReqVO.getStep() :: " + adjstReqVO.getStep());
 		model.addAttribute("loginNextUrl", adjstReqVO.getLoginNextUrl());
 		model.addAttribute("step", adjstReqVO.getStep());
 		model.addAttribute("searchStatus", adjstReqVO.getSearchStatus());
 												 
+		response.setHeader("Cache-Control", "no-cache");
+        response.setDateHeader("Expires", 0);
+        response.setHeader("Pragma", "no-cache");
+        response.setDateHeader("Max-Age", 0);
+		
 		return "/web/kccadr/adjstExp/SsoLoginUsr";
 		
 	}

src/main/java/kcc/kccadr/adrpr/service/AdrPrsctLinkService.java

@@ -0,0 +1,21 @@
+package kcc.kccadr.adrpr.service;
+
+import java.util.List;
+
+public interface AdrPrsctLinkService {
+	
+	AdrPrsctLinkVO selectAdrPrsctLinkDetail(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception;
+
+	List<AdrPrsctLinkVO> selectAdrPrsctLinkList(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception;
+
+	Integer selectAdrPrsctLinkListCount(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception;
+	
+	void adrPrsctLinkInsert(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception;
+	
+	void adrPrsctLinkListInsert(List<AdrPrsctLinkVO> adrPrsctLinkList) throws Exception;
+	
+	int adrPrsctLinkUpdate(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception;
+	
+	int adrPrsctLinkDelete(AdrPrsctLinkVO aprvlLineMgrVO) throws Exception;
+
+}

src/main/java/kcc/kccadr/adrpr/service/AdrPrsctLinkVO.java

@@ -0,0 +1,224 @@
+package kcc.kccadr.adrpr.service;
+
+import kcc.com.cmm.ComDefaultVO;
+
+public class AdrPrsctLinkVO extends ComDefaultVO{
+
+	private static final long serialVersionUID = 1L;
+	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;
+	}
+	public void setPrsctSeq(String prsctSeq) {
+		this.prsctSeq = prsctSeq;
+	}
+	public String getPrsctNo() {
+		return prsctNo;
+	}
+	public void setPrsctNo(String prsctNo) {
+		this.prsctNo = prsctNo;
+	}
+	public String getPrsctDvddDate() {
+		return prsctDvddDate;
+	}
+	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;
+	}
+	public void setPlntfNm(String plntfNm) {
+		this.plntfNm = plntfNm;
+	}
+	public String getPlntfDeNm() {
+		return plntfDeNm;
+	}
+	public void setPlntfDeNm(String plntfDeNm) {
+		this.plntfDeNm = plntfDeNm;
+	}
+	public String getDfndnNm() {
+		return dfndnNm;
+	}
+	public void setDfndnNm(String dfndnNm) {
+		this.dfndnNm = dfndnNm;
+	}
+	public String getDfndnDeNm() {
+		return dfndnDeNm;
+	}
+	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;
+	}
+	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;
+	}
+	public void setFrstRegisterId(String frstRegisterId) {
+		this.frstRegisterId = frstRegisterId;
+	}
+	public String getFrstRegistPnttm() {
+		return frstRegistPnttm;
+	}
+	public void setFrstRegistPnttm(String frstRegistPnttm) {
+		this.frstRegistPnttm = frstRegistPnttm;
+	}
+	public String getLastUpdusrId() {
+		return lastUpdusrId;
+	}
+	public void setLastUpdusrId(String lastUpdusrId) {
+		this.lastUpdusrId = lastUpdusrId;
+	}
+	public String getLastUpdtPnttm() {
+		return lastUpdtPnttm;
+	}
+	public void setLastUpdtPnttm(String lastUpdtPnttm) {
+		this.lastUpdtPnttm = lastUpdtPnttm;
+	}
+	
+	
+
+	
+}

src/main/java/kcc/kccadr/adrpr/service/impl/AdrPrsctLinkDAO.java

@@ -0,0 +1,73 @@
+package kcc.kccadr.adrpr.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
+import kcc.kccadr.adrpr.service.AdrPrsctLinkVO;
+
+@Repository("adrPrsctLinkDAO")
+public class AdrPrsctLinkDAO extends EgovAbstractDAO {
+	/**
+	 * 검찰연계 상세보기
+	 * @param adrPrsctLinkVO
+	 * @return
+	 * @throws Exception
+	 */
+	public AdrPrsctLinkVO selectAdrPrsctLinkDetail(AdrPrsctLinkVO aprvlLineMgrVO) throws Exception {
+		return (AdrPrsctLinkVO) select("AdrPrsctLinkDAO.selectAdrPrsctLinkDetail", aprvlLineMgrVO);
+	}
+
+	/**
+	 * 검찰연계 목록
+	 * @param adrPrsctLinkVO
+	 * @return
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<AdrPrsctLinkVO> selectAdrPrsctLinkList(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception {
+		return (List<AdrPrsctLinkVO>) list("AdrPrsctLinkDAO.selectAdrPrsctLinkList", adrPrsctLinkVO);
+	}
+	
+	/**
+	 * 검찰연계 목록(토털카운트)
+	 * @param adrPrsctLinkVO
+	 * @return
+	 * @throws Exception
+	 */	
+	public Integer selectAdrPrsctLinkListCount(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception {
+		return (Integer) select("AdrPrsctLinkDAO.selectAdrPrsctLinkListCount", adrPrsctLinkVO);
+	}
+	
+	/**
+	 * 검찰연계 등록
+	 * @param adrPrsctLinkVO
+	 * @throws Exception
+	 */
+	public void adrPrsctLinkInsert(AdrPrsctLinkVO aprvlLineMgrVO) throws Exception {
+		insert("AdrPrsctLinkDAO.adrPrsctLinkInsert", aprvlLineMgrVO);
+	}
+
+	/**
+	 * 검찰연계 수정
+	 * @param adrPrsctLinkVO
+	 * @return
+	 * @throws Exception
+	 */
+	public int adrPrsctLinkUpdate(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception {
+		return update("AdrPrsctLinkDAO.adrPrsctLinkUpdate", adrPrsctLinkVO);
+	}
+	
+	
+	/**
+	 * 검찰연계 삭제
+	 * @param adrPrsctLinkVO
+	 * @return
+	 * @throws Exception
+	 */
+	public int adrPrsctLinkDelete(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception {
+		return delete("AdrPrsctLinkDAO.adrPrsctLinkDelete", adrPrsctLinkVO);		
+	}
+	
+}

src/main/java/kcc/kccadr/adrpr/service/impl/AdrPrsctLinkServiceImpl.java

@@ -0,0 +1,62 @@
+package kcc.kccadr.adrpr.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
+import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import kcc.kccadr.adrpr.service.AdrPrsctLinkService;
+import kcc.kccadr.adrpr.service.AdrPrsctLinkVO;
+
+@Service("adrPrsctLinkService")
+public class AdrPrsctLinkServiceImpl extends EgovAbstractServiceImpl implements AdrPrsctLinkService {
+	
+	@Resource(name = "adrPrsctLinkDAO")
+	private AdrPrsctLinkDAO adrPrsctLinkDAO;
+	
+    // PRSCT_SEQ
+	@Resource(name="adrPrsctLinkIdgenService")
+	private EgovIdGnrService adrPrsctLinkIdgenService;	
+	
+	public AdrPrsctLinkVO selectAdrPrsctLinkDetail(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception {
+		return adrPrsctLinkDAO.selectAdrPrsctLinkDetail(adrPrsctLinkVO);
+	}
+
+	public List<AdrPrsctLinkVO> selectAdrPrsctLinkList(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception {
+		return adrPrsctLinkDAO.selectAdrPrsctLinkList(adrPrsctLinkVO);
+	}
+	
+	@Override
+	public Integer selectAdrPrsctLinkListCount(AdrPrsctLinkVO aprvlLineMgrVO) throws Exception {
+		return adrPrsctLinkDAO.selectAdrPrsctLinkListCount(aprvlLineMgrVO);
+	}
+	
+	//저장
+	public void adrPrsctLinkInsert(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception {
+		adrPrsctLinkDAO.adrPrsctLinkInsert(adrPrsctLinkVO);
+	}
+
+	//엑셀업로드 멀티저장
+	public void adrPrsctLinkListInsert(List<AdrPrsctLinkVO> adrPrsctLinkList) throws Exception {
+		for(AdrPrsctLinkVO adrPrsctLinkVO : adrPrsctLinkList) {
+			// 인서트
+			String nextId = adrPrsctLinkIdgenService.getNextStringId();
+			adrPrsctLinkVO.setPrsctSeq(nextId);
+			adrPrsctLinkInsert(adrPrsctLinkVO);	    					
+		}
+	}
+	
+	//업데이트
+	public int adrPrsctLinkUpdate(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception{
+		return  adrPrsctLinkDAO.adrPrsctLinkUpdate(adrPrsctLinkVO);
+	}
+	
+	//삭제
+	public int adrPrsctLinkDelete(AdrPrsctLinkVO adrPrsctLinkVO) throws Exception{
+		return  adrPrsctLinkDAO.adrPrsctLinkDelete(adrPrsctLinkVO);
+	}
+	
+}

src/main/java/kcc/kccadr/adrpr/web/AdrPrsctLinkController.java

@@ -0,0 +1,625 @@
+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;
+
+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;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.JsonResult;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.spring.data.util.ExcelUtil;
+import kcc.com.cmm.util.StringUtil;
+import kcc.com.utl.user.service.CheckLoginUtil;
+import kcc.kccadr.adrpr.service.AdrPrsctLinkService;
+import kcc.kccadr.adrpr.service.AdrPrsctLinkVO;
+
+@Controller
+public class AdrPrsctLinkController {
+
+	//로그인 체크 util
+	@Resource(name = "checkLoginUtil")
+	private CheckLoginUtil checkLoginUtil;
+	
+	// 검찰연계
+	@Resource(name = "adrPrsctLinkService")
+	private AdrPrsctLinkService adrPrsctLinkService;	
+    
+    // PRSCT_SEQ
+	@Resource(name="adrPrsctLinkIdgenService")
+	private EgovIdGnrService adrPrsctLinkIdgenService;
+	
+	/**
+	 * 검찰연계 목록 화면
+	 * date : 2023.10.23
+	 */
+	@RequestMapping("/kccadr/adrpr/adrPrsctLinkList.do")
+	public String adrPrsctLinkList(@ModelAttribute("adrPrsctLinkVO") AdrPrsctLinkVO adrPrsctLinkVO
+	, ModelMap model) throws Exception {
+
+		if(adrPrsctLinkVO.getPageUnit() != 10) {
+			adrPrsctLinkVO.setPageUnit(adrPrsctLinkVO.getPageUnit());
+		}
+
+		if("".equals(adrPrsctLinkVO.getSearchSortCnd())){
+			adrPrsctLinkVO.setSearchSortCnd("prsctSeq");
+			adrPrsctLinkVO.setSearchSortOrd("desc");
+		}
+
+		/** paging */
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(adrPrsctLinkVO.getPageIndex());
+		paginationInfo.setRecordCountPerPage(adrPrsctLinkVO.getPageUnit());
+		paginationInfo.setPageSize(adrPrsctLinkVO.getPageSize());
+
+		adrPrsctLinkVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		adrPrsctLinkVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		adrPrsctLinkVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		paginationInfo.setTotalRecordCount(adrPrsctLinkService.selectAdrPrsctLinkListCount(adrPrsctLinkVO));
+		model.addAttribute("paginationInfo", paginationInfo);
+		List<AdrPrsctLinkVO> list = adrPrsctLinkService.selectAdrPrsctLinkList(adrPrsctLinkVO);
+		
+		model.addAttribute("list", list);
+		
+		return "kccadr/adrpr/adrPrsctLinkList";
+	}    
+    
+    /**
+     * 조정진행목록 목록 Excel
+     *
+     * @param apmVO
+     * @param model
+     * @return
+     * @throws Exception
+     */
+    @SuppressWarnings("rawtypes")
+    @RequestMapping(value = "/kccadr/adrpr/adrPrsctLinkExcel.do")
+    public ModelAndView excel(@ModelAttribute("adrPrsctLinkVO") AdrPrsctLinkVO adrPrsctLinkVO
+    		, ModelMap model) throws Exception {
+        
+    	adrPrsctLinkVO.setExcelYn("Y");
+        List list = adrPrsctLinkService.selectAdrPrsctLinkList(adrPrsctLinkVO);
+        
+        // 세팅값
+        String title = "검찰연계목록리스트";
+        int[] width = {4000, 8000, 8000, 5000, 5000, 5000, 4000}; // 너비
+        String[] header = {"사건번호", "조정사건번호", "원고(대리인) 이름", "원고(대리인) 연락처", "피고(대리인) 이름", "피고(대리인) 연락처", "배당일"}; // 헤더에 들어갈 이름
+        String[] order = {"PrsctNo", "PrsctAdrNo", "PlntfNm", "PlntfPhone", "DfndnNm", "DfndnPhone", "DividendDate"}; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용)
+        
+        // 호출
+        SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(list, header, order, width, title);
+        model.addAttribute("locale", Locale.KOREA);
+        model.addAttribute("workbook", workbook);
+        model.addAttribute("workbookName", title);
+        
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("excelDownloadView");
+        modelAndView.addObject(model);
+        
+        
+        return modelAndView;
+    }
+    
+    /**
+	 * 검찰연계 엑셀등록 화면
+	 * date : 2023.10.23
+     */
+    @RequestMapping(value = "/kccadr/adrpr/popup/adrPrsctLinkExcelRegistPop.do")
+    public String adjstReqOpenExamplePop(@ModelAttribute("adrPrsctLinkVO") AdrPrsctLinkVO adrPrsctLinkVO
+    		, ModelMap model) throws Exception {
+
+    	return "kccadr/adrpr/popup/adrPrsctLinkExcelRegistPop";
+    }
+    
+	/**
+	 * 검찰연계 등록 화면
+	 * date : 2023.10.23
+	 */
+	@RequestMapping("/kccadr/adrpr/adrPrsctLinkRegist.do")
+	public String adrPrsctLinkRegist(@ModelAttribute("adrPrsctLinkVO") AdrPrsctLinkVO adrPrsctLinkVO
+	, ModelMap model) throws Exception {
+
+		return "kccadr/adrpr/adrPrsctLinkRegist";
+	}    
+	
+	// 검찰연계 저장
+	@RequestMapping(value="/kccadr/adrpr/adrPrsctLinkSaveAjax.do")
+	public ModelAndView adrPrsctLinkSaveAjax(@ModelAttribute("adrPrsctLinkVO")  AdrPrsctLinkVO adrPrsctLinkVO
+			, HttpServletRequest request) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+
+		boolean isSuccess = true;
+		String msg = "";
+		
+		try {
+	    	//로그인 정보 획득 -  ssoLoginVO 사용
+	    	LoginVO loginVO = checkLoginUtil.getLoginVO();
+	    	if (loginVO != null) {
+		    	adrPrsctLinkVO.setFrstRegisterId(loginVO.getUniqId());
+		    	adrPrsctLinkVO.setLastUpdusrId(loginVO.getUniqId());
+	
+		    	// 저장
+		    	if (StringUtil.isEmpty(adrPrsctLinkVO.getPrsctSeq())) {
+					// 인서트
+					String nextId = adrPrsctLinkIdgenService.getNextStringId();
+					adrPrsctLinkVO.setPrsctSeq(nextId);
+					adrPrsctLinkService.adrPrsctLinkInsert(adrPrsctLinkVO);	    		
+		    	}
+		    	else {
+					// 업데이트
+					adrPrsctLinkService.adrPrsctLinkUpdate(adrPrsctLinkVO);	    			    		
+		    	}
+	    	}
+
+		}
+		catch(Exception e) {
+			isSuccess = false;
+			msg = e.getMessage();
+		}		
+
+		modelAndView.addObject("isSuccess", isSuccess);
+		modelAndView.addObject("msg", msg);
+			
+		return modelAndView;
+	}	
+	
+	// 검찰연계 상세정보
+	@RequestMapping(value="/kccadr/adrpr/adrPrsctLinkDetailAjax.do")
+	public ModelAndView adrPrsctLinkDetailAjax(@ModelAttribute("adrPrsctLinkVO")  AdrPrsctLinkVO adrPrsctLinkVO
+			, HttpServletRequest request) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+
+		boolean isSuccess = true;
+		String msg = "";
+    	AdrPrsctLinkVO result = new AdrPrsctLinkVO();
+    	
+		try {
+	    	//로그인 정보 획득 -  ssoLoginVO 사용
+	    	LoginVO loginVO = checkLoginUtil.getLoginVO();
+	    	adrPrsctLinkVO.setFrstRegisterId(loginVO.getUniqId());
+	    	adrPrsctLinkVO.setLastUpdusrId(loginVO.getUniqId());
+
+	    	result = adrPrsctLinkService.selectAdrPrsctLinkDetail(adrPrsctLinkVO);
+		}
+		catch(Exception e) {
+			isSuccess = false;
+			msg = e.getMessage();
+		}		
+
+		modelAndView.addObject("isSuccess", isSuccess);
+		modelAndView.addObject("msg", msg);
+		modelAndView.addObject("result", result);
+			
+		return modelAndView;
+	}	
+	
+	/**
+	 * 문자 발송 - 엑셀파일 불러오기
+	 * @param body
+	 * @param uploadFile
+	 * @param search
+	 * @param result
+	 * @param model
+	 * @param request
+	 * @return
+	 * @throws Exception
+	 */
+	@SuppressWarnings("deprecation")
+	@RequestMapping(value = "/kccadr/adrpr/adrPrsctLinkSendExelAjax.do")
+	@ResponseBody
+	public Object adrPrsctLinkSendExelAjax(final MultipartHttpServletRequest multiRequest) throws Exception {
+		
+    	//로그인 정보 획득 -  ssoLoginVO 사용
+    	LoginVO loginVO = checkLoginUtil.getLoginVO();
+		
+		JsonResult jr = new JsonResult();
+		jr.setSuccess(false);
+		jr.setMessage("엑셀 파일만 업로드할 수 있습니다.");
+		
+		try {
+			if (loginVO != null) {
+				List<MultipartFile> files = (List<MultipartFile>) multiRequest.getFiles("file0");
+				
+				// 파일명에 .이 있을경우 오류 => Ex) 테스트6.20.xlsx 
+				int fileNameSplitCnt = 0;
+				
+				if(!files.isEmpty()) {
+					fileNameSplitCnt = files.get(0).getOriginalFilename().split("[.]").length;
+					
+					if (files.get(0).getSize() > 0 
+							&& (files.get(0).getContentType().indexOf("spreadsheetml") > -1) 
+							|| files.get(0).getContentType().indexOf("ms-excel") > -1 
+							|| files.get(0).getOriginalFilename().split("[.]")[fileNameSplitCnt-1].indexOf("xlsx") > -1 
+							|| files.get(0).getOriginalFilename().split("[.]")[fileNameSplitCnt-1].indexOf("xls") > -1) {
+						
+						// 엑셀 파일 용량 3MB이상 시 10만건 이상으로 서버가 다운되는 증상 발생
+						long fileSize = multiRequest.getFile("file0").getSize();
+						
+						if(fileSize > 3374653) {
+							jr.setMessage("엑셀 파일은 3MB를 넘을수 없습니다.");
+							return jr;
+						}
+						
+						String Ext = files.get(0).getOriginalFilename().split("[.]")[1];
+						String errMessage = "";
+				        String cellValue  = "";
+				        
+			            int errItemCnt = 0;
+			            String errItemLine = "";
+			            List<HashMap<String, String>> hashMapList = new ArrayList<HashMap<String, String>>();
+			            
+			            //엑셀 확장자에 따른 처리 로직 분리
+						if(Ext.equals("xls")) {
+							HSSFWorkbook workbook = new HSSFWorkbook(files.get(0).getInputStream());
+						    HSSFSheet sheet = workbook.getSheetAt(0);
+						    
+						    if(sheet.getLastRowNum() > 20001) { //
+				            	errMessage = "20000건 이상의 업로드는 데이터 부하로 업로드 할수 없습니다.";
+				            	jr.setSuccess(false);
+				            	jr.setMessage(errMessage);
+				            	return jr;
+				            }
+				            
+				            for(int i=1; i< sheet.getLastRowNum() + 2; i++){ //먼저 밸리데이션 체크(1줄은 생략)
+				            	HSSFRow row = sheet.getRow(i); //열읽기
+				            	if(null == row) { 
+				                    continue;
+				                }
+				            	
+				            	HashMap<String, String> hashMap = new HashMap<>();
+				            	// 행의 두번째 열(이름부터 받아오기) 
+				                HSSFCell cell = null;
+				                boolean errSts = true;
+				                for(int j = 0 ; j < 25; j++){ //행읽기(6행까지나 2행까지만 필요)
+				                	cellValue = "";
+				                	cell = row.getCell(j);
+				                	if(null == cell || "".equals(cell.toString().trim())) { //셀에 값이 없으면 
+				                		if(j == 1) {
+					                		if (sheet.getLastRowNum() == i) {
+					                			continue;
+					                		}
+					    	            	break;
+				                		}
+				                    	
+				                    }
+				                	
+				                	if(null != cell){
+				                		switch(cell.getCellType()){ //숫자타임을 문자로 변환
+				                			case  Cell.CELL_TYPE_NUMERIC:
+				                				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()) ; */
+				                    }
+				                	
+				                	// 항목 체크 Start
+				                	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
+				                }
+
+				                if(errSts) {
+				                	hashMapList.add(hashMap);
+				                }
+				                
+				            }
+				            
+							//jr.setData(hashMapList);
+							jr.setSuccess(true);
+						} 
+						else {
+							//확장자가 xlsx
+							OPCPackage opcPackage = OPCPackage.open(files.get(0).getInputStream());
+							XSSFWorkbook workbook = new XSSFWorkbook(opcPackage);
+				            XSSFSheet sheet = workbook.getSheetAt(0); // 첫번째 시트 불러오기
+				            opcPackage.close();
+				            
+				            int totRowDataCnt = 0;
+				            for(int r=1; r<sheet.getPhysicalNumberOfRows(); r++) {
+				            	XSSFRow tmpRow = sheet.getRow(r);
+				            	XSSFCell cell = null;
+				            	if(tmpRow.getCell(1) != null) {
+				            		cell = tmpRow.getCell(1); //이름/핸드폰/변환1/변환2/변환3/변환4/변환5
+					            	if(cell != null && !cell.toString().trim().equals("")) {
+					            		totRowDataCnt++;
+					            	}
+				            	}
+				            }
+				            
+				            if(totRowDataCnt > 20001) {
+				            	errMessage = "20000건 이상의 업로드는 데이터 부하로 업로드 할수 없습니다.";
+				            	jr.setSuccess(false);
+				            	jr.setMessage(errMessage);
+				            	return jr;
+				            }
+				            
+				            for(int i=1; i< sheet.getLastRowNum() + 2; i++){ //먼저 밸리데이션 체크(1줄은 생략)
+				            	XSSFRow row = sheet.getRow(i); //열읽기
+				            	if(null == row) { 
+				                    continue;
+				                }
+				            	
+				            	HashMap<String, String> hashMap = new HashMap<>();
+				            	// 행의 두번째 열(이름부터 받아오기) 
+				                XSSFCell cell = null;
+				                boolean errSts = true;
+				                
+				                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())) { //셀에 값이 없으면 
+				                		if(j == 1) {
+					                		if (sheet.getLastRowNum() == i) {
+					                			continue;
+					                		}
+					    	            	break;
+				                		}
+				                    }
+				                	if(null != cell){
+				                		switch(cell.getCellType()){ //숫자타임을 문자로 변환
+				                			case  Cell.CELL_TYPE_NUMERIC:
+				                				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()) ; */
+				                    }
+	
+				                	// 항목 체크 Start
+				                	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
+				                }
+				                
+				                if(errSts) {
+				                	hashMapList.add(hashMap);
+				                }
+				                
+				            }
+				            
+							//jr.setData(hashMapList);
+							jr.setSuccess(true);
+
+						}	//xlsx 처리 끝
+
+						// 데이터 저장 START
+						if(errItemCnt > 0) {
+							jr.setMessage("유효하지 않은 형식의 데이터가  " + errItemCnt +"건입니다.\n" + errItemLine.trim());
+						}else {
+							jr.setMessage("");
+							
+							//Step1. 데이터 변환
+							List<AdrPrsctLinkVO> adrPrsctLinkList = new ArrayList<AdrPrsctLinkVO>();
+					        // List foreach 문
+					        for (HashMap<String, String> item : hashMapList) {
+					        	AdrPrsctLinkVO adrPrsctLinkVO = new AdrPrsctLinkVO();
+					        	adrPrsctLinkVO.setPrsctNo(item.get("prsctNo"));
+					        	adrPrsctLinkVO.setPrsctDvddDate(item.get("prsctDvddDate"));
+					        	adrPrsctLinkVO.setRfrlOfic(item.get("rfrlOfic"));
+					        	adrPrsctLinkVO.setPrsctPb(item.get("prsctPb"));
+					        	adrPrsctLinkVO.setPlntfNm(item.get("plntfNm"));
+					        	adrPrsctLinkVO.setPlntfDeNm(item.get("plntfDeNm"));
+					        	adrPrsctLinkVO.setDfndnNm(item.get("dfndnNm"));
+					        	adrPrsctLinkVO.setDfndnDeNm(item.get("dfndnDeNm"));
+					        	adrPrsctLinkVO.setCcTyNm(item.get("ccTyNm"));
+					        	adrPrsctLinkVO.setPrsctCn(item.get("prsctCn"));
+					        	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);
+						}
+						// 데이터 저장 END
+						
+					}
+				}
+			}
+			else {
+				jr.setSuccess(false);
+				jr.setMessage("로그인후 이용해주세요.");				
+			}
+			
+			return jr;
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			System.out.println("+++++++++++++++++ adrPrsctLinkSendExelAjax Controller Error !!! " + e.getMessage());
+			jr.setSuccess(false);
+			jr.setMessage("엑셀 데이터에 오류가 있습니다. 엑셀 데이터를 확인해 주세요.");
+			return jr;
+		}
+		
+	}
+	
+	// 엑셀 항목 체크
+	public boolean getItemChk(String type, String value) {
+		boolean rtnVal = true;
+		String dateRegExp = "^(19|20)[\\d]{2}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$";
+		String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-[0-9]{3,4}-[0-9]{4}$";
+		
+		try {
+			if(type.equals("dividendDate")) {
+				//배당일
+				if(!value.matches(dateRegExp)) {
+					rtnVal = false;
+				}
+			}			
+			else if(type.equals("plntfPhone")) {
+				//원고 연락처
+				if(!value.matches(phoneRegExp)) {
+					rtnVal = false;
+				}
+			}
+			else if(type.equals("dfndnPhone")) {
+				//피고 연락처
+				if(!value.matches(phoneRegExp)) {
+					rtnVal = false;
+				}
+			}
+		}
+		catch(Exception e) {
+			rtnVal = false;
+			
+			System.out.println("엑셀 항목 체크");
+			System.out.println("type : " + type);
+			System.out.println("value : " + value);
+			System.out.println("getItemChk : " + e.getMessage());
+		}
+		
+		
+		return rtnVal;
+	}
+	
+	private Boolean cellMake(
+			 String info
+			, String itemNm
+			, int i
+			, int j
+			, int cnt
+			, String cellValue
+			, boolean errSts
+			, HashMap<String, String> 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;
+	}
+
+}

src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java

@@ -55,6 +55,8 @@ public class AdrHstryMgrVO extends ComDefaultVO implements Serializable {
 	
 	private String userNm;
 	
+	private String isRemake;		//재단권화 쿼리 필터 여부	-	Y	
+	
 	public String getAdrSeq() {
 		return adrSeq;
 	}
@@ -218,4 +220,10 @@ public class AdrHstryMgrVO extends ComDefaultVO implements Serializable {
 	public void setUserNm(String userNm) {
 		this.userNm = userNm;
 	}
+	public String getIsRemake() {
+		return isRemake;
+	}
+	public void setIsRemake(String isRemake) {
+		this.isRemake = isRemake;
+	}	
 }

src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java

@@ -40,4 +40,11 @@ public interface AdrRecordReadingService {
 	
 	// 결제완료 처리
 	int updatePrcsnStatCd(PayVO payVO) throws Exception;
+
+	AdrRecordReadingVO selectStatCdAndStatTxt(AdrRecordReadingVO adrRecordReadingVO);
+
+	void updateExpense(AdrRecordReadingVO adrRecordReadingVO);
+
+	void insertRecordReadingHist(AdrRecordReadingVO adrRecordReadingVO);
+
 }

src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java

@@ -1,6 +1,7 @@
 package kcc.kccadr.advcRecord.service;
 
 import java.io.Serializable;
+import java.util.List;
 
 import kcc.com.cmm.ComDefaultVO;
 
@@ -26,6 +27,13 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable {
 	private String recordReadingHstrySeq;	//기록열람이력 일련번호
 	private String cn;						//내용-승인번호, 결재 정보 등등
 	
+	private String phone;
+	
+	private String post;
+	private String addr;
+	private String addrDtl;
+	
+	
 	private String searchFrstRegisterId;
 	private String searchDocReqCd;
 
@@ -34,6 +42,34 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable {
 	private String adrNo;
 	private String appliCantNm;
 	
+	private String reqDate;
+	private String reqHours;
+	private String reqMinutes;
+	
+	private String reqDetails;
+	
+	private String payEndDay; // 결제 날짜
+	
+	private String statCd; // 
+	private String statTxt; // 
+	
+	private String mberNm; // 
+	
+	private String expense; // 검색조건 발급종류 
+	
+	private List<String> readList; // 검색조건 발급종류 
+	
+	private List<String> ckStsList; // 검색조건 발급상태 
+
+	private String whereRead; // 검색조건 발급종류 
+	private String readListAll; // 검색조건 발급종류 
+	
+	
+	private String whereCkSts; // 검색조건 발급상태 
+	private String ckStsListAll; // 검색조건 발급상태 
+	
+	private String searchRecordReadingFlag;
+	
 	
 	
 	public String getRecordReadingSeq() {
@@ -120,6 +156,30 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable {
 	public void setCn(String cn) {
 		this.cn = cn;
 	}
+	public String getPhone() {
+		return phone;
+	}
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+	public String getPost() {
+		return post;
+	}
+	public void setPost(String post) {
+		this.post = post;
+	}
+	public String getAddr() {
+		return addr;
+	}
+	public void setAddr(String addr) {
+		this.addr = addr;
+	}
+	public String getAddrDtl() {
+		return addrDtl;
+	}
+	public void setAddrDtl(String addrDtl) {
+		this.addrDtl = addrDtl;
+	}
 	public String getSearchFrstRegisterId() {
 		return searchFrstRegisterId;
 	}
@@ -156,4 +216,103 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable {
 	public void setRecordReadingFlag(String recordReadingFlag) {
 		this.recordReadingFlag = recordReadingFlag;
 	}
+	public String getReqDate() {
+		return reqDate;
+	}
+	public void setReqDate(String reqDate) {
+		this.reqDate = reqDate;
+	}
+	public String getReqHours() {
+		return reqHours;
+	}
+	public void setReqHours(String reqHours) {
+		this.reqHours = reqHours;
+	}
+	public String getReqMinutes() {
+		return reqMinutes;
+	}
+	public void setReqMinutes(String reqMinutes) {
+		this.reqMinutes = reqMinutes;
+	}
+	public String getReqDetails() {
+		return reqDetails;
+	}
+	public void setReqDetails(String reqDetails) {
+		this.reqDetails = reqDetails;
+	}
+	public String getPayEndDay() {
+		return payEndDay;
+	}
+	public void setPayEndDay(String payEndDay) {
+		this.payEndDay = payEndDay;
+	}
+	public String getStatCd() {
+		return statCd;
+	}
+	public void setStatCd(String statCd) {
+		this.statCd = statCd;
+	}
+	public String getStatTxt() {
+		return statTxt;
+	}
+	public void setStatTxt(String statTxt) {
+		this.statTxt = statTxt;
+	}
+	public String getMberNm() {
+		return mberNm;
+	}
+	public void setMberNm(String mberNm) {
+		this.mberNm = mberNm;
+	}
+	public String getExpense() {
+		return expense;
+	}
+	public void setExpense(String expense) {
+		this.expense = expense;
+	}
+	public List<String> getReadList() {
+		return readList;
+	}
+	public void setReadList(List<String> readList) {
+		this.readList = readList;
+	}
+	public List<String> getCkStsList() {
+		return ckStsList;
+	}
+	public void setCkStsList(List<String> ckStsList) {
+		this.ckStsList = ckStsList;
+	}
+	public String getWhereRead() {
+		return whereRead;
+	}
+	public void setWhereRead(String whereRead) {
+		this.whereRead = whereRead;
+	}
+	public String getWhereCkSts() {
+		return whereCkSts;
+	}
+	public void setWhereCkSts(String whereCkSts) {
+		this.whereCkSts = whereCkSts;
+	}
+	public String getReadListAll() {
+		return readListAll;
+	}
+	public void setReadListAll(String readListAll) {
+		this.readListAll = readListAll;
+	}
+	public String getCkStsListAll() {
+		return ckStsListAll;
+	}
+	public void setCkStsListAll(String ckStsListAll) {
+		this.ckStsListAll = ckStsListAll;
+	}
+	public String getSearchRecordReadingFlag() {
+		return searchRecordReadingFlag;
+	}
+	public void setSearchRecordReadingFlag(String searchRecordReadingFlag) {
+		this.searchRecordReadingFlag = searchRecordReadingFlag;
+	}
+	
+	
+	
 }

src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java

@@ -192,4 +192,17 @@ public class AdrRecordReadingDAO extends EgovAbstractDAO {
 		return update("adrRecordReadingDAO.updatePrcsnStatCd", payVO);
 	}
 
+	public AdrRecordReadingVO selectStatCdAndStatTxt(AdrRecordReadingVO adrRecordReadingVO) {
+		return (AdrRecordReadingVO) select("AdrRecordReadingDAO.selectStatCdAndStatTxt", adrRecordReadingVO);
+	}
+
+	public void updateExpense(AdrRecordReadingVO adrRecordReadingVO) {
+		update("AdrRecordReadingDAO.updateExpense", adrRecordReadingVO);
+	}
+
+	public void insertRecordReadingHist(AdrRecordReadingVO adrRecordReadingVO) {
+		insert("AdrRecordReadingHstryDAO.insert", adrRecordReadingVO);
+	}
+
+	
 }

src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java

@@ -24,23 +24,8 @@ public class AdrRecordReadingServiceImpl implements AdrRecordReadingService {
     @Resource(name="recordReadingGnrService")
 	private EgovIdGnrService idgenService;
     
-	//이력 상세
-    //@Resource(name="adrRecordReadingDetailDAO")
-    //private adrRecordReadingDetailDAO adrRecordReadingDetailDAO;
-
-	//이력 상세
-    //@Resource(name="KccadrMgrUdtService")
-    //private KccadrMgrUdtService kccadrMgrUdtService;
-    
-     
-    /*
-	String insert4Func(
-			String p_adrSeq
-			, String p_menuNm
-			, String p_menuId
-			, String p_frstRegisterId
-			) throws Exception;
-			*/
+    @Resource(name="recordReadingHstryGnrService")
+    private EgovIdGnrService recordReadingHstryGnrService;
 	
 	//C
 	public String insert4Func(
@@ -111,8 +96,22 @@ public class AdrRecordReadingServiceImpl implements AdrRecordReadingService {
         String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
 		
         payVO.setLastUpdusrId(userId);
-        
 		return adrRecordReadingDAO.updatePrcsnStatCd(payVO);
 	}
 
+	@Override
+	public AdrRecordReadingVO selectStatCdAndStatTxt(AdrRecordReadingVO adrRecordReadingVO) {
+		return adrRecordReadingDAO.selectStatCdAndStatTxt(adrRecordReadingVO);
+	}
+
+	@Override
+	public void updateExpense(AdrRecordReadingVO adrRecordReadingVO) {
+		adrRecordReadingDAO.updateExpense(adrRecordReadingVO);
+	}
+
+	@Override
+	public void insertRecordReadingHist(AdrRecordReadingVO adrRecordReadingVO) {
+		adrRecordReadingDAO.insertRecordReadingHist(adrRecordReadingVO);
+	}
+
 }

src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java

@@ -30,7 +30,7 @@ public interface AprvlMgrService {
 			) throws Exception;
 
 	//조정사건결재저장 - 2022-10고도화
-	int insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO
+	String insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO
 			, String p_code_desc
 			, String p_stat_cd    	
 			, String p_adrHstryMgrSeq