diff --git a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java index 31c42ef1..8e40d377 100644 --- a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java +++ b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java @@ -32,12 +32,13 @@ public final class MagicDBAPIUtil { } public static String encryptOnlyOneString(String stringVal) { - return MagicDBAPI.encrypt(POLICY_NAME, stringVal); +// return MagicDBAPI.encrypt(POLICY_NAME, stringVal); + return stringVal; } public static String decryptOnlyOneString(String stringVal) { -// log.info(" stringVal :: [{}]", stringVal); - return MagicDBAPI.decrypt(POLICY_NAME, stringVal); +// return MagicDBAPI.decrypt(POLICY_NAME, stringVal); + return stringVal; } } 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 2a3d8a16..aefeac43 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -217,5 +217,10 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { } + public void deleteAdrAssMgrPstRows(AdjReqMgrPastVO adjReqMgrPastVO) { + delete("adjReqMgrPastDAO.deleteAdrAssMgrPstRows", adjReqMgrPastVO ); +// delete("adjReqMgrPastDAO.deleteAdrPrtclMgrRow", adjReqMgrPastVO ); + } + } 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 83fa7fb6..e44aaa5c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -648,7 +648,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAddYn(addusrList.split("\\|")[1]); - + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm())); adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); } @@ -660,6 +660,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[1]); adjAssMgrPastVO.setAddYn("Y"); + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm())); adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); } } @@ -673,9 +674,9 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAssPstUsrTy(addusrList.split("\\|")[1]); adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[2]); + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm())); adjAssMgrPastVO.setAddYn("Y"); - System.out.println(" adjAssMgrPastVO.getFrstRegisterId() :: "+adjAssMgrPastVO.getFrstRegisterId()); if(StringUtils.isEmpty(adjAssMgrPastVO.getAssPstSeq())){ adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); adjAssMgrPastVO.setAddYn("Y"); @@ -726,7 +727,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 이름이 key값이면 rppl 테이블에서 가져와 기존 암호화 로직을 태운다. if(t.getAssPstUsrNm().indexOf("RPP") < 0) { - System.out.println("???"); + System.out.println("t.getAssPstUsrNm() : "+ t.getAssPstUsrNm()); t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm())); } else @@ -946,7 +947,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements if("Y".equals(adjReqMgrPastVO.getAdrSnChgYn())) { if(prtclRowList.size() > 0) + { adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0)); + adjReqMgrPastDAO.deleteAdrAssMgrPstRows(prtclRowList.get(0)); + } int adrSn = Integer.parseInt(prmtrAdrSn); int cnt = 1; logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn); @@ -1211,7 +1215,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements resultList.forEach(t->{ if(!t.getAssPstUsrNm().startsWith("[")) { - if(t.getAssPstUsrNm().indexOf("RPP") < 0) + if(t.getAssPstUsrNm().indexOf("RPP") < 0 && StringUtils.isNotEmpty(t.getAssPstUsrNm())) { System.out.println("t.getAssPstUsrNm() :: "+ t.getAssPstUsrNm()); System.out.println("t.getAssPstUsrNm().startsWith(\"[\") :: "+ t.getAssPstUsrNm().startsWith("[")); 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 b0abb4bd..20702f6c 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 @@ -883,7 +883,11 @@ DELETE FROM ADR_PRTCL_MGR WHERE ADR_SEQ = #adrSeq# - + + + + DELETE FROM ADR_ASS_MGR_PST + WHERE ADR_SEQ = #adrSeq# diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp index 8e172607..2754d11c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp @@ -194,6 +194,10 @@ +
+ +
+ diff --git a/src/main/webapp/kccadrPb/tutorial/css/tutorial.css b/src/main/webapp/kccadrPb/tutorial/css/tutorial.css index de288dbb..592d3709 100644 --- a/src/main/webapp/kccadrPb/tutorial/css/tutorial.css +++ b/src/main/webapp/kccadrPb/tutorial/css/tutorial.css @@ -2,7 +2,10 @@ body{position: relative; width: 100%; height: 100%;} .tutorial{width: 100%; height: 100%; overflow-x: hidden;} .tutorial img{position: absolute;width:100%; left: 50%;top: 0;transform: translateX(-50%);} .mask{position: fixed; display: flex; width: 100%; height: 100%; left: 0; top: 0; z-index: 5;} -.left_mask,.right_mask{width: 50%; height: 100%; background-color: transparent;} +.left_mask,.right_mask{width: 50%; height: 100%; background-color: transparent; background-repeat: no-repeat;} +.left_mask{background-image: url(/kccadrPb/tutorial/image/prev_btn.png); background-position: 10% center;} +.left_mask.first,.right_mask.last{background-image: none;} +.right_mask{background-image: url(/kccadrPb/tutorial/image/next_btn.png);background-position: 90% center;} @media all and (max-width: 1800px){ .tutorial img{width: 100%; min-width: 1680px;} } \ No newline at end of file diff --git a/src/main/webapp/kccadrPb/tutorial/image/01.gif b/src/main/webapp/kccadrPb/tutorial/image/01.gif index f34ada83..448c21f7 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/01.gif and b/src/main/webapp/kccadrPb/tutorial/image/01.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/02.gif b/src/main/webapp/kccadrPb/tutorial/image/02.gif index 3bf983eb..f81db992 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/02.gif and b/src/main/webapp/kccadrPb/tutorial/image/02.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/03.gif b/src/main/webapp/kccadrPb/tutorial/image/03.gif index 9da5fecf..4f5a213f 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/03.gif and b/src/main/webapp/kccadrPb/tutorial/image/03.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/next_btn.png b/src/main/webapp/kccadrPb/tutorial/image/next_btn.png new file mode 100644 index 00000000..2f5a416a Binary files /dev/null and b/src/main/webapp/kccadrPb/tutorial/image/next_btn.png differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/prev_btn.png b/src/main/webapp/kccadrPb/tutorial/image/prev_btn.png new file mode 100644 index 00000000..99fb3d35 Binary files /dev/null and b/src/main/webapp/kccadrPb/tutorial/image/prev_btn.png differ diff --git a/src/main/webapp/kccadrPb/tutorial/tutorial.html b/src/main/webapp/kccadrPb/tutorial/tutorial.html index 5c8eb00f..1dc21694 100644 --- a/src/main/webapp/kccadrPb/tutorial/tutorial.html +++ b/src/main/webapp/kccadrPb/tutorial/tutorial.html @@ -20,6 +20,7 @@ if(imgSrc.indexOf("19.gif") > -1){ $("img").attr("src","/kccadrPb/tutorial/image/18.gif"); $("body,html").animate({scrollTop : 600}, 400); + $(".right_mask").removeClass("last"); }else if(imgSrc.indexOf("18.gif") > -1){ $("img").attr("src","/kccadrPb/tutorial/image/17.gif"); $("body,html").animate({scrollTop : 400}, 400); @@ -69,6 +70,7 @@ }else if(imgSrc.indexOf("02.gif") > -1){ $("img").attr("src","/kccadrPb/tutorial/image/01.gif"); $("body,html").animate({scrollTop : 0}, 400); + $(".left_mask").addClass("first"); } }); @@ -77,6 +79,7 @@ if(imgSrc.indexOf("01.gif") > -1){ $("img").attr("src","/kccadrPb/tutorial/image/02.gif"); $("body,html").animate({scrollTop : 400}, 400); + $(".left_mask").removeClass("first"); }else if(imgSrc.indexOf("02.gif") > -1){ $("img").attr("src","/kccadrPb/tutorial/image/03.gif"); }else if(imgSrc.indexOf("03.gif") > -1){ @@ -127,6 +130,7 @@ }else if(imgSrc.indexOf("18.gif") > -1){ $("img").attr("src","/kccadrPb/tutorial/image/19.gif"); $("body,html").animate({scrollTop : 300}, 400); + $(".right_mask").addClass("last"); } }); @@ -135,7 +139,7 @@
-
+
diff --git a/src/main/webapp/kccadrPb/usr/css/content.css b/src/main/webapp/kccadrPb/usr/css/content.css index 118d6fc9..3f2c65fc 100644 --- a/src/main/webapp/kccadrPb/usr/css/content.css +++ b/src/main/webapp/kccadrPb/usr/css/content.css @@ -745,6 +745,12 @@ table .label{position: absolute;width: 1px; height: 1px; margin: 0; border: none .popup_wrap .work_flow_wrap.off .work_cont {height:0;padding:0 15px;} /* //워크플로우 */ +/* 자주쓰는 의견 목록 fixed 버튼 */ +.opinions_fixed {position:fixed;right:50%;bottom:370px;width:116px;height:116px;margin:0 -750px 0 0;background:#fff;border-radius:40px;box-shadow:0px 0px 14.25px 0.75px rgba(0, 0, 0, 0.15);} +.opinions_fixed button {width:100%;height:100%;text-align:center;} +.opinions_fixed button i {display:block;width:100%;height:100%;background:url(/kccadrPb/usr/image/icon_fixed_opinion.png) no-repeat center center;} +/* //자주쓰는 의견 목록 fixed 버튼 */ + /* 익스플로어 */ @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none){ /* 공통 */ diff --git a/src/main/webapp/kccadrPb/usr/css/content_media.css b/src/main/webapp/kccadrPb/usr/css/content_media.css index 92bc26e9..5b044abd 100644 --- a/src/main/webapp/kccadrPb/usr/css/content_media.css +++ b/src/main/webapp/kccadrPb/usr/css/content_media.css @@ -6,6 +6,8 @@ @media all and (max-width: 1280px){ .work_flow_wrap{display: none;} + .opinions_fixed {width:80px;height:80px;right:20px;bottom:205px;margin-right:0;border-radius:30px;} + .opinions_fixed button i {background-size:43px;} } @media all and (max-width: 1150px){ @@ -383,6 +385,8 @@ .text_ul .btnType09{width: 100%;} .file_list li{padding-left: 30px; box-sizing: border-box;} + + .opinions_fixed {bottom:320px;} } @media all and (max-width: 540px){ diff --git a/src/main/webapp/kccadrPb/usr/image/icon_fixed_opinion.png b/src/main/webapp/kccadrPb/usr/image/icon_fixed_opinion.png new file mode 100644 index 00000000..72fbb495 Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/image/icon_fixed_opinion.png differ