Merge branch 'hylee'

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

@@ -30,5 +30,9 @@ public interface AdjReqMgrPastService {
 	List<AdjReqMgrPastVO> selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO);
 
 	AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO);
+
+	List<AdjReqMgrPastVO> findByAdrHstryId(AdjReqMgrPastVO adjReqMgrPastVO);
+
+	ResponseEntity<RestResponse> insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO);
 	
 }

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

@@ -112,6 +112,7 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
     private String addUsrId; /* ass.addUsrId | ass.assUsrTy | add_yn " */
     private String addAgntList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */
     
+    
     // 조정기일대리인
     private String addUsrNmList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */
 	private String adrSn = ""; // 조정회차
@@ -190,6 +191,22 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 	private String ccTyTx;
 	
 	private String appPlaceDetailTx;
+	
+	
+	/* 조정사건 이력 */
+	private String adrHstrySeq; // 조정이력일련번호
+	private String hstryDe; // 이력일시
+	private String hstryCn; // 이력내용
+	private String dlvrySeq; // 송달일련번호
+	private String hstryDetailCn; // 이력비고내용
+	private String refAdrSeq; // 참고용 조정 일련번호
+	private String refAdrSn; // 참고용 조정회차
+	private String refSeq1; // 참고용 일련번호 1
+	private String refSeq2; // 참고용 일련번호 2
+
+    private String adrHstryList[]; 
+	
+	
 
 	public AdjReqMgrVO getAdrVO() {
 		return adrVO;
@@ -1238,6 +1255,86 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 	public void setAppResultTx(String appResultTx) {
 		this.appResultTx = appResultTx;
 	}
+
+	public String getAdrHstrySeq() {
+		return adrHstrySeq;
+	}
+
+	public void setAdrHstrySeq(String adrHstrySeq) {
+		this.adrHstrySeq = adrHstrySeq;
+	}
+
+	public String getHstryDe() {
+		return hstryDe;
+	}
+
+	public void setHstryDe(String hstryDe) {
+		this.hstryDe = hstryDe;
+	}
+
+	public String getHstryCn() {
+		return hstryCn;
+	}
+
+	public void setHstryCn(String hstryCn) {
+		this.hstryCn = hstryCn;
+	}
+
+	public String getDlvrySeq() {
+		return dlvrySeq;
+	}
+
+	public void setDlvrySeq(String dlvrySeq) {
+		this.dlvrySeq = dlvrySeq;
+	}
+
+	public String getHstryDetailCn() {
+		return hstryDetailCn;
+	}
+
+	public void setHstryDetailCn(String hstryDetailCn) {
+		this.hstryDetailCn = hstryDetailCn;
+	}
+
+	public String getRefAdrSeq() {
+		return refAdrSeq;
+	}
+
+	public void setRefAdrSeq(String refAdrSeq) {
+		this.refAdrSeq = refAdrSeq;
+	}
+
+	public String getRefAdrSn() {
+		return refAdrSn;
+	}
+
+	public void setRefAdrSn(String refAdrSn) {
+		this.refAdrSn = refAdrSn;
+	}
+
+	public String getRefSeq1() {
+		return refSeq1;
+	}
+
+	public void setRefSeq1(String refSeq1) {
+		this.refSeq1 = refSeq1;
+	}
+
+	public String getRefSeq2() {
+		return refSeq2;
+	}
+
+	public void setRefSeq2(String refSeq2) {
+		this.refSeq2 = refSeq2;
+	}
+
+	public String[] getAdrHstryList() {
+		return adrHstryList;
+	}
+
+	public void setAdrHstryList(String[] adrHstryList) {
+		this.adrHstryList = adrHstryList;
+	}
 	
 	
 	

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

@@ -2,6 +2,7 @@ package kcc.kccadr.adjReqMgrPast.service.impl;
 
 import java.util.List;
 
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Repository;
 
 import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
@@ -9,6 +10,7 @@ import kcc.kccadr.adjPgrMgr.drt.service.AssVO;
 import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO;
 import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
 import kcc.kccadr.adjReqMgrPast.service.AdrMemDeptMgrPstVO;
+import kcc.kccadr.cmm.RestResponse;
 
 @Repository("AdjReqMgrPastDAO")
 public class AdjReqMgrPastDAO  extends EgovAbstractDAO {
@@ -85,5 +87,13 @@ public class AdjReqMgrPastDAO  extends EgovAbstractDAO {
 	public AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO) {
 		return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByIdAdrMgrMaster", adjPastVO);
 	}
+
+	public List<AdjReqMgrPastVO> findByAdrHstryId(AdjReqMgrPastVO adjPastVO) {
+		return (List<AdjReqMgrPastVO>) list("adjReqMgrPastDAO.findByAdrHstryId", adjPastVO);
+	}
+
+	public void insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) {
+		insert("adjReqMgrPastDAO.insertAdjReqRecordAjax", adjPastVO );
+	}
 	
 }

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

