From 427d97347607c5cbea0db3ca9bb19b2b395d05da Mon Sep 17 00:00:00 2001 From: thkim Date: Thu, 16 Jan 2025 14:53:43 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=88=8C=EB=A0=80=EC=9D=84=20=EB=95=8C=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EB=AA=A9=EB=A1=9D=20=ED=95=9C=EB=B2=88?= =?UTF-8?q?=EC=97=90=20=EC=95=88=20=EB=82=98=EC=98=A4=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=20=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=B3=B4=ED=98=B8=EB=A5=BC=20=EC=9C=84=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 2_apply.bat | 7 +- admin_list.txt | 40 +- old/GeneralUserMngController.class | Bin 27810 -> 0 bytes old/HomeTrainingMapper.class | Bin 1145 -> 0 bytes old/HomeTrainingMapper.xml | 88 - old/HomeTrainingService.class | Bin 1010 -> 0 bytes old/HomeTrainingServiceImpl.class | Bin 7432 -> 0 bytes old/Login_SQL.xml | 42 - old/MainController.class | Bin 10248 -> 0 bytes old/MyUtil.class | Bin 18961 -> 0 bytes old/action-servlet.xml | 88 - old/add.png | Bin 1576 -> 0 bytes old/arrow-right.png | Bin 758 -> 0 bytes old/chevron.png | Bin 191 -> 0 bytes old/chevron.svg | 3 - old/delete.png | Bin 276 -> 0 bytes old/json-simple-1.1.1.jar | Bin 23931 -> 0 bytes old/left.jsp | 195 - old/main.jsp | 173 - old/mainframe.jsp | 22 - old/minus.png | Bin 2042 -> 0 bytes old/style.css | 782 -- old/style.css.map | 1 - ...nstructionProjectManagementController.java | 553 + .../admins/user/GeneralUserMngController.java | 11 +- .../webapp/WEB-INF/views/admins/board/00.jsp | 22 +- .../constructionProjectManagement/00.jsp | 401 +- .../constructionProjectManagement/00_view.jsp | 132 + .../00_view_Ini.jsp | 126 + .../constructionProjectManagement/01.jsp | 183 + .../constructionProjectManagement/02.jsp | 185 + .../constructionProjectManagement/03.jsp | 37 + .../constructionProjectManagement/05.jsp | 98 + .../05_addUser.jsp | 308 + .../constructionProjectManagement/07.jsp | 125 + .../constructionProjectManagement/40.jsp | 189 + .../constructionProjectManagement/40_view.jsp | 84 + .../construction-project-statistics-index.jsp | 177 + .../home-training-approval-system.jsp | 0 .../constructionProjectManagement/left.jsp | 92 + .../passChange.jsp | 92 + .../visit-training-approval-system.jsp | 0 .../visit-training-index.jsp | 0 .../WEB-INF/views/admins/frame/mainframe.jsp | 2 +- .../webapp/WEB-INF/views/admins/frame/top.jsp | 5 +- .../WEB-INF/views/admins/main/index.jsp | 2 + .../webapp/WEB-INF/views/admins/main/main.jsp | 2 + .../webapp/WEB-INF/views/admins/user/00.jsp | 39 +- src/main/webapp/css/admins/sass/style.scss | 39 +- src/main/webapp/css/admins/style.css | 35 + src/main/webapp/css/admins/style.css.map | 2 +- .../1_tit_01.gif | Bin 0 -> 4116 bytes .../1_tit_01.xcf | Bin 0 -> 13207 bytes src/main/webapp/js/admins/chart.js | 11482 ++++++++++++++++ 54 files changed, 14329 insertions(+), 1535 deletions(-) delete mode 100644 old/GeneralUserMngController.class delete mode 100644 old/HomeTrainingMapper.class delete mode 100644 old/HomeTrainingMapper.xml delete mode 100644 old/HomeTrainingService.class delete mode 100644 old/HomeTrainingServiceImpl.class delete mode 100644 old/Login_SQL.xml delete mode 100644 old/MainController.class delete mode 100644 old/MyUtil.class delete mode 100644 old/action-servlet.xml delete mode 100644 old/add.png delete mode 100644 old/arrow-right.png delete mode 100644 old/chevron.png delete mode 100644 old/chevron.svg delete mode 100644 old/delete.png delete mode 100644 old/json-simple-1.1.1.jar delete mode 100644 old/left.jsp delete mode 100644 old/main.jsp delete mode 100644 old/mainframe.jsp delete mode 100644 old/minus.png delete mode 100644 old/style.css delete mode 100644 old/style.css.map create mode 100644 src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java rename old/home-training-index.jsp => src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00.jsp (63%) create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00_view.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00_view_Ini.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/01.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/02.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/03.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/07.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/40.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/40_view.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-project-statistics-index.jsp rename {old => src/main/webapp/WEB-INF/views/admins/constructionProjectManagement}/home-training-approval-system.jsp (100%) create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/passChange.jsp rename {old => src/main/webapp/WEB-INF/views/admins/constructionProjectManagement}/visit-training-approval-system.jsp (100%) rename {old => src/main/webapp/WEB-INF/views/admins/constructionProjectManagement}/visit-training-index.jsp (100%) create mode 100644 src/main/webapp/images/admins/constructionProjectManagement/1_tit_01.gif create mode 100644 src/main/webapp/images/admins/constructionProjectManagement/1_tit_01.xcf create mode 100644 src/main/webapp/js/admins/chart.js diff --git a/2_apply.bat b/2_apply.bat index 0e79bd7..dcbc3ae 100644 --- a/2_apply.bat +++ b/2_apply.bat @@ -75,7 +75,12 @@ for /f "delims=" %%i in (admin_list.txt) do ( set source_file=%target_directory%!line! set relative_path=!line:%source_prefix%=! set target_file=%target_prefix%!relative_path! - ) + ) else if "!line:~-4!" == ".gif" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) + rem Copy the source file to the target location, overwriting if necessary echo Copying "!source_file!" to "!target_file!" diff --git a/admin_list.txt b/admin_list.txt index 1b8295a..8b0ee32 100644 --- a/admin_list.txt +++ b/admin_list.txt @@ -1,25 +1,21 @@ -src\main\webapp\WEB-INF\config\springmvc\action-servlet.xml -src\main\webapp\WEB-INF\views\admins\user\left.jsp -src\main\webapp\images\renew\arrow-right.png -src\main\webapp\images\renew\add.png -src\main\webapp\images\renew\chevron.png -src\main\webapp\images\renew\chevron.svg -src\main\webapp\images\renew\delete.png -src\main\webapp\images\renew\minus.png src\main\webapp\css\admins\style.css src\main\webapp\css\admins\style.css.map -src\main\java\geoinfo\admins\user\GeneralUserMngController.java -src\main\java\geoinfo\admins\user\service\HomeTrainingService.java -src\main\java\geoinfo\admins\user\service\impl\HomeTrainingServiceImpl.java -src\main\java\geoinfo\admins\user\service\HomeTrainingMapper.java -src\main\resources\geoinfo\sqlmap\mappers\admins\user\HomeTrainingMapper.xml -src\main\webapp\WEB-INF\views\admins\user\home-training-index.jsp -src\main\webapp\WEB-INF\views\admins\user\home-training-approval-system.jsp -src\main\webapp\WEB-INF\views\admins\user\visit-training-index.jsp -src\main\webapp\WEB-INF\views\admins\user\visit-training-approval-system.jsp -src\main\java\geoinfo\util\MyUtil.java -src\main\webapp\WEB-INF\lib\json-simple-1.1.1.jar -src\main\java\geoinfo\admins\main\MainController.java -src\main\resources\geoinfo\sqlmap\mappers\admins\main\Login_SQL.xml +src\main\webapp\images\admins\frame\top_menu.gif +src\main\webapp\WEB-INF\views\admins\frame\top.jsp +src\main\webapp\WEB-INF\views\admins\main\index.jsp src\main\webapp\WEB-INF\views\admins\main\main.jsp -src\main\webapp\WEB-INF\views\admins\frame\mainframe.jsp +src\main\webapp\WEB-INF\views\admins\constructionProjectManagement\00.jsp +src\main\webapp\WEB-INF\views\admins\constructionProjectManagement\left.jsp +src\main\webapp\WEB-INF\views\admins\constructionProjectManagement\construction-project-statistics-index.jsp +src\main\webapp\images\admins\constructionProjectManagement\1_tit_01.gif +src\main\java\geoinfo\admins\constructionProjectManagement\ConstructionProjectManagementController.java +src\main\webapp\js\admins\chart.js +#일반사용자관리 첫 화면 사용자 목록 안 보이도록 하기 +src\main\webapp\WEB-INF\views\admins\frame\top.jsp +src\main\webapp\WEB-INF\views\admins\main\index.jsp +src\main\webapp\WEB-INF\views\admins\main\main.jsp +src\main\java\geoinfo\admins\user\GeneralUserMngController.java +src\main\webapp\WEB-INF\views\admins\user\00.jsp +src\main\webapp\js\admins\adlogin.js +src\main\webapp\WEB-INF\views\admins\main\index.jsp +src\main\webapp\WEB-INF\views\admins\frame\mainframe.jsp \ No newline at end of file diff --git a/old/GeneralUserMngController.class b/old/GeneralUserMngController.class deleted file mode 100644 index 99cfb80df8e90094d730e5821ceb4697defe5b4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27810 zcmeHv33yc1+5h{Vn`CY#Hz8!$22tXIEFlCCSrSBnumst|BB0`s8IplyCd^D&v??kh zDz)wkiW@3bQBgF2sCBEhR$Hr9ty*hqT`I9^{kmKEe($+=wqyc9?PI_H^XJjz+;h+R zF28p<=jQpZ9(kOIjx#D;q?iWQ2ExJ6(r}s2-w+H%%bKErNZF)7C=l`0&qaA!sCIlf z6pMuG>jM!NWib^l^R4ui)%!xVWiys63)IAz@*8~7SRhgzh^!3O1elJSnrT#wCa+tK z?sTeP^3HAw#exlidBJFKNqt~!C=`zQV!?1I%5>ONnRRuUFHu=GI}i;wMQQ@*nHBOi zVA`&=Y3oib$5R(>2+WE2f}vojHc>m|fQy{mwhJc8nL1TUItTTw5E6pphB%tqjcc#p;-f^s;SYRmUQjUfz$csmD@cW0;J7{pVr%w~LNo>fX*yEGniWnQ}3Xy)~xNer*Tp-!3I`iRoyI@~HreoEi)TrZ+V# z2}I`jz+53sxW-pM&ld^Gvs0NfS`)@i2KBS(SSm7U03>dbEu(`b2J1Cp-87H}xu_K4 z8>kJhTpGbXSA`?X%WA?6Wi<^AWpPoPfVVRv;l@BD77TzgWi*&64?A)y*DxKMaZgE_ zI&72847I2e6@p)}x*%k7P(}f2Pj|rhf@q)~`cegTn;MKlZ?1FZZi)r#%O?Axb<=!} z6`G#WMiG|e#+rg<(;y`Ex`C|Z6OzsJ*YXXg0`CK%L$&(~V;tgb@I#?U>#hN1E=VKZ6GP`dpkUz|HR63~5^ogtjE7QH%(M1!Odc+|l8i+;#o@IjKB61c@qR9}#V050ZKIpHuUo-h_#;w*$ zlUbl_K{=>ArOI6z=Jj7_(iA2#X)4q&8t_GG>c-WE{4qC8rX{0Wjw2>Jan7cFI~ zNQbpZEKt@Mt1oL1E8+xRW!f93^W2}+JXEOCorJe)0?e+PdMP~~m&0r`7 zL2e4jg3q;Rtt_}J7Cbvp6OQ=Dhv7`j3`Atz(&BuJE|3hP99xBSGnj)rXg{4 zO~np@>~=jRi;kzOnff?1OI4XTmg_n(F%@}qEnV-T>!9~Z1(P=xZIXp%ML`E?bc3kd zjUw=A+)C)xO|bqMgfd!R=J&;XzM2}qNtvEkY%Z|Tq+1|?F}QH`k?^Xho3_wQvFlqc zx?TJeGZv0(XMpasXq#}y1MbX`E-6ej=`ILuqW~vHxrgp`(RQZZ;-R@Y`X!SJ z`b~NT>KJT9oq+VOEc!9M##EVs%wR|c{b(N%0mfI*8y5YV-qfa5Vu7(5I0Y`mP_`BN zivIIVdK+FwO}&QDGfes|Hf|%2Nxy@%XCM&N-SPgIiVr4MOl60-56~{DJXIlh8a*>C zVlm!;Q?lugEP9__GwEa4Uk8U^HDG^R5Pr7P75LhSXm)%Z5)D9ZZ)&sT3oQztfg+N( zsPen%&-6bo`U36ac2z<`Cw?3sZfFRHEc%N?fpCr@(Lg1Pm#pw_7X4k=Vl}Rs+bCL?{l2+EeH}+T&6L>D_yO!9knn~7f`xVvqB^pjHjRUzF>}`J>N#`g%|B(q zLf?`ae_&~CU2xg*`i4-raRpq;rj@H!uQ_w@kfFy7JAU|xk)vFk4MovjSTs=66bZ)G zlvPV1FxwaMha23SMg3fCLM3#g6r3N|6s-3LB5rn3KQ!Y!i!IKFmWKkXkxqay6}P+! zUOsoSxR5(TA!_P;k+II3@#x7Oi@Pv#OgV^K10m3)SHJP8PPT1QoT(~guB|5b02t1l zGqH4}n|pFE7XvqYrD#@z?ebOEM1qa6xyWKzd^jVgBuS&{I^WRahqnri9J^%$UCItK z88_KZvBgL7Q5Z1Vv?Qt%XgZ)s^HH5KO+E(tTNm{E1EKMCGohR&ADaXmXnMfpezJdH zZez^N19+f|OMswBazmFRz8Zw*2uv91r5@=dO1u^*=Q4{23ubg}(uiTl*+Cl>mJ06i zP>YX~7DdSxvMw9$vxP$l!*U{;{UEGOm5jmxK~zyho8C5*i!%%k6@WO;9!v)^4uT>v z=8ptid;+5AgW1QpW2v!ib^w{3&@>5y+vr&0oylV{>+)bttTq@GSvPq+u<^(vQ>t7% z0iN)xx^OUBrhisXt9Emx$Z{o5wz!Ilw8er1Egfm{$=J$Nc{R=A>5SY!HWIACQ06eP z4L!tS@+_Ojl2k1$opbO^LPDC5n9UzNWN_&S=x^z;FEWIE01oXVZHr2l#~$d6#w3oTwR za%~108hq6NT&dh(@x>B$yS48blf1uFUuyBjq)Qru%0(q@fj5^~`~&G=p~F-hvdqL` z4LEj%4(N1$ldr;fkwCnc$=9Gco>Q75{C9~wG(>An-sA|eNQ=ogfTFgjIE5fAgIj6@ z$X4MYSF7w|R7pgauEl^Qtq?IpZqSCPANd{!#xlwp+Go{F4(rl|2PuO?FN%=N>u5Y@~Z_(#U3p&L0u9WPB35fDHArl1l z!pW!)*4X*UWzld*Ql|aHCf;xHHhNP^4_N$QN+^UO9KM?T5aeWOy|32I&Ai*iyV4Sk zLZ*wWmQ{{}<WQ{s&Ii z_@8iOlMWm>js)OtRg0J*Nu0rxO1l%#&Y-$` zgwoP~vAbF^2K z@dyzEc7mum4NLt&pl&oMr+KDA^xnl6L$m&Hof=dvb45hs5+(aOdtroGz#JZN^1zn zAOmRKum)pFYa!Hu*T!^w`fMG90!VQq9O?;?2ySSI<^WO-a)@0U1A}wbXf?*A zkX%W*7gxOo*Wns0b)q^6RwXQw)zy|62=7eX>~Ykg!c@4y(JfUhitU5W;?iRAn76vs z1U1Q}CdTzMy}zX<3*@-uvQVr(1dmfqvDC@padx&n&iR2Q(*knqsw(7C(_j$~h1+g5 zRm~8lfQdenJLC%H?%(LXoNOVtIIT9?c?X`0WSU1h5Eu<*rI)5}e@L2^d1h!D?Ixbebn zm)eLM3ayu@kI^EU$Vje1AKdCvWbD+X>Ias(Tp?4Ht(&yUygF&t)X+VC*F+(q;#=cZSE_3)b*;J%0Sp|2h%XivC68Zn)o@hh)K}!GP3i`h+6-h#y1?bX#bX|}3sTqCAk_7)h64wvUeF4BJB~q{8&BbQqKbY zlMc4LvD8o0PqDyyl=USwSekzQrSd{GjdBu<>g&;# z`m1F5J82h8Uopam1~s7A-$A_M8FS|VO8?1pxS%@xetmHZOBFb?$*q?Ql=;$9|CTLU zsW0)E+EJ40tyh(1-Q3dJhT(YVlWIb_a%oEcze=9qJpSXW~f@ zoLfJCCGJqxR^bSOr{I5tfQ}Qbr%7-?)&^;sBN*Pd%@&+3>+Pm?k;pU^O_|mn5`v~9 z@Xw`B|dd#Lymq>VRU{mC^q7E7Xb&$^aNZbvrQ!Dk?QK#OztR`LcPq`^*R4Llev z;p8;L2`V(}YZ=D~&AQnqVX0Cqqay0+(1><#FiFNNv5bCdhiQ}w4bH!}<(3=Urvdy_ zVR`(6s(vf8zyNKQI~*8Qtv@=Oh@>1)y}gfp28kLom1GPB8cF3SDXP%BD?rU?{C~nC;wX)w z6Y(xznw^A#{SO;Zr(zm6#yZ}cRa!K5H;vy+IYm`FN{UWyrfE-5b$PZo`&sJl&2FZ- zh2|}k@69e+&`gUqlZ7@#Rn4?`eo0Y{(>TYQBaL$sjdPNXYwX5*DX?G{)t0+Tit5no zS?XL=Wfz-i*(P*$Wi?X>HCekUBBO7UI=cndvzt~o(^+WYbrrgs=^Xplc_l^byslz1Bbsh&iM3SCIb#xg8@s+?bx{;RC4hqpO3e)3w`yxf?ZHm!HIDzeq zk3D+O8ZO3n9R2Am9*VCsM3R=;40EIatfRZA8H|E&LK z#6rl+MEaEcDCJgJ4g7d?d;>{d@h1D?UV zBgtLxB^~XeYBTW*-#rFAo-b*Fi>^iXh;haD*$g83Tm}*Si5AgL*=Zt5qGj9@>(9lE zr=<&N(ND{Byjgn)p1+9GOCon7jV}v-7SDIM{;F`@DZj4BYZkp#QuG!?ubF-WuD)Y) zwdma>GY5fn`we@lM=xrG(B^2@lw3Sodj zEL#44he`ZF`y?)LNWARpkody`llYG%MSs-v7A=a?dtZ{?L$No4M&{8Cp!ZFn#m%7i zt=Ro-p!ZhL;dapb4$%8fIvroL)Pe@02sX`^C1}1ZLGxt^nlDSxd|86#%Mvs{B|-BU z37QXSLvtCo70o~CF!KJX9pr_+8sIF^taOT(6n$!g>2CVGJbPf#rvkkIn-0nPUlkSo zBT3i+f)sQ=2)hG>-ATRZArP*a`hz?}L6{0)L?y^F9T*@4ooz2DLC{$Vg3d}1bXJ0( zvmAozrF6kQpu6&e3UUuHmue`|E;0nr`}_^}PxSF|6742}VF zoS;}R{@DgiOj$RGuqf`!1LKw~n|FA#(&*`7Ri3k#vli^)oO0J*cA=14ZW_aLx6zSa z7hc13HM4uT+iT*XtGk&Cnz?BHx?Jv>Tj;)Zzlbk)^Kkdw>@^CzG;{CrTyK_#kM_b? zES@jZrA=v9dbp1?>XYDXyt;4Ukloxrj#dCO9;8UXN{T}iggv`Fhj(C?htbdI=dkg% zy_v4PkEg-kXP`XK;_XkV7%lqagN>o!!AMYl0=Ms?%UU+FF!L^l`^9t*57Q9V zpKjyhc{tcOls54Q9tpWRp8D}9ZC57XtMzh}+*s8ju0Rjl*4O|i<35F53cyuTwzZ#1 z$n7HBnZCzGFSvNLi>AZm$bX#W!sTnC!}rrF%4yq1I*k;G8PicQ;}Z`mX2x?coZTRI zR~<~ugyVe+hqmRfhfgYpsEsQ(_i`l!a3Vw~x0xq-cuKk33&%rbY^rph34z(ov&-{5 zJh$AEn)yymzC6GY)2|EmQuP9F0i?2-7kPN`F7}ldNCUsqpp!f-bsh@kL3}S6xwAYh za~_Jk`OncYd%1prheHo?<1SuV?%B(0u*S2>yLdfb$ou!o^RdJ{ujMW9=6j(ZYh~^0 zD3M2n~WaH44%? z2L91_9)XXiN75|F=R6)wi}@s~=W+OGvXaih4eCpI3f;`pX*&b^cn&?w^XU~{NN?~W z`jAhh&-gU@2cLn@3zp!^0Y5$kSc=R1b+}u|!Dka3j6Wf0%)s<;lKBu)l&5WQ^#F2-E84vxVE z?;EunF&>`-Zb3;t5kHA<;+vsw^LRMlf;u;LTFf_~l!yHu#+y*GucU-UHD3XZ z_wZquyAx~SqcGO=GpfXvuF(KtA(SEw-fVgl+ zhjHP~gW>|5YD3$tiUZ(+C|gEINReN}b|Vtd?5|viy*(3 zXqg!UKqA<3J1UftBQq#DGJ{eaw=3c@1AAf1%#-MCW3Rl6)4!Mu(0{-I>9>u4*w%dW zU78HV+I$ALgrDH%2?U6zpbNO0` z>h<_rFq;4yH{dU(+z8Tdp%bA*Q=ve!_*VQ;gWIW&@6fDh>ygG;Vf&$CLTx`((h;`5 zDxr;!ABQ4mL-~g}4pcEx3w9KM@SlIgPk_n7C>@aLp28@*=Tqn@=CU`b{WK%NF)@`d zXlpqgmXIGstiVrpm}5_MoMS%#$0R)4nBZ9HKqr?_lt%N`?iivscup`rIw&$D-t{{2Z#~h1D@UsAi59yyq}K3HR&O|lg9GH zbTT&s7WaS`k5GvBQWQPc@{jN*37$yd?Z$+fZA_@yMy*`J+l^Y`gtr?VHOr+79NrE= zT0j&ohsI*AV^DJ8?=;xFwIe*6x6;$*t@MoZwuFo?=_qh>KfHC*!Ne2}+c=ou^RxV1 z2F?75*37ib5dSo;hpjS0(8FvU4s1%0FIri< z(q*{q{5Tl83|RaD{}t2~6$NtY_I9*mw-+|r?Vm<_mOH;_)hctxf798HAjmH2v=id| zhdumv$xdBco{gvX?I-?MdCovQe(1ccZssq`T?64a0^$r~w^Gm^W$saKXbegP66bhS z;VxAqCG^}E?+F)B*TUmdU2Kof@%P~AHLGq;tfRard(;v7XR%$sM;&Eg_&ur*(l6#f z_^hgbYeu{dSO3@4i{FC7^&2YZ-%=&N3-bOB&eZSeL4GeqvvwvJv6FVGQgM1{XMzzs z6O7pDFrt9&(B#iXSbLo&e+~_z3)LW121aZrml~{wfRw@#TeD=`p%~Zh`7~I<>Nqv5 zt)i&o+bW709#<5MhkuEiQu?5(u*p9bgod=L@izIIRi$Is zR8=crJ3yDVc5JVj3U3{zY?qo26PF{vH<)Vhr*7iLOlJZ36X?XJ(239Sh4vRz0r{Q` zIj(`!){y=wy0aait4kQH3&>Ej)a*3VCGBl^ zllF0V)23_bflQaG?r6$I&53iW6{M-tpmUP!9^N|T^8a44Th0A;lieOQKbcq3*=}V} zp30&EWs+Cr(op553T4qml~0RR0oAD@TA{ko1_j(hZf29}PB*F^v_m0dpnB2c>IiyK z^`^Jgk@S%|nmgmNa}RYa7puP99~Yd5ssUOW?QHk(xHKZG5YKiG*K#Ql(Qqx7KwXsV z#HyDMPh`74OJuu$Oz~{@^hCD1Pn&GF%piHHk6>vZphL-as|6i(uhhbhyH`<2tt1LB zPQ#Z)aGN~pv}Uz<6LpRw$r+L{DmZk1S=F?Hptd*ztKs;|+PBKZ!9^$mF=G%Gk{V38 z>Nx5NMC}6v?FYm>PK}}ws+>+#qp3=rK-Fptovu!zk}0(RCqurngzJD-^Fof{KSl(YiU(*_{v83&*O%K8$2BY>v6&$L}- zTqEt^$%U%bc$4wu;xO%`6P=!pIJPIH>co>mNCUsuj%iFe#n6Wra*BcDruZp_S_TH? zv_83jr+oK(k7`J2rarn*Q=ysDpqVqkj9GL95V$Wuaj=?8qttvFuNKfOwTKo150h#1 z(-VY0J+5I$w#SbyPLFFC>TC_eo}4s#Pvq(3m?DRcpp$g?;-bFrZ6th2J-U!_)APS7 z++lrb?6|(P8$hZR9S$JBjzY8vAXN<%Vkvb|b<{%zsaP$i0l1SqOf^6u!ZcMif)6X8 z5HX--QwlFqk2LigGbKTQ060Nx(axf4Ls|at`qTtR*zbll;pMQSkpny@bckNYYFW9BdEze3gacklCmF!XHGimSnLj7~C z{&^984%DTK6SeTT;TrB$mtvUjmuGW%jxpR-RE2}33a7-dCltTa`!g=sn@+n zT@U{o3FIf#+2wh06Ja4Os&3k&Zo|8RZFH=+z;2iC&6h*{PDtQ(YF2lY7b1__Ns_Jz ztY#CE@`;-?cz;yy^ux6?w;_UbKrI^$U;srIfdEE}G}vLVd(T_I9#^5s!KW z#PC`k^(&0qtX>C2Fi(a7-%JcBn|Wb=)^L}%Q@Oc~o-NO}eeSo@Y5$I<^1CS%|2@h! z2mYXIKfq6KezW>WKiPFQZ}y=k9vZ1n^y@$ApZ4p|5@lI#0l1F@wyM<2R%v8NS+zY8 z=mRba>AyN|8@csifckS+*Cy(#yBB`dUVnsKFC+tuR)Y37y&_xC{(-W@9{UNr`?tq2Aljf;y809VssJm&kx`)nH_rVRkpKeh*Xq$QfF5rXo2%eu&57R3+ zaC=YT2ubb1jZ$z;J<45i+qhUg&I56^xJ*64!_|{KSv|$o_X&>k?)N^XUg6hqgZHoMS4yduRJQtsa;euL^)O7U+b*g$_)v6CvMEy~nt3FnjseS5d)q*SLpQr~=_mKKj z1JFB&DWUFh076O3B1;`$su1*)w|3GsSKX(+LTWAx6sk4I!1Yzo$!{pbfYF?%d`6a$ z4dj7AHgdGlT+NReE<@4)=W?@=i@tfZ0eLHNeJ#3$dKzxL&4;t+G4jx(6ApOYbOP!M zVRm;K7TV?GUcpu)AIXCPk*`xM4Su936Iy&rd0@^mH&Sw`gIN4wP7E_JC(U5RtIYQ*20Bm>`< zI3~wvz0bfb}$;tH_5D0kqe956$52Gg(7}zEG1dnQM zKpYIu8o0;km94Wt&lmdBaOA}VdU}lBQr<>CDbMa8Zfcy&{>C_&BRC0TR*6i!`Urlo z>sdM+$MD9H`Z5^uB`_nM`HIBC@z^e!+ROR20Fh}5?pv)*oWyL#-91wO1Q31+ApAFV zQ(plHaXJlGU<_2c5_OaCZVFWR6a#;17|OW9$fdKPpyxyRHX5C18x-$Jqcgn=wQE7$ zr%=z&p>F>$y5WLicg{9?aG~Ml-p1iP5cg0=7`=G{uEkC^j^^3MG3+z?aIJAHpJnvr z^H8@A?=CXzI9X>iaU$e+L?}6cgp$C9#L1V$0g2CZ0O@>sT7y6~eNJ;U2;=}FCKyKp z4(x2E_LuY+Pl=I$#10^1KM0c@*N*A7>TA{dif+Q0yPb^wJAjgLpZ35C(x)Q|vJnab z&y4;55d}H6!wPcScc&nt3Ez?EUqVMAzdo9BjWJ{yCsH@#B~h3Joi=#QsL)J?*> zDaK@oeicN23Pk^8i2gK){!EDeEQtPWh<-Ihe-1={CPaS*M1LMce?I3Jr*LOu0mS}P zKFT-^qJKJ97>jwVaR$#de7p#Cr{kT^@N3&U*_MTbsQVM5?oWuiKOyRi5~98(A?mih zvrp7)0hgX}0Y5^{(b^I4f6+}4>VBDH1*3mln3-FleM+qG8Vp8fV9B;a5oYy`V}(8c z*;v6CaL`zxW3hn&oA&=>11AVci4Deor?EklSL)cHObt!M1_d-8xX=h(hyWL&z=ara zp$WLKk}8Z1)v%js{%6)=xi!aQEZy^O1Y71!{w#cFR%qxxCc(ri{pKsjBTa0adukk~E&bW&|Fz)6*qy8_(?ff@m zJMTB{RhDs|>TcYx`WS0fnXyw1Gago>aGW;A*rTQzkEr>^UbVz{T!oDvsdJ1c)H>ry zb-nSFx)pV|8_#HLdKJffQ0+K2p%jk`wk6_%ZE(0SE;~w9s2i%mceg7Ic5y$ z@Xm&Q?VTOhdS@SEXCGl_`>?Z?|J2Sp{0)tfH~?;Sta#9brZJ-R&i;j+eTkjzr*2vF XpV^r*M#5KD#wZ<>;?9AAAoYI%RhfJ? diff --git a/old/HomeTrainingMapper.class b/old/HomeTrainingMapper.class deleted file mode 100644 index 838099c5d240bdb63e4588b961d9099f5e70cb18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1145 zcmbtTO>Yx15Pc49LQ_6UpH# zM=7B5|;GJ#XI3n;Fl~U*CTKc!_5{bOiQuDz!Z?r5Y95dRcpNlFwLYB#+C2 zJ~^eWw)uNiRpfeD5?H%bVU3pF361m(qQfE|9Feks}q9 z$};ji*h%}3*lW`M15STEvRAfU!Dd8RviDA45CImI%=GJ&t)^Ygpq83H&}%ZSR>y^& z{-02$_tUa=8NJblU)a`s+UXkXPadYg&Pi>9F6dNyeP-y;+A^r-`3k)F_ehFnrQ|du zPh@$lOw9?`FIs!o6%e?^dkb`V1DDZ72R*(mvHdps{MW%MBX@8&g4|=|KGq`014h - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/old/HomeTrainingService.class b/old/HomeTrainingService.class deleted file mode 100644 index 65f874324aac33b9a0ad84ac5d14b122173ae8e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1010 zcmc&zJx{|x4E2@L(DKnjCEzE}g&P=)*gydlDiOqfBqqHoxrE%MbmiCZ9~fBJ_)!Qa zsUSr`bO13VO8o36`}z6x?dcf+4xnp6jRE&DlIk|%!V9I+Jk^+RdM46EZbu6KAY;1cgr)TaMq znvNr-vB=}8kpZ`b9-WK0-^**~V+>lyQx{_+smg*TgYIX$9|(h{BYh=InjnLhzwh<1 zXf+qjF$pO;8>l2>|EOxB1uJO>KAQO*JpB4xQR4Hljuh82j05Cn&hVn}K;?d}89e@P z4-2Z-qfU3e=yz%`97s*>-u93Ti)C>$kgVoJY2xCE49G>hWqfuo`YlY)dAG$ ne3qdBHL$WjimyP6zG|>a$QrCyARC0VzePILY{a~o^KQKZDq289 diff --git a/old/HomeTrainingServiceImpl.class b/old/HomeTrainingServiceImpl.class deleted file mode 100644 index 3f5efc4198c579e1c25561462d6c6307119d9ff7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7432 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 diff --git a/old/Login_SQL.xml b/old/Login_SQL.xml deleted file mode 100644 index eca19d6..0000000 --- a/old/Login_SQL.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/old/MainController.class b/old/MainController.class deleted file mode 100644 index 1e60865e66bc8665499ed222d4ed09f999dd0eb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10248 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 diff --git a/old/MyUtil.class b/old/MyUtil.class deleted file mode 100644 index b7cc48754ce8d5e6f343843d798d85bf62a834d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18961 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 diff --git a/old/action-servlet.xml b/old/action-servlet.xml deleted file mode 100644 index 9fe211d..0000000 --- a/old/action-servlet.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - geoinfo.**.service - - - - - - - - - - - - - - - - /WEB-INF/tiles/tiles-layout.xml - - - - - - \ No newline at end of file diff --git a/old/add.png b/old/add.png deleted file mode 100644 index 392fe0d31102449f4772d05ffcb45e1b91f019f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1576 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIoCO|{#S9F5M?jcysy3fAP_W6< z#WBRA^X-(4Tn!2mEnC0W_di?KwqU8|3(q6L^A}`uI58_8bvVVm-P-=o*C{GTZ@-FD z58({-`l?dS5bWircCRykn!oec-qntFTo}DdGK1lO>X; z3GKFizOCV!)O`i}CI$&luI#t7CV9X0oc2mOd>vn)yR-VlB{Q0Uu3_+W^>bP0l+ZM7 zuAbWg-W94PH<_glFmebd`5pN2*lp*>;@dAjMJLSbrA~z?m*s3D8z*Z@vq@=(~Uq7!{FEJ%QDOE2y zKUcpZu|VHY&p;ohFeMqTuAsCiM=!r9T|XsRKQ$*cH#M)M7^v0|uC^c}za+mnBOiy+ zaA_0^fG+X%h1-GEExEaHD~d~8%Yfd%=knr^%7Rq=pw#00(xT*4*D|0pl|jBKuyQU+ zO)SYT3dzsUu~l*ed08O<=41sUV?6@}jquF8l>G8yO(YGeE{P?nwn|0@Mkcxj=DG$( zA%@0QrlwY=CfWv;Rt5$TrM~$onQ4`nN=>W`Os$NKP?V;YB&H;mBob7dl5CZhUzD2& z^l)ZwVtT56L0-C&0z4S4obz+?i+~mbU1tn-g|DxbXI^nhVqS8pr;Du;(9e3AnJHG5 zX356J#wixM7A8Q#D8Wx#0aL}B|o_o6tgh>DJ1ImFUm~M z%uCE6+ZF)KhB zHW!#~fE@dZg2d$P)Dnf%ycAodA|-n}A&-sAfTh6$NXhqfvMtvk2LZSHU9Fie(%jkH zg4`QFrcC>0X4YgbkmD+_ry*4e}jAD!NZz?GX1+`>X#X=kFpEX>4Tx04R}tkv&MmKpe$iQ>9WX4i*$~$WWc^;0NMZs#pXIrLEAagUO{ILX(Ch z#l=x@EjakGSaoo5*44pP5ClI!oE@ALU8KbSC509-9vt`M-Mz=%J3weum}+*#09CV$ zbRsV1@+)HC6+!eOfI&=1%+!;ag)BVB*FAiEy^HcJ?{j~SKBZtXz$X&Nm~L3a>%=pg zmd<&fILykDLVQjxC6j9d zj2!c*LWSh`!T;cQw`Or_(oG7*f$kUE{ul)UyFjyU+uz5w-8=#O&%l+|_E#Ig>?i5< zwiY=8`nQ3L>$WEE0hc?#(3371k|X(P3dJJuen#Jv2L^6|;HukOYagc%K$f~%x&aOj zfw2;0uX((?r?a>&!fIeLJpcdz24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2j~h52O0n#5J0g2000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0002ZNklf=jvs80KI@) zC6+FeZ6VdXG;!_s&vs@tTrQXLd_D{RpmWa5^UVEz{|U5+a6BGy&T+flz5*R%BnGJz=`5}3;+NC07*qoM6N<$f z9OUlAu - - diff --git a/old/delete.png b/old/delete.png deleted file mode 100644 index 0b915d7ffd75640ae92434dab5ef946e15f420c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^U^WLEkTt>lKP!;pEbxddW?Nd)Ow>FMGaQo(pNFqikRf&gn%!#PGFtyI2K49uYy ztY$EJOxR$#qQz@Pi!=KO6Q;ZaNrs`*5l5-QshvSF1a71h2ii zrE&9*BfT6OcIz#jGbL!5>9qBZO65CNT((G43IE6(bjo(=l+xtL8@J|FF0Sn~$T}vI z+`}zja_(#a^HHxqoyt5}V*dAjH<~YW;qRO`N%Kvya%RASI|a_Uho9+PsbH9L#fsI{ Spvn*EXa-MLKbLh*2~7a&d}ek4 diff --git a/old/json-simple-1.1.1.jar b/old/json-simple-1.1.1.jar deleted file mode 100644 index dfd5856d0cad81dfe7845ea6ff4d170d8064d7b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23931 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 -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="fn" uri = "http://java.sun.com/jsp/jstl/functions" %> - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- - - - - - - - -
- - - - - - - - -
- - - - - - - - -
- - - - - - - - -
- - - - - - - - -
- - - - - - - - -
-
-  집합교육 관리 -
    - - -
