From 99e6a5fc295f0bbca1dd9711a954eccc209898a9 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 25 Nov 2022 14:32:12 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EB=93=B1=EB=A1=9D=20=EC=95=94=ED=98=B8=ED=99=94=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=A4=91=20/=20[#2932]=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +- .../java/kcc/com/cmm/util/MagicDBAPIUtil.java | 75 ++ .../adjPgrMgr/apm/web/ApmController.java | 29 + .../adjPgrMgr/drt/service/impl/DrtDAO.java | 4 + .../iam/service/InternalApprovManageVO.java | 22 +- .../web/InternalApprovManageController.java | 6 + .../service/AdjReqMgrPastService.java | 2 + .../service/impl/AdjReqMgrPastDAO.java | 9 + .../impl/AdjReqMgrPastServiceImpl.java | 88 +- .../web/AdjReqMgrPastController.java | 50 +- .../solr/search/impl/SearchServiceImpl.java | 1 + .../egovProps/globals_local.properties | 5 + .../kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml | 10 + .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 18 + src/main/webapp/WEB-INF/decorators.xml | 1 + .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 4 +- .../internalApprovManageDetailFileView.jsp | 872 ++++++++++++++++++ .../iam/internalApprovManageDetail.jsp | 122 ++- .../adjReqMgrPastBasicRegist.jsp | 2 +- src/main/webapp/WEB-INF/lib/MagicDB.conf | 35 + src/main/webapp/WEB-INF/lib/jcaos-1.4.8.0.jar | Bin 0 -> 871714 bytes src/main/webapp/WEB-INF/lib/jcaos.lic | 1 + src/main/webapp/WEB-INF/lib/magicdb_japi.jar | Bin 0 -> 239709 bytes 23 files changed, 1319 insertions(+), 47 deletions(-) create mode 100644 src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.jsp create mode 100644 src/main/webapp/WEB-INF/lib/MagicDB.conf create mode 100644 src/main/webapp/WEB-INF/lib/jcaos-1.4.8.0.jar create mode 100644 src/main/webapp/WEB-INF/lib/jcaos.lic create mode 100644 src/main/webapp/WEB-INF/lib/magicdb_japi.jar diff --git a/pom.xml b/pom.xml index b4d7fbe8..b48c556b 100644 --- a/pom.xml +++ b/pom.xml @@ -374,7 +374,7 @@ jcaos 1 system - ${basedir}/src/main/webapp/WEB-INF/lib/jcaos-1.4.11.2.jar + ${basedir}/src/main/webapp/WEB-INF/lib/jcaos-1.4.8.0.jar @@ -393,6 +393,14 @@ ${basedir}/src/main/webapp/WEB-INF/lib/MagicJCrypto-v2.0.0.0.jar + + magicdb_japi + magicdb_japi + 1 + system + ${basedir}/src/main/webapp/WEB-INF/lib/magicdb_japi.jar + + magicline-e2e magicline-e2e diff --git a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java new file mode 100644 index 00000000..31c42ef1 --- /dev/null +++ b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java @@ -0,0 +1,75 @@ +package kcc.com.cmm.util; + +import java.util.Calendar; +import com.dsmdb.japi.MagicDBAPI; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; + +import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; + +public final class MagicDBAPIUtil { + + private static final Logger log = LoggerFactory.getLogger(MagicDBAPIUtil.class); + // 정책 명 +// @Value("#{globalSettings['Globals.MagicDB.PolicyName']}") + private static String POLICY_NAME = "POLICY001"; + + /** + * @methodName : encryptAdjReqMgrPastData + * @author : 이호영 + * @date : 2022.11.23 + * @description : 과거사건등록 데이터 Encrypt + * @param adjReqMgrPastVOList + * @return + */ + public static List encryptAdjReqMgrPastData(List adjReqMgrPastVOList) { + + + return null; + } + + public static String encryptOnlyOneString(String stringVal) { + return MagicDBAPI.encrypt(POLICY_NAME, stringVal); + } + + public static String decryptOnlyOneString(String stringVal) { +// log.info(" stringVal :: [{}]", stringVal); + return MagicDBAPI.decrypt(POLICY_NAME, stringVal); + } + +} + + +/* + * + * =============== 예시 ================== + * + * import com.dsmdb.japi.MagicDBAPI; + * public class OracleApiTest + * { + * public static void main(String args[]) throws Exception { + * String policy_name = "지정된 정책명"; + * String hash_name = "SHA256"; + * + * System.out.println("######## String Type Crypto Test ########"); + * String plainText = "1234561234567"; + * String encStr = MagicDBAPI.encrypt(policy_name, plainText); + * String dectStr = MagicDBAPI.decrypt(policy_name, encStr); + * String sha256Str = MagicDBAPI.hash(hash_name, plainText); + * System.out.println("[String] Normal : " + plainText); + * System.out.println("[String] Encrypt : " +encStr); + * System.out.println("[String] Decrypt : " +dectStr); + * System.out.println("[String] Digest/SHA256 : " + sha256Str); + * } + * } + * + * + * + * + * + * + * + */ \ No newline at end of file diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 0a77ca7f..0ca5ba87 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -1779,6 +1779,35 @@ public class ApmController { return "/kccadr/adjPgrMgr/apm/apmTab1"; } + /** + * 접수결재요청 상세 > 첨부파일영역 + * + * @param dlvinfoVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "internalApprovManageDetailFileView.do") + public String internalApprovManageDetailFileView(@ModelAttribute("info") ApmVO apmVO, ModelMap model) throws Exception { + + //model.addAttribute("list", apmService.selectApmTab1(apmVO)); + + AdjstReqStatusVO adjstReqStatusVO = new AdjstReqStatusVO(); + adjstReqStatusVO.setAdrSeq(apmVO.getAdrSeq()); + if("".equals(apmVO.getReqOlCd())) { + adjstReqStatusVO.setReqOlCd("0"); + }else { + adjstReqStatusVO.setReqOlCd(StringUtil.trim(apmVO.getReqOlCd())); + } + + List adjstReqStatusVOList = new ArrayList(); + adjstReqStatusVOList = adjstReqStatusService.selectAdjstDocs20211020List(adjstReqStatusVO); + + model.addAttribute("list" , adjstReqStatusVOList); + + return "/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView"; + } + @RequestMapping(value = "popup/docRegPop.do") public String docRegPop(@ModelAttribute("AnsVO") AnsVO ansVO, ModelMap model) throws Exception { diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtDAO.java index 0b771ea7..c837bb32 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtDAO.java @@ -85,4 +85,8 @@ public class DrtDAO extends EgovAbstractDAO { public int updateAppResultTyChg(DrtVO drtVO) throws Exception { return (Integer) update("Drt.updateAppResultTyChg", drtVO); } + + public String findOneById(String assPstUsrNm) { + return (String) select("Drt.findOneById", assPstUsrNm); + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/InternalApprovManageVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/InternalApprovManageVO.java index 51b8b3a5..a583370b 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/InternalApprovManageVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/InternalApprovManageVO.java @@ -20,6 +20,10 @@ public class InternalApprovManageVO extends ComDefaultVO { private String reqCn1; private String reqCn2; + + private String reqTempCn1; + + private String reqTempCn2; private String reqTy; @@ -359,7 +363,23 @@ public class InternalApprovManageVO extends ComDefaultVO { this.reqCn2 = reqCn2; } - public String getReqTy() { + public String getReqTempCn1() { + return reqTempCn1; + } + + public void setReqTempCn1(String reqTempCn1) { + this.reqTempCn1 = reqTempCn1; + } + + public String getReqTempCn2() { + return reqTempCn2; + } + + public void setReqTempCn2(String reqTempCn2) { + this.reqTempCn2 = reqTempCn2; + } + + public String getReqTy() { return reqTy; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java index 942da22b..63b5fcb6 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -233,6 +233,12 @@ public class InternalApprovManageController { drtVO = drtService.selectAdrPrtclMgr(drtVO); model.addAttribute("drtInfo", drtVO); + + + /* 신청 취지, 원인 글자수 줄여서 Temp에 넣음 */ + info.setReqTempCn1(StringUtils.abbreviate(info.getReqCn1(), 320)); + info.setReqTempCn2(StringUtils.abbreviate(info.getReqCn2(), 320)); + model.addAttribute("info", info); model.addAttribute("approvLine", approvLine); model.addAttribute("aftThree", aftThree); //접수일로 3개월 뒤 날짜 정보 diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index edf62ddc..d0060b01 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -59,6 +59,8 @@ public interface AdjReqMgrPastService { void updateAdrEndDe(AdjReqMgrPastVO adjReqMgrPastVO); List findByRpplP(AdjReqMgrPastVO adjReqMgrPastVO); + + void selectAssMgrPstEncryption(); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index 4966581f..2a3d8a16 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -208,5 +208,14 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { return (String) select("adjReqMgrPastDAO.findByRpplRespddSeq", adjReqMgrPastVO); } + public List selectAssMgrPstNmList() { + return (List) list("adjReqMgrPastDAO.selectAssMgrPstNmList"); + } + + public void updateAssMgrPstNmDecryptData(AdjReqMgrPastVO t) { + update("adjReqMgrPastDAO.updateAssMgrPstNmDecryptData", t ); + + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index ec5ef3c9..c445e664 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -21,14 +21,19 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import com.dreamsecurity.magicline.util.Log; +import com.dsmdb.japi.MagicDBAPI; + import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.cmm.util.DateUtil; +import kcc.com.cmm.util.MagicDBAPIUtil; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.adjPgrMgr.apm.service.FileVO; +import kcc.kccadr.adjPgrMgr.drt.service.impl.DrtDAO; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService; @@ -96,6 +101,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Resource(name = "adrHstryMgrDAO") private AdrHstryMgrDAO adrHstryMgrDAO; + @Resource(name = "DrtDAO") + DrtDAO drtDAO; + + //오프라인 조정신청 정보 상세내역 불러오기 public AdjReqMgrPastVO selectAdjReqMgrOffLineInfo(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{ @@ -217,7 +226,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements //조정 사건 키값 생성 및 디비 생성해주기 String adrSeq = adrIdgenService.getNextStringId(); // 고유ID adjReqMgrPastVO.setAdrSeq(adrSeq); - adjReqMgrPastVO.setReqOlCd(KccadrConstants.ADR_REQ_PAST); //오프라인 신청 코드 설정 + adjReqMgrPastVO.setReqOlCd(KccadrConstants.ADR_REQ_PAST); //과거이력 구분 코드 2 /* @@ -255,7 +264,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO.setAdrSn(0); adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); adjAssMgrPastVO.setAssPstUsrTy("50"); - adjAssMgrPastVO.setAssPstUsrNm(adjReqMgrPastVO.getAssPstUsrNm()); + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjReqMgrPastVO.getAssPstUsrNm())); adjAssMgrPastVO.setFrstRegisterId(adjReqMgrPastVO.getFrstRegisterId()); adjAssMgrPastVO.setLastUpdusrId(adjReqMgrPastVO.getLastUpdusrId()); @@ -487,14 +496,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastVO.setRpplRealAddr(rpplRealAddr); adjReqMgrPastVO.setRpplRealAddrDtl(rpplRealAddrDtl); -// TO_CHAR(SYSTIMESTAMP,'YYYYMMDD - //디비에 추가해 주기 int resultCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrPastVO); - - - - return resultCnt; } @@ -507,7 +510,9 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO) { - return adjReqMgrPastDAO.selectMemAss(adjReqMgrPastVO); + AdjReqMgrPastVO adjPastVO = adjReqMgrPastDAO.selectMemAss(adjReqMgrPastVO); + adjPastVO.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(adjPastVO.getAssPstUsrNm()) ); + return adjPastVO; } @@ -618,6 +623,15 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastList.add(adjAssMgrPastVO); } + // TB:adr_ass_mgr_pst -> ass_pst_usr_nm 암호화 + adjAssMgrPastList.forEach(t->{ + // 피 신청인은 pk 값으로 등록되어서 암호화 제외 + if(t.getAssPstUsrNm().indexOf("RPP") < 0) + { + t.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(t.getAssPstUsrNm())); + } + }); + adjReqMgrPastDAO.insertAdjAssList(adjAssMgrPastList); } @@ -706,7 +720,22 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public List findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO) { - return adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO); + List adjAssMgrPastList = adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO); + adjAssMgrPastList.forEach(t-> { + // 피신청인은 adr_rppl key값을 가지고 있음 + // 이름이 key값이면 rppl 테이블에서 가져와 기존 암호화 로직을 태운다. + if(t.getAssPstUsrNm().indexOf("RPP") < 0) + { + System.out.println("???"); + t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm())); + } + else + { + String rpplUsrNm = drtDAO.findOneById(t.getAssPstUsrNm()); + t.setAssPstUsrNm( egovCryptoUtil.decrypt(rpplUsrNm)); + } + }); + return adjAssMgrPastList; } @@ -851,10 +880,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 조정부 수정 adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO); + // 조사관 수정 + adjReqMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjReqMgrPastVO.getAssPstUsrNm())); adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO); - System.out.println("adjReqMgrPastVO.getAdrHstrySeq() :: "+ adjReqMgrPastVO.getAdrHstrySeq()); if(StringUtil.isNotEmpty(adjReqMgrPastVO.getAdrHstrySeq())) { // 최종결과 CODE 수정 @@ -925,6 +955,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 신청인 피신청인 select adjReqMgrPastList.stream() .forEach(t-> t.setAdjReqMgrVoList(adjReqMgrPastDAO.selectRpplList(t))); + + /* * 조정결과 상태값 select * code -> text 변환 @@ -942,6 +974,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements .count()); }); + // 외 N명 로직 for(AdjReqMgrPastVO adjRpplVO : adjReqMgrPastList){ // 피신청 이름 String PrpplNm = ""; @@ -974,6 +1007,20 @@ 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(); + } return adjReqMgrPastList; } @@ -1107,5 +1154,24 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements } + + public void selectAssMgrPstEncryption() { + List resultList = adjReqMgrPastDAO.selectAssMgrPstNmList(); + resultList.forEach(t->{ + if(!t.getAssPstUsrNm().startsWith("[")) + { + if(t.getAssPstUsrNm().indexOf("RPP") < 0) + { + System.out.println("t.getAssPstUsrNm() :: "+ t.getAssPstUsrNm()); + System.out.println("t.getAssPstUsrNm().startsWith(\"[\") :: "+ t.getAssPstUsrNm().startsWith("[")); + System.out.println("t.getAssPstUsrNm().indexOf(\"RPP\") :: "+ t.getAssPstUsrNm().indexOf("RPP")); + t.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(t.getAssPstUsrNm())); + adjReqMgrPastDAO.updateAssMgrPstNmDecryptData(t); + } + } + }); + + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index d8be180b..5462ca4c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -398,22 +398,27 @@ public class AdjReqMgrPastController { System.out.println(" adjPastVO.getPrtclCn() :: " + adjPastVO.getPrtclCn()); model.addAttribute("adjPastVO", adjPastVO); + try { - DrtVO drtVO = new DrtVO(); - drtVO.setAdrSeq(adjPastVO.getAdrSeq()); - drtVO.setAdrSn(adjPastVO.getAdrSn()); - model.addAttribute("assList", drtService.selectAssRegList(drtVO)); - - model.addAttribute("info", adjReqMgrPastService.findByIdAdrMgrMaster(adjPastVO)); - - /* 조정부 / 조정조사관 select */ - model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjPastVO)); - - List list = adjReqMgrPastService.findAllAssPstInfo(adjPastVO); - list.stream().forEach(System.out::println); - /* 참석 인원 select */ - model.addAttribute("assInfoList", adjReqMgrPastService.findAllAssPstInfo(adjPastVO)); - + DrtVO drtVO = new DrtVO(); + drtVO.setAdrSeq(adjPastVO.getAdrSeq()); + drtVO.setAdrSn(adjPastVO.getAdrSn()); +// model.addAttribute("assList", drtService.selectAssRegList(drtVO)); + + model.addAttribute("info", adjReqMgrPastService.findByIdAdrMgrMaster(adjPastVO)); + + /* 조정부 / 조정조사관 select */ + model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjPastVO)); + +// List list = adjReqMgrPastService.findAllAssPstInfo(adjPastVO); +// list.stream().forEach(System.out::println); + /* 참석 인원 select */ + model.addAttribute("assInfoList", adjReqMgrPastService.findAllAssPstInfo(adjPastVO)); + + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } return "/kccadr/adjReqMgrPast/drtUpdtPop"; @@ -730,6 +735,21 @@ public class AdjReqMgrPastController { } + @RequestMapping(value = {"/kccadr/adjReqMgOff/selectAssMgrPstEncryption.do"}, method = RequestMethod.GET) + public ResponseEntity selectAssMgrPstEncryption() throws Exception { + + + try { + adjReqMgrPastService.selectAssMgrPstEncryption(); + } catch (Exception e) { + return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "암호화 중 오류가 발생하였습니다.", LocalDateTime.now())); + } + + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "암호화가 완료되었습니다.", LocalDateTime.now())); + + } + + private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { PgrCmmVO dntVO = cmmService.selectPgrCmm(cmmVO); if (!StringUtil.isEmpty(dntVO.getMemNames())) { diff --git a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java index cc86b8de..d0ca8186 100644 --- a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java +++ b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java @@ -228,6 +228,7 @@ public class SearchServiceImpl implements InitializingBean, SearchService { IOUtils.closeQuietly(client); } +// resultList.forEach(t-> System.out.println(t.toString())); resultList.forEach(t-> { t.put("resPonDentNm", egovCryptoUtil.decrypt((String) t.get("resPonDentNm"))); t.put("appliCantNm", egovCryptoUtil.decrypt((String) t.get("appliCantNm"))); diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index df32c0af..c1aed06f 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -187,6 +187,11 @@ Globals.Innorix.FilePath=D:\\usr\\local\\tomcat\\file\\sht\\ Globals.pay.mid=INIpayTest Globals.pay.signKey=SU5JTElURV9UUklQTEVERVNfS0VZU1RS Globals.pay.siteDomain=http://119.193.215.98:8081/web/kccadr/inipay + +#DB \uc554\ud638\ud654 \uc194\ub8e8\uc158 \uc815\ucc45\uba85 +Globals.MagicDB.PolicyName=POLICY001 + + #\uc2e4\uc11c\ubc84 #inipay \uacb0\uc81c #Globals.pay.mid=crosorkr01 diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml index b2c2f1a4..6a59d13a 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml @@ -344,6 +344,16 @@ AND a.prtcl_seq = #prtclSeq# + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index 0971b7ed..007d9ff4 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -459,6 +459,15 @@ ) + + + + UPDATE ADR_ASS_MGR_PST SET + ASS_PST_USR_NM = #assPstUsrNm# + WHERE + ASS_PST_SEQ = #assPstSeq# + + @@ -1176,6 +1185,15 @@ + + + + + + +
+ + + + + + + +
+
+
+

진행 안내-최대 10분까지 소요될 수 있습니다.

+
+
+
+

문서보기 파일 생성 중 입니다.

+

STEP1/3 - PDF파일로 변환 중 입니다.

+
+
+ 로딩중 +

정보를 불러오고 있습니다.

+

잠시만 기다려주십시오

+
+
+
+
+ + + +
+
+
+

진행 안내-최대 10분까지 소요될 수 있습니다.

+
+
+
+

선택다운로드 파일 생성 중 입니다.

+

STEP1/1 - PDF파일로 변환 중 입니다.

+
+ +
+ 로딩중 +

정보를 불러오고 있습니다.

+

잠시만 기다려주십시오

+
+
+
+
+ + +
+ " /> + " /> + " /> +
+ + + +
+ + +

신청 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 일자 + + 등록인문건명상대방공개여부
+

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

+ 		+

${list.frstRegistPnttm}

+ 		+

+ ${list.frstRegisterId} + + () + + + (조정조사관) + +

+ 		+ + + '); return false;">${list.adrDocTy} + + + <%-- +   + --%> + + + + + +

+ + 공개 + 비공개 + ${list.adrDocCn1} + + + + +

+
+ +
+
+ +
+
+ <%-- --%> + + <%-- --%> + + +
+ +
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp index f9d7aa79..5c53878b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp @@ -39,6 +39,25 @@ //해당 페이지에 대한 권한 체크 _admin_fn_check_authority("internalApprovManageDetail", "div.cont", "R"); + // 신청취지, 원인 숨김 + $('.reqCn').hide(); + + + // 파일영역 호출 + var url = '/kccadr/adjPgrMgr/apm/internalApprovManageDetailFileView.do'; + $('#tabFileContent').load(url, { + "adrSeq" : $("#adrSeq").val(), + "adrSn" : $("#adrSn").val(), + "reqOlCd" : $("#reqOlCd").val() + }, function(res, status, xhr) { + console.log(status); + $('.tab_cont .tbType02').find('button').remove('button'); + $('.tab_cont .btn_wrap .area_left').find('button').remove('button'); + $('.tab_cont .btn_layout05').find('button').remove('button'); + $('.tab_cont .tb_tit').find('button').remove('button'); + //btn_wrap btn_layout05 + + }); }); //권한 체크 결과값으로 후속처리 @@ -93,6 +112,7 @@ if(returnData.result == 'FAIL'){ if(returnData.message != ''){ alert(returnData.message); + fncGoList(); }else{ alert("처리중 오류가 발생하였습니다."); } @@ -151,6 +171,29 @@ detailForm.action = ""; detailForm.submit(); } + + // 더보기 버튼 event + function fn_viewMore(){ + + // 더보기 활성화 전 상태 + // 모든 목록 보여줘야 함 + // 모든 목록 : 신청취지, 신청원인, 첨부파일 + // else는 반대 + if($('.reqTempCn').is(':visible')){ + + $('.reqTempCn').hide(); + $('.reqCn').show(); + } + else + { + $('.reqTempCn').show(); + $('.reqCn').hide(); + + } + + } + +