@@ -54,6 +54,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
     @Resource(name = "egovPrtclManageGnrService")
     private EgovIdGnrService idgenPrtclSeqService;
 	
+    // adr_hstry pk
+	@Resource(name="adrHstrySeqGnrService")
+	private EgovIdGnrService adrHstrySeqGnrService;
+    
 	//암복호화 유틸
 	@Resource(name = "egovCryptoUtil")
 	EgovCryptoUtil egovCryptoUtil;
@@ -501,49 +505,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 
 	@Override
 	public ResponseEntity<RestResponse> checkNInsertAprvlPastAjax(AdjReqMgrPastVO adjPastVO) throws Exception {
-
-		// 공통
-//		System.out.println(" 조정번호             	:: "+adjPastVO.getAdrSeq());		
-//		System.out.println(" 조정차수             	:: "+adjPastVO.getAdrSn());	
-//		
-//		// 기일정보
-//		System.out.println(" 조정기일일			:: "+adjPastVO.getAppDeDay());        
-//	    System.out.println(" 조정기일시			:: "+adjPastVO.getAppDeTime());		  
-//		System.out.println(" 다음조정기일일		:: "+adjPastVO.getNextAppDeDay());	    
-//		System.out.println(" 다음조정기일시		:: "+adjPastVO.getNextAppDeTime());	
-//		System.out.println(" 조정기일장소		:: "+adjPastVO.getAppPlaceTx());	  
-//		System.out.println(" 기일조서내용		:: "+adjPastVO.getPrtclCn());		
-//		System.out.println(" 장소 Type		:: "+adjPastVO.getAppPlaceTy());		
-//		System.out.println(" 장소				:: "+adjPastVO.getAppPlaceTx());		
-//		System.out.println(" 공개여부			:: "+adjPastVO.getOpenYn());		
-		/* 
-		 *  TO_DATETIME('2015-08-10 16:04:56','YYYY-MM-DD HH24:MI:SS')
-		 *  조정번호             		:: ADR_0000000000002920
-		 *  조정차수             		:: 1
-		 *  신청인 피신청인 정보	:: [신청|10|Y, 피신청|20|Y]
-		 *  참관 대리인 정보		:: [35|참관대, 45|피찬관대]
-		 *  조정기일일			:: 2022-09-01
-		 *  조정기일시			:: 14:00
-		 *  다음조정기일일		:: 2022-09-08
-		 *  다음조정기일시		:: 03:00
-		 *  조정기일장소		:: 
-		 *  조정부장			:: 222
-		 *  조정위원1			:: 
-		 *  조정위원2			:: 
-		 *  조서내용			:: 123123
-		 * */
-		// add 정보
-
-		System.out.println(" 조정기일일			:: "+adjPastVO.getAppDeDay());        
-	    System.out.println(" 조정기일시			:: "+adjPastVO.getAppDeTime());		  
-		System.out.println(" 다음조정기일일		:: "+adjPastVO.getNextAppDeDay());	    
-		System.out.println(" 다음조정기일시		:: "+adjPastVO.getNextAppDeTime());	
-		System.out.println(" 조정기일장소		:: "+adjPastVO.getAppPlaceTx());	  
-		System.out.println(" 기일조서내용		:: "+adjPastVO.getPrtclCn());		
-		System.out.println(" 장소 Type		:: "+adjPastVO.getAppPlaceTy());		
-		System.out.println(" 장소				:: "+adjPastVO.getAppPlaceTx());		
-		System.out.println(" 공개여부			:: "+adjPastVO.getOpenYn());	
-		
 		
 		this.insertAdjAssAndDataCleansing(adjPastVO);
 		this.updateAdrPrtclMgrAndDataCleansing(adjPastVO);
@@ -553,23 +514,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 	@Override
 	public ResponseEntity<RestResponse> checkNUpdateAprvlPastAjax(AdjReqMgrPastVO adjPastVO) throws Exception {
 		
-//		System.out.println(" 조정기일일			:: "+adjPastVO.getAppDeDay());        
+		this.updateAdjAssAndDataCleansing(adjPastVO);
-//		System.out.println(" 조정기일시			:: "+adjPastVO.getAppDeTime());		  
-//		System.out.println(" 다음조정기일일		:: "+adjPastVO.getNextAppDeDay());	    
-//		System.out.println(" 다음조정기일시		:: "+adjPastVO.getNextAppDeTime());	
-//		System.out.println(" 조정기일장소		:: "+adjPastVO.getAppPlaceTx());	  
-//		System.out.println(" 기일조서내용		:: "+adjPastVO.getPrtclCn());		
-//		System.out.println(" 장소 Type		:: "+adjPastVO.getAppPlaceTy());		
-//		System.out.println(" 장소				:: "+adjPastVO.getAppPlaceTx());		
-//		System.out.println(" 공개여부			:: "+adjPastVO.getOpenYn());	
-		
-		try {
-			this.updateAdjAssAndDataCleansing(adjPastVO);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
 		this.updateAdrPrtclMgrAndDataCleansing(adjPastVO);
 		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 수정이 완료되었습니다.", LocalDateTime.now()));
 	}
@@ -690,7 +635,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 			adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
 		}
 		
-
 		for(String addusrList : adjPastVO.getAddAgntList())
 		{
 			if(StringUtils.isNotEmpty(addusrList))
@@ -751,10 +695,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 
 	@Override
 	public List<AdjReqMgrPastVO> findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO) {
-		
-//		List<AdjReqMgrPastVO> adjReqMgrPastListVO = adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO);
-//		List<String> usrTyList = adjReqMgrPastListVO.stream().map(AdjReqMgrPastVO::getAssPstUsrTy).collect(Collectors.toList());
-		
 		return adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO);
 	}
 