-
-
-
-  방문교육 관리 -
    - - -
-
-
-
- - diff --git a/old/main.jsp b/old/main.jsp deleted file mode 100644 index 1cd36d5..0000000 --- a/old/main.jsp +++ /dev/null @@ -1,173 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - - -국토지반정보 포털 관리시스템 - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - -
-
- - - - - - - -
- -   - - - -
-
- - - - -
-
- - - - - - - - - - - - -<%-- - -
승인 대기 건
- - -
승인 대기 0건
- - --%> - - diff --git a/old/mainframe.jsp b/old/mainframe.jsp deleted file mode 100644 index f966a6b..0000000 --- a/old/mainframe.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - - - - - - - - - - - - - - diff --git a/old/minus.png b/old/minus.png deleted file mode 100644 index e9f5eff4025c1a41eb86abcfea56da9591abe4da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2042 zcmeGd{WIHV{P~8oCTq+bl~T@aZoL|Qu-i07wpNkzl4;XKy_Z?NhC_l_=36(jt}oj4 zbW}uFhe(i^hAbqathyO!x3i_6 zElHoZaSfR6TeiD%=|Ytv$dd%c-{u2=UXny_HIBJM8-RK`BCzdbVyQc|$&p|mxQGw? z;E4UZ$4TsgzF)t#DkWXf-(w5E+#*~D?P@aysFL_qGqsv=jm1qKC%?>GTsFOD!NVi%E1%U6Cic{`mw zfG-S)<^9BcmO}s;FD@9$uo`Vgzvp0*n4nf_S47P4av;4wC^Cul5#_O2F)@JErlRvQ z$(CsNi|B5!BY@2>Hm{703O z4{+;uFq76(;|A8so@u809kSK=uz!#<0)eDFExN7fL08Pjaa?Lwp_M= zTfeCTK>m9!L7n~sh@UL|C>ltM4o?jWQ@ku%IJosqNZzKfQrk(gN!&UHAz$?wpL7|1 z&R&Cn9JFC3sCyEZlS_uJK{|FdIt!5({qO916o42hlzg5Kfb(3l4(*T1LZX)UE5TZA zhXyHchcwemt@=g_VlvcgcF0#<|B_aZ!VG6AS)g;c9<6x%7(1-71v%AqU8Cy~g99p( z&<+B1%I%tP50{3z7D4LPUJ9t%3}XlH;d9nT7zwr40UD~BPU`O+{}>T+sfI%KP`(u? z{`(~RBKr&SUs4vI=zFh8T*A~>6Olv-uaTQdUO2|^M}$w7uITA{KE!(SBwVJUZvOf^ z=Zg@bqSZ)cr^9S3H&!qK<_*&#TL?$@SHlb{Y{#s8u}*7>Dcqhg5ucZD zt#T{nn5su1QFL*6?A1&nn5fRv(x&_qmisW9juV5~2@dE`ttg(MlyYa_v+xl#??vu5 h<6V~suTIx^eG_v8GPb?1R params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + + if (!UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + + model.addAttribute("params", params); + return "admins/constructionProjectManagement/construction-project-statistics-index"; + } + + /** + * 집합교육 추가 + * @param request + * @param strJSON + * @param response + * @return + */ + @RequestMapping(value = "admins/constructionProjectManagement/home-training-index/add.do", method = RequestMethod.POST) + @ResponseBody + public JSONObject addHomeTraining( + HttpServletRequest request, + @RequestBody String strJSON, + HttpServletResponse response) { + + + JSONObject jsonResponse = new JSONObject(); + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n" + + "strJSON" + strJSON + "\n" + + "\n--------------------------------------------------------------\n" + ); + JSONParser jsonParser = new JSONParser(); + JSONArray jsonArr = null; + boolean isFail = false; + String failMsg = ""; + try { + jsonArr = (JSONArray)jsonParser.parse(strJSON); + for (Object obj : jsonArr) { + JSONObject jsonObject = (JSONObject) obj; + + // JSONObject를 HashMap으로 변환 + HashMap params = new HashMap<>(); + for (Object key : jsonObject.keySet()) { + String keyStr = (String) key; + Object value = jsonObject.get(keyStr); + params.put(keyStr, value); + } + try { + HashMap hashMap = homeTrainingService.addHomeTraining(request, response, params); + int nRetCode = MyUtil.getIntegerFromObject(hashMap.get("p_result_code")); + String lpszRetMsg = MyUtil.getStringFromObject(hashMap.get("p_err_msg")); + + long lWvtRegId = MyUtil.getLongFromObject(hashMap.get("p_wvt_reg_id")); + + if( nRetCode == 100 ) { + jsonResponse.put("resultCode", nRetCode); + jsonResponse.put("result", "true"); + jsonResponse.put("message", "등록이 완료되었습니다."); + } else { + if( nRetCode == 11 ) { + lpszRetMsg += "\n" + + "사업명: " + params.get("constName"); + } + jsonResponse.put("resultCode", nRetCode); + jsonResponse.put("result", "false"); + jsonResponse.put("message", lpszRetMsg); + + isFail = true; + failMsg = lpszRetMsg; + break; + } + + } catch (Exception e) { + // TODO Auto-generated catch block + String strTxt = + "---------- BUG REPORTING START ----------" + "\n" + + "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + + "strJSON:[\n" + strJSON + "\n]\n" + + "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + + "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + + "---------- BUG REPORTING END ----------" + "\n" + + ""; + System.out.println(strTxt); + jsonResponse.put("resultCode", -1); + jsonResponse.put("result", "false"); + jsonResponse.put("message", e.getMessage()); + } + } + + } catch (org.json.simple.parser.ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + if( isFail ) { + jsonResponse.put("resultCode", -2); + jsonResponse.put("result", "false"); + jsonResponse.put("message", failMsg); + } + + System.out.println("\n--------------------------------------------------------------\n" + + request.getRequestURI() + " OUT:" + + "\n--------------------------------------------------------------\n" + + "jsonResponse.toJSONString():[" + jsonResponse.toJSONString() + "]\n" + + "\n--------------------------------------------------------------\n"); + + return jsonResponse; + } + + /** + * 집합교육 수정 + * @param request + * @param strJSON + * @param response + * @return + */ + @RequestMapping(value = "admins/constructionProjectManagement/home-training-index/update.do", method = RequestMethod.POST) + @ResponseBody + public JSONObject updateHomeTraining( + HttpServletRequest request, + @RequestBody String strJSON, + HttpServletResponse response) { + + + JSONObject jsonResponse = new JSONObject(); + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n" + + "strJSON" + strJSON + "\n" + + "\n--------------------------------------------------------------\n" + ); + JSONParser jsonParser = new JSONParser(); + JSONArray jsonArr = null; + boolean isFail = false; + String failMsg = ""; + try { + jsonArr = (JSONArray)jsonParser.parse(strJSON); + for (Object obj : jsonArr) { + JSONObject jsonObject = (JSONObject) obj; + + // JSONObject를 HashMap으로 변환 + HashMap params = new HashMap<>(); + for (Object key : jsonObject.keySet()) { + String keyStr = (String) key; + Object value = jsonObject.get(keyStr); + params.put(keyStr, value); + } + try { + HashMap hashMap = homeTrainingService.updateHomeTraining(request, response, params); + int nRetCode = MyUtil.getIntegerFromObject(hashMap.get("p_result_code")); + String lpszRetMsg = MyUtil.getStringFromObject(hashMap.get("p_err_msg")); + + if( nRetCode == 100 ) { + jsonResponse.put("resultCode", nRetCode); + jsonResponse.put("result", "true"); + jsonResponse.put("message", "수정이 완료되었습니다."); + } else { + if( nRetCode == 11 ) { + lpszRetMsg += "\n" + + "사업명: " + params.get("constName"); + } + jsonResponse.put("resultCode", nRetCode); + jsonResponse.put("result", "false"); + jsonResponse.put("message", lpszRetMsg); + + isFail = true; + failMsg = lpszRetMsg; + break; + } + + } catch (Exception e) { + // TODO Auto-generated catch block + String strTxt = + "---------- BUG REPORTING START ----------" + "\n" + + "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + + "strJSON:[\n" + strJSON + "\n]\n" + + "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + + "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + + "---------- BUG REPORTING END ----------" + "\n" + + ""; + System.out.println(strTxt); + jsonResponse.put("resultCode", -1); + jsonResponse.put("result", "false"); + jsonResponse.put("message", e.getMessage()); + } + } + + } catch (org.json.simple.parser.ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + if( isFail ) { + jsonResponse.put("resultCode", -2); + jsonResponse.put("result", "false"); + jsonResponse.put("message", failMsg); + } + + System.out.println("\n--------------------------------------------------------------\n" + + request.getRequestURI() + " OUT:" + + "\n--------------------------------------------------------------\n" + + "jsonResponse.toJSONString():[" + jsonResponse.toJSONString() + "]\n" + + "\n--------------------------------------------------------------\n"); + + return jsonResponse; + } + + @RequestMapping(value = "admins/constructionProjectManagement/home-training-index/list.do", method = RequestMethod.GET) + @ResponseBody + public JSONObject getHomeTraining( + HttpServletRequest request, + @RequestParam HashMap params, + HttpServletResponse response) { + + + JSONObject jsonResponse = new JSONObject(); + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n" + + "params.toString()" + params.toString() + "\n" + + "\n--------------------------------------------------------------\n" + ); + + + try { + homeTrainingService.getHomeTraining(request, response, jsonResponse, params); + jsonResponse.put("resultCode", 100); + jsonResponse.put("result", "true"); + jsonResponse.put("message", "조회가 완료되었습니다."); + + } catch (Exception e) { + // TODO Auto-generated catch block + String strTxt = + "---------- BUG REPORTING START ----------" + "\n" + + "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + + "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + + "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + + "---------- BUG REPORTING END ----------" + "\n" + + ""; + System.out.println(strTxt); + + String eMsg = e.getMessage(); + if( eMsg != null ) { + if( eMsg.equals("로그인이 필요한 서비스입니다.") ) { + jsonResponse.put("resultCode", 401); + } + } + + jsonResponse.put("resultCode", -1); + jsonResponse.put("result", "false"); + jsonResponse.put("message", e.getMessage()); + } + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " OUT:" + + "\n--------------------------------------------------------------\n" + + "jsonResponse.toJSONString():[" + jsonResponse.toJSONString() + "]\n" + + "\n--------------------------------------------------------------\n" + ); + + return jsonResponse; + } + + /** + * 특정 집합교육에 참여한 사용자 목록을 조회한다. + * @param request + * @param params + * @param response + * @return + */ + @RequestMapping(value = "admins/constructionProjectManagement/home-training-index/item/list.do", method = RequestMethod.GET) + @ResponseBody + public JSONObject getHomeTrainingItemList( + HttpServletRequest request, + @RequestParam HashMap params, + HttpServletResponse response) { + + + JSONObject jsonResponse = new JSONObject(); + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n" + + "params.toString()" + params.toString() + "\n" + + "\n--------------------------------------------------------------\n" + ); + + + try { + homeTrainingService.getHomeTrainingItemList(request, response, jsonResponse, params); + jsonResponse.put("resultCode", 100); + jsonResponse.put("result", "true"); + jsonResponse.put("message", "조회가 완료되었습니다."); + + } catch (Exception e) { + // TODO Auto-generated catch block + String strTxt = + "---------- BUG REPORTING START ----------" + "\n" + + "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + + "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + + "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + + "---------- BUG REPORTING END ----------" + "\n" + + ""; + System.out.println(strTxt); + jsonResponse.put("resultCode", -1); + jsonResponse.put("result", "false"); + jsonResponse.put("message", e.getMessage()); + } + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " OUT:" + + "\n--------------------------------------------------------------\n" + + "jsonResponse.toJSONString():[" + jsonResponse.toJSONString() + "]\n" + + "\n--------------------------------------------------------------\n" + ); + + return jsonResponse; + } + + + @RequestMapping(value = "admins/constructionProjectManagement/home-training-index/item/delete.do", method = RequestMethod.POST) + @ResponseBody + public JSONObject deleteHomeTrainingItem( + HttpServletRequest request, + @RequestBody String strJSON, + HttpServletResponse response) { + + + JSONObject jsonResponse = new JSONObject(); + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n" + + "strJSON" + strJSON + "\n" + + "\n--------------------------------------------------------------\n" + ); + + JSONParser jsonParser = new JSONParser(); + JSONArray jsonArr = null; + boolean isFail = false; + String failMsg = ""; + try { + jsonArr = (JSONArray)jsonParser.parse(strJSON); + for (Object obj : jsonArr) { + JSONObject jsonObject = (JSONObject) obj; + + // JSONObject를 HashMap으로 변환 + HashMap params = new HashMap<>(); + for (Object key : jsonObject.keySet()) { + String keyStr = (String) key; + Object value = jsonObject.get(keyStr); + params.put(keyStr, value); + } + try { + HashMap hashMap = homeTrainingService.deleteHomeTrainingItem(request, response, params); + int nRetCode = MyUtil.getIntegerFromObject(hashMap.get("p_result_code")); + String lpszRetMsg = MyUtil.getStringFromObject(hashMap.get("p_err_msg")); + + + if( nRetCode == 100 ) { + jsonResponse.put("resultCode", nRetCode); + jsonResponse.put("result", "true"); + jsonResponse.put("message", "삭제가 완료되었습니다."); + } else { + if( nRetCode == 11 ) { + lpszRetMsg += "\n" + + "사업명: " + params.get("constName"); + } + jsonResponse.put("resultCode", nRetCode); + jsonResponse.put("result", "false"); + jsonResponse.put("message", lpszRetMsg); + + isFail = true; + failMsg = lpszRetMsg; + break; + } + + } catch (Exception e) { + // TODO Auto-generated catch block + String strTxt = + "---------- BUG REPORTING START ----------" + "\n" + + "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + + "strJSON:[\n" + strJSON + "\n]\n" + + "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + + "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + + "---------- BUG REPORTING END ----------" + "\n" + + ""; + System.out.println(strTxt); + jsonResponse.put("resultCode", -1); + jsonResponse.put("result", "false"); + jsonResponse.put("message", e.getMessage()); + } + } + + } catch (org.json.simple.parser.ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + if( isFail ) { + jsonResponse.put("resultCode", -2); + jsonResponse.put("result", "false"); + jsonResponse.put("message", failMsg); + } + + System.out.println("\n--------------------------------------------------------------\n" + + request.getRequestURI() + " OUT:" + + "\n--------------------------------------------------------------\n" + + "jsonResponse.toJSONString():[" + jsonResponse.toJSONString() + "]\n" + + "\n--------------------------------------------------------------\n"); + + return jsonResponse; + } + + /** + * 집합교육 승인 화면 + * @param params + * @param model + * @param response + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/constructionProjectManagement/home-training-approval-system") + public String homeTrainingApprovalSystem(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + + if (!UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + + model.addAttribute("params", params); + return "admins/constructionProjectManagement/home-training-approval-system"; + } + + /** + * 방문교육 달력 화면 + * @param params + * @param model + * @param response + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/constructionProjectManagement/visit-training-index.do") + public String visitTrainingIndex(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + + if (!UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + + model.addAttribute("params", params); + return "admins/constructionProjectManagement/visit-training-index"; + } + + /** + * 방문교육 승인 화면 + * @param params + * @param model + * @param response + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/constructionProjectManagement/visit-training-approval-system") + public String visitTrainingApprovalSystem(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + + if (!UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + + model.addAttribute("params", params); + return "admins/constructionProjectManagement/visit-training-approval-system"; + } + +} diff --git a/src/main/java/geoinfo/admins/user/GeneralUserMngController.java b/src/main/java/geoinfo/admins/user/GeneralUserMngController.java index 1f6a7d0..967f597 100644 --- a/src/main/java/geoinfo/admins/user/GeneralUserMngController.java +++ b/src/main/java/geoinfo/admins/user/GeneralUserMngController.java @@ -113,9 +113,16 @@ public class GeneralUserMngController { params.put("firstRecordIndex", paginationInfo.getFirstRecordIndex()); params.put("recordCountPerPage", paginationInfo.getRecordCountPerPage()); - List resultList = masterService.selectInfoList(params); + String isFirst = request.getParameter("isFirst"); + + + List resultList = null; + int totalCnt = 0; + if( isFirst == null || !isFirst.toLowerCase().trim().equals("true") ) { + resultList = masterService.selectInfoList(params); + totalCnt = resultList.size() == 0 ? 0 : Integer.valueOf(((EgovMap) resultList.get(0)).get("totalrows").toString()); + } - int totalCnt = resultList.size() == 0 ? 0 : Integer.valueOf(((EgovMap) resultList.get(0)).get("totalrows").toString()); paginationInfo.setTotalRecordCount(totalCnt); model.addAttribute("params", params); diff --git a/src/main/webapp/WEB-INF/views/admins/board/00.jsp b/src/main/webapp/WEB-INF/views/admins/board/00.jsp index 1fae7d3..5b17127 100644 --- a/src/main/webapp/WEB-INF/views/admins/board/00.jsp +++ b/src/main/webapp/WEB-INF/views/admins/board/00.jsp @@ -24,7 +24,7 @@ function linkPage(index){ function goDetail(idx, aid) { document.listForm.idx.value = idx; document.listForm.action = "${pageContext.request.contextPath}/admins/board/00-view.do"; - document.listForm.submit(); + document.listForm.submit(); } function goWrite() { @@ -32,13 +32,13 @@ function goWrite() { } function searchPsBoard() { - + if ( $("select[name=searchTitle]").val() == "0" ) { alert("검색항목을 선택하세요."); $("select[name=searchTitle]").focus(); return false; } - + if ( $("input[name=searchKey]").val() == "" ) { alert("검색어를 입력하세요."); $("input[name=searchKey]").focus(); @@ -46,7 +46,7 @@ function searchPsBoard() { } document.listForm.pageIndex.value = "1"; document.listForm.action = "${pageContext.request.contextPath}/admins/board/00.do"; - document.listForm.submit(); + document.listForm.submit(); } $(document).ready( @@ -56,9 +56,9 @@ $(document).ready( if ( $(this).val() == "" ) { $(this).prop("selected", "selected"); } - } + } ); - } + } ); @@ -82,15 +82,15 @@ $(document).ready( - + - + @@ -164,7 +164,7 @@ $(document).ready(
- +
diff --git a/old/home-training-index.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00.jsp similarity index 63% rename from old/home-training-index.jsp rename to src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00.jsp index 1cce9ed..6850db0 100644 --- a/old/home-training-index.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00.jsp @@ -9,10 +9,10 @@ - + - +

집합교육

- +
@@ -473,7 +673,7 @@
- + @@ -502,13 +702,13 @@
- - + +

교육 대상자 명단

⁕ 신청 집합교육명 : - + @@ -534,7 +734,38 @@
-
+
+
+ +
diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00_view.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00_view.jsp new file mode 100644 index 0000000..5216fcf --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00_view.jsp @@ -0,0 +1,132 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + +사용자정보 상세보기 + + + + + + + + + +<%-- --%> +
+ + + + + + + + + + + + + +
  
+ + + + + + + + + + + + + +
아이디이름전화번호이메일
+ + + + + + + + + + + + + +
업종회사명부서주소
 
+ + + + + + + + + + + + + + + + + +
사업자등록번호 가입 요청일사업자등록번호 가입일 
+ + + + + + + + + + + + + + + + + + + + + + + +
승인여부  개인회원에서 기업회원으로 변경 기업회원에서 개인회원으로 변경 
+ + + + + + +
+
+ + +
 
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00_view_Ini.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00_view_Ini.jsp new file mode 100644 index 0000000..73e7eac --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/00_view_Ini.jsp @@ -0,0 +1,126 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + +사용자정보 상세보기 + + + + + + + + + + + +<%-- --%> +
+ + + + + + + + + + + + + + + + + +
  
+ + + + + + + + + + + + + + +
아이디이름전화번호이메일
--> ${result.prephoneno} --> -->
+ + + + + + + + + + + + + +
직업회사명부서주소
<%--   --%>
+ + + + + + +
+
+ +
+     + + + + +
 
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/01.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/01.jsp new file mode 100644 index 0000000..c2c367b --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/01.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + + + + + + + + + +
+ + + + + + + --%> + + + + + + + + +
 
+ <%-- + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호아이디이름회사명업종사업자등록번호이메일가입일상세보기
${resultList.num}${resultList.userid}${resultList.userName}${resultList.companyName}${resultList.upjong}${resultList.companyRegistNo}${resultList.email}${resultList.datetimes} + +
+ + + + + + + + + + +
+ +
+ + + + +
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/02.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/02.jsp new file mode 100644 index 0000000..debf87e --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/02.jsp @@ -0,0 +1,185 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + + + + + + + + + +
+ + + + + + + --%> + + + + + + + + +
 
+ <%-- + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호아이디이름회사명업종사업자등록번호이메일가입일상세보기
${resultList.num}${resultList.userid}${resultList.userName}${resultList.companyName}${resultList.upjong}${resultList.companyRegistNo}${resultList.email}${resultList.datetimes} + +
+ + + + + + + + + + +
+ + + +
+ + + + +
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/03.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/03.jsp new file mode 100644 index 0000000..f3190cd --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/03.jsp @@ -0,0 +1,37 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + + + + + + + + + + + + + +
 
+ + + + + + + + + + + + + + +
사용자 그룹등 록 수
${resultList.name}${resultList.cnt}
+
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05.jsp new file mode 100644 index 0000000..3bc3fe6 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05.jsp @@ -0,0 +1,98 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + + + + + + + + + + + + + + + + + + +
 
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
아이디이름회사연락처지역(시,도)지역(시,군,구)권한날짜삭제
${resultList.userid}${resultList.userName}${resultList.companyName}${resultList.phone}${resultList.regionName}${resultList.regionSggName}${resultList.startDate} ~ ${resultList.endDate}
+
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp new file mode 100644 index 0000000..0371af6 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp @@ -0,0 +1,308 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + + +사용자 추가 + + + + + + + + + + +Insert title here + + + + +<%-- --%> +
+ + + + + + + + + + + + +
  
+ + + + + +
+ 추가 아이디 : + + 추가 +
+ + + + + + + + + + + + + +
아이디이름회사연락처
+ + + + + + + + + + + + + + +
시작일종료일지역선택(시,도)지역선택(시,군,구)
+ + + + + +
+ +
+ + + +
 
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/07.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/07.jsp new file mode 100644 index 0000000..6db8b7f --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/07.jsp @@ -0,0 +1,125 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> + + + + + + + + + + +
+ + + + + + + --%> + + + + + + + + +
 
+ <%-- + +<%-- + --%> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호아이디수정한이름회사명수정한이메일요청날짜상태상세보기
${resultList.num}${resultList.userid}${resultList.username}${resultList.companyName}${resultList.email}${fn:substring(requestdate,0,4)}-${fn:substring(requestdate,4,6)}-${fn:substring(requestdate,6,8)} + + + 미확인 + + + 승인 + + + 반려 + + + + +
+ + + + + + + + + + +
+ +
+ + + + +
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/40.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/40.jsp new file mode 100644 index 0000000..d721b5c --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/40.jsp @@ -0,0 +1,189 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + + + + + + + + + + + +
+ + + + + + + --%> + + + + + + + + + + + + + + + + + +
 
+ <%-- + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호아이디이름소속지자체이메일가입일승인상태상세보기
${resultList.num}${resultList.userid}${resultList.userName}${resultList.localgove}${resultList.email}${resultList.datetimes} + + + + + + 승인 + + + + +
+ +
+ + + + +
+ +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/40_view.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/40_view.jsp new file mode 100644 index 0000000..f874902 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/40_view.jsp @@ -0,0 +1,84 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + +지자체 공무원 증빙문서 + + + + + + + + + + +
+ + + +<%-- --%> +
+ + + + + + + + + + + + +
  
+ + + + + + + + + + + + + + + + + + + +
아이디이름전화번호이메일소속지자체
지자체 공무원 증빙문서 + ${result.filename} +
+
+ + + +
 
+
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-project-statistics-index.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-project-statistics-index.jsp new file mode 100644 index 0000000..e0f516b --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-project-statistics-index.jsp @@ -0,0 +1,177 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + + + + + + + + + + + + + + + + +

건설현장 통계

+
+ + +
+
+
+

검색

+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
+
+ +

건설현장 등록 건수

+
+
+
+

전체 등록 수

+

12 건

+
+
+
+
+

부산광역시

+

12 건

+
+
+
+
+

대구광역시

+

0 건

+
+
+
+
+

세종특별자치시

+

0 건

+
+
+
+ +
+
+
+

최근 입력된 건설현장

+

부산 북항 재개발 사업 - 부산광역시

+

가덕도 신공항 건설공사 - 부산광역시

+

부산 에코델타시티 조성사업 - 부산광역시

+

동해남부선 복선전철화 사업 - 부산광역시

+

부산 도시철도 1호선 연장 공사 - 부산광역시

+
+
+ +
+
+
+
+
+
+

단계별 건수

+

타당성조사 및 계획검토: 12건

+

기본설계: 0건

+

실시설계: 0건

+

시공중: 0건

+

준공: 0건

+

유지보수: 0건

+
+
+
+
+

프로젝트 연결률

+

부산광역시: 8.33%

+

대전광역시: 0%

+

세종특별자치시: 0%

+

서울특별시: 0%

+

대구광역시: 0%

+
+
+ +
+
+
+
+
+
+
+
+

Text

+
+
+
+
+

Text

+
+
+
+
+ +
+ +
+ + diff --git a/old/home-training-approval-system.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/home-training-approval-system.jsp similarity index 100% rename from old/home-training-approval-system.jsp rename to src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/home-training-approval-system.jsp diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp new file mode 100644 index 0000000..1ac8888 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp @@ -0,0 +1,92 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fn" uri = "http://java.sun.com/jsp/jstl/functions" %> + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+
+  건설현장 통계 +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/passChange.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/passChange.jsp new file mode 100644 index 0000000..33ff62e --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/passChange.jsp @@ -0,0 +1,92 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + + +회원 비밀번호 변경 + + + + + + +
+ + + + + + + + + + + + + + + + + + +
아이디
변경할 비밀번호
* 비밀번호는 숫자와 영문자 조합으로 10~15 자리를 사용해야 합니다.
+ +
+ \ No newline at end of file diff --git a/old/visit-training-approval-system.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/visit-training-approval-system.jsp similarity index 100% rename from old/visit-training-approval-system.jsp rename to src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/visit-training-approval-system.jsp diff --git a/old/visit-training-index.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/visit-training-index.jsp similarity index 100% rename from old/visit-training-index.jsp rename to src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/visit-training-index.jsp diff --git a/src/main/webapp/WEB-INF/views/admins/frame/mainframe.jsp b/src/main/webapp/WEB-INF/views/admins/frame/mainframe.jsp index f966a6b..59a8989 100644 --- a/src/main/webapp/WEB-INF/views/admins/frame/mainframe.jsp +++ b/src/main/webapp/WEB-INF/views/admins/frame/mainframe.jsp @@ -16,7 +16,7 @@ var waitWin; 727보다 크게 하는 경우는 문제 없습니다. --> - + diff --git a/src/main/webapp/WEB-INF/views/admins/frame/top.jsp b/src/main/webapp/WEB-INF/views/admins/frame/top.jsp index 6b4a7bc..85afeba 100644 --- a/src/main/webapp/WEB-INF/views/admins/frame/top.jsp +++ b/src/main/webapp/WEB-INF/views/admins/frame/top.jsp @@ -2,7 +2,7 @@ - + +
Ǽ
@@ -34,6 +35,6 @@ - + diff --git a/src/main/webapp/WEB-INF/views/admins/main/index.jsp b/src/main/webapp/WEB-INF/views/admins/main/index.jsp index 1f1f142..7de36a7 100644 --- a/src/main/webapp/WEB-INF/views/admins/main/index.jsp +++ b/src/main/webapp/WEB-INF/views/admins/main/index.jsp @@ -9,6 +9,7 @@ 국토지반정보 포털 관리시스템 + @@ -140,6 +141,7 @@ document.addEventListener('keyup', function(e) { + 건설현장 관리 diff --git a/src/main/webapp/WEB-INF/views/admins/main/main.jsp b/src/main/webapp/WEB-INF/views/admins/main/main.jsp index 1cd36d5..afbcc91 100644 --- a/src/main/webapp/WEB-INF/views/admins/main/main.jsp +++ b/src/main/webapp/WEB-INF/views/admins/main/main.jsp @@ -5,6 +5,7 @@ 국토지반정보 포털 관리시스템 +