@@ -764,6 +704,29 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		return adjReqMgrPastDAO.findByIdAdrMgrMaster(adjPastVO);
 	}
 
+
+	@Override
+	public List<AdjReqMgrPastVO> findByAdrHstryId(AdjReqMgrPastVO adjPastVO) {
+		return adjReqMgrPastDAO.findByAdrHstryId(adjPastVO);
+	}
+
+
+	@Override
+	public ResponseEntity<RestResponse> insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) {
+		
+		
+		for(String adjHstry : adjPastVO.getAdrHstryList()) 
+		{
+			//TODO 사건진행정보 반복문
+		}
+		
+		
+		
+		
+		adjReqMgrPastDAO.insertAdjReqRecordAjax(adjPastVO);
+		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "사건진행정보 등록이 완료되었습니다.", LocalDateTime.now()));
+	}
+
 	
 }
 	

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

@@ -305,8 +305,10 @@ public class AdjReqMgrPastController {
 		
 		//TODO 테스트로 인한 seq 코딩
 		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
-		System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq());
 
+		List<AdjReqMgrPastVO> adrHstryList = adjReqMgrPastService.findByAdrHstryId(adjReqMgrPastVO);
+		
+		model.addAttribute("adrHstryList", adrHstryList);
 		model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO);
 
 		
@@ -327,8 +329,9 @@ public class AdjReqMgrPastController {
 	 * @return
 	 * @throws Exception 
 	 */
-	@RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"})
+	@RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqRecordAjax.do"})
-	public ResponseEntity<RestResponse> insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO
+//	public ResponseEntity<RestResponse> insertAdjReqRecordAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO
+	public ResponseEntity<RestResponse> insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO
 			, RedirectAttributes redirectAttributes
 			, HttpServletRequest request) throws Exception {
 		
@@ -341,6 +344,45 @@ public class AdjReqMgrPastController {
 			return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
 		}
 		
+		//사용자 유니크 아이디 받아오기
+		adjReqMgrPastVO.setFrstRegisterId(userId);
+		
+		//조정신청, 대리인, 신청인 등록 처리
+		return adjReqMgrPastService.insertAdjReqRecordAjax(adjReqMgrPastVO);
+	}
+	/*
+	 *	<![CDATA[
+	 *		DELETE FROM COMTNBANNER              
+	 *		WHERE BANNER_ID = #bannerId#        
+	 *	]]>                               
+	 */
+	
+	/** 
+	 * @methodName	: insertAdjReqMgrOffAjax 
+	 * @author		: 이호영
+	 * @date		: 2022.08.24 
+	 * @description	: 과거사건 기본정보등록 메서드
+	 * @param multiRequest
+	 * @param adjReqMgrPastVO
+	 * @param redirectAttributes
+	 * @param request
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"})
+	public ResponseEntity<RestResponse> insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO
+			, RedirectAttributes redirectAttributes
+			, HttpServletRequest request) throws Exception {
+		
+		//로그인 권한정보 불러오기
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+		
+		if(userId.equals("")) {
+			// Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized)
+			return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
+		}
+		
 		//사용자 유니크 아이디 받아오기
 		adjReqMgrPastVO.setFrstRegisterId(userId);
 		adjReqMgrPastVO.setLastUpdusrId(userId);
@@ -350,6 +392,17 @@ public class AdjReqMgrPastController {
 	}
 	
 	
+	/** 
+	 * @methodName	: checkNInsertAprvlPastAjax 
+	 * @author		: 이호영
+	 * @date		: 2022.09.26 
+	 * @description	: 기일조서 insert
+	 * @param adjReqMgrPastVO
+	 * @param redirectAttributes
+	 * @param request
+	 * @return
+	 * @throws Exception 
+	 */
 	@RequestMapping(value = {"/kccadr/adjReqMgOff/checkNInsertAprvlPastAjax.do"})
 	public ResponseEntity<RestResponse> checkNInsertAprvlPastAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO
 			, RedirectAttributes redirectAttributes
@@ -372,9 +425,17 @@ public class AdjReqMgrPastController {
 		return adjReqMgrPastService.checkNInsertAprvlPastAjax(adjReqMgrPastVO);
 	}
 	
-	
+	/** 
-	
+	 * @methodName	: checkNUpdateAprvlPastAjax 
-	
+	 * @author		: 이호영
+	 * @date		: 2022.09.26 
+	 * @description	: 기일조서 update 
+	 * @param adjReqMgrPastVO
+	 * @param redirectAttributes
+	 * @param request
+	 * @return
+	 * @throws Exception 
+	 */
 	@RequestMapping(value = {"/kccadr/adjReqMgOff/checkNUpdateAprvlPastAjax.do"})
 	public ResponseEntity<RestResponse> checkNUpdateAprvlPastAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO
 			, RedirectAttributes redirectAttributes

src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml

@@ -557,4 +557,63 @@
 		
 	</select>
 	
+	<!-- 과거신청정보 - 신청이력 정보 -->
+	<select id="adjReqMgrPastDAO.findByAdrHstryId" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
+		
+		SELECT
+			ADR_HSTRY_SEQ			as adrHstrySeq        
+			, HSTRY_DE              as hstryDe           
+			, HSTRY_CN              as hstryCn           
+			, ATCH_FILE_ID          as atchFileId       
+			, FRST_REGIST_PNTTM     as frstRegistPnttm  
+			, FRST_REGISTER_ID      as frstRegisterId   
+			, LAST_UPDT_PNTTM       as lastUpdtPnttm    
+			, LAST_UPDUSR_ID        as lastUpdusrId     
+			, DLVRY_SEQ             as dlvrySeq          
+			, HSTRY_DETAIL_CN       as hstryDetailCn    
+			, STAT_CD               as statCd            
+			, REF_ADR_SEQ           as refAdrSeq        
+			, REF_ADR_SN            as refAdrSn         
+			, REF_SEQ_1             as refSeq1          
+			, REF_SEQ_2             as refSeq2          
+		FROM 
+			ADR_HSTRY
+		WHERE
+			ADR_SEQ = #adrSeq#
+		
+	</select>
+	
+	<!-- 과거사건등록 - 기일조서 등록 출석인 관리-->
+	<insert id="adjReqMgrPastDAO.insertAdjReqRecordAjax" parameterClass="java.util.List">
+
+		INSERT INTO ADR_ASS_MGR_PST (
+			  ADR_SEQ
+			, ADR_SN
+			, ASS_PST_SEQ
+			, ASS_PST_USR_TY
+			, ASS_PST_USR_NM
+			, ADD_YN
+			, ADD_CHG_YN
+			, FRST_REGIST_PNTTM
+			, FRST_REGISTER_ID
+			, LAST_UPDT_PNTTM
+			, LAST_UPDUSR_ID
+		) VALUES 
+		 <iterate conjunction=",">
+		(
+			#[].adrSeq#         
+			, #[].adrSn#          
+			, #[].assPstSeq#      
+			, #[].assPstUsrTy#    
+			, #[].assPstUsrNm#    
+			, #[].addYn#          
+			, 'N'       
+			, NOW()
+			, #[].frstRegisterId#
+			, NOW()
+			, #[].lastUpdusrId#
+		)
+		</iterate>
+	</insert>
+	
 </sqlMap>