DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DBNT:1529c7ccaabd7987aecac2d5030eed0beec5baf3
Branches Tags
DBNT:main
DBNT:master
DBNT:cks
...
compare: DBNT:34e9421ba2626631bb5c44d219416789607dd26d
Branches Tags
DBNT:main
DBNT:master
DBNT:cks

5 Commits
1529c7ccaa ... 34e9421ba2

Author SHA1 Message Date
thkim 34e9421ba2 fix: 엑셀업로드 시 시추공 개요에서 코어 사진 설명이 없는 경우 코어 사진 설명을 입력하라는 메시지 추가 2025-10-20 17:51:24 +09:00
thkim 40ea5fedac build: merged 2025-10-17 16:32:16 +09:00
thkim d0785059ea feat: admin_user 를 cls코드로 구분하는 1차 작업. 아직 완료된 것은 아님 2025-10-17 16:31:26 +09:00
thkim aeb52eccda Merge branch 'main' of https://git.vas2.com/geoinfo_eGov_work 2025-10-17 15:22:45 +09:00
thkim 57a5e87778 . 2025-10-17 15:22:42 +09:00
34 changed files with 359 additions and 235 deletions
Show Stats Expand all files Collapse all files

15
src/main/java/geoinfo/com/WebConfirm.java
View File

@ -8,7 +8,6 @@ import java.util.*;
import javax.servlet.http.HttpServletRequest;
import org.jfree.util.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -27,14 +26,6 @@ public class WebConfirm
WebUtil wUtil = new WebUtil();
//String user = "geoinfo";
//String pw = "geoinfo";
//String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl";
/*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/
//String url = "jdbc:oracle:thin:@218.232.234.200:1521:orageodev"; // 실서버
//String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버
//String url = "jdbc:oracle:thin:@grok-10:1521:ORAGEODEV"; // thkim local 개발 서버
String url = EgovProperties.getProperty("Oracle.Url").trim();
String user = EgovProperties.getProperty("Oracle.ID").trim();
String pw = EgovProperties.getProperty("Oracle.Password").trim();
@ -1757,9 +1748,6 @@ public class WebConfirm
if (s == null) {
s = "";
}
else {
s = s;
}
return s;
}
@ -1767,9 +1755,6 @@ public class WebConfirm
if (s == null) {
s = re;
}
else {
s = s;
}
return s;
}
}

19
src/main/java/geoinfo/main/main/MainController.java
View File

@ -54,6 +54,7 @@ import geoinfo.com.file.service.FileService;
import geoinfo.main.login.LoginController;
import geoinfo.main.main.service.MainService;
import geoinfo.regi.status.service.RegiPageService;
import geoinfo.util.JwtUtil;
import geoinfo.util.MobileCertificationUtil;
import geoinfo.util.MyUtil;
import geoinfo.util.RequestWrapper;
@ -178,9 +179,10 @@ public class MainController
{
ModelAndView mv = new ModelAndView();
String src = request.getParameter("src");
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
mv.addObject("cls", nCls);
String src = request.getParameter("src");
if( src != null && src.toLowerCase().equals("drilling") ) {
mv.addObject("isFromDrillingSystem", true);
@ -683,8 +685,13 @@ public class MainController
@RequestMapping(value = "/situTable.do")
public ModelAndView situTable(@RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) throws Exception
{
ModelAndView mv = new ModelAndView("body/jiban_info/situTable");
int nCls = JwtUtil.getCls(request);
mv.addObject("cls", nCls);
List<String> year = mainService.selectYearStart();
mv.addObject("year", year);
@ -752,7 +759,7 @@ public class MainController
List<Map<String, Object>> result = mainService.selectSituTable(map);
Iterator<Map<String, Object>> iter = result.iterator();
if (!userid.equals(particularId1) && !userid.equals("admin_user")) {
if (!userid.equals(particularId1) && !userid.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
if (iter.next().get("pcode").equals(particularProjectCode1)) {
iter.remove();
@ -761,7 +768,7 @@ public class MainController
}
iter = result.iterator();
if (!userid.equals(particularId2) && !userid.equals("admin_user")) {
if (!userid.equals(particularId2) && !userid.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
if (iter.next().get("pcode").equals(particularProjectCode2)) {
iter.remove();
@ -1039,6 +1046,8 @@ public class MainController
{
ModelAndView mv = new ModelAndView("home/index");
int nCls = JwtUtil.getCls(request);
// 다운로드 파일 목록
map.put("target", "home");
try {
@ -1114,7 +1123,7 @@ public class MainController
mod_cnt = ""; // 수정요청
if ("admin_user".equals(userid) == true) {
if ("admin_user".equals(userid) == true || nCls == 65535) {
EgovMap regiCount = commonService.getRegiCountAdmin();
mv.addObject("WAIT_CNT", regiCount.get("waitCnt"));
mv.addObject("CONFIRM_CNT", regiCount.get("confirmCnt"));

9
src/main/java/geoinfo/map/coordSearch/MapCoordSearchController.java
View File

@ -29,6 +29,7 @@ import egovframework.com.cmm.service.EgovProperties;
import egovframework.rte.psl.dataaccess.util.EgovMap;
import geoinfo.com.GeoinfoCommon;
import geoinfo.map.coordSearch.service.MapCoordSearchService;
import geoinfo.util.MyUtil;
@Controller
public class MapCoordSearchController {
@ -183,6 +184,8 @@ public class MapCoordSearchController {
@RequestMapping(value = "/map/coordSearch.do")
public String coordSearch(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
String tmx = GeoinfoCommon.parseData(String.valueOf(params.get("tmx")));
String tmy = GeoinfoCommon.parseData(String.valueOf(params.get("tmy")));
String tawon = GeoinfoCommon.parseData(String.valueOf(params.get("tawon")));// 1.bessel
@ -483,8 +486,8 @@ public class MapCoordSearchController {
Iterator<EgovMap> iter = items.iterator();
String userId = (String)request.getSession().getAttribute("USERID");
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
String code = (String)iter.next().get("holeCode");
code = code.substring(0, 5);
@ -496,7 +499,7 @@ public class MapCoordSearchController {
}
iter = items.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
String code = (String)iter.next().get("holeCode");
code = code.substring(0, 5);

31
src/main/java/geoinfo/map/information/MapInformationController.java
View File

@ -44,6 +44,7 @@ import geoinfo.com.GeoinfoCommon;
import geoinfo.map.information.service.MapInformationService;
import geoinfo.map.mapControl.service.MapControlService;
import geoinfo.regi.util.exportGeotechnicalPointShp2;
import geoinfo.util.MyUtil;
import geoinfo.util.RequestWrapper;
import net.sf.json.JSONArray;
import net.sf.json.JSONException;
@ -69,7 +70,9 @@ public class MapInformationController {
@RequestMapping(value = "/map/detailSichuDownCh.do")
public String detailSichuDownCh(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
String userId = (String)request.getSession().getAttribute("USERID");
params.put("userId", userId);
@ -150,7 +153,7 @@ public class MapInformationController {
List<EgovMap> items = mapControlService.selectDetailItems(params);
Iterator<EgovMap> itr = items.iterator();
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (itr.hasNext()) {
String code = (String)itr.next().get("holeCode");
code = code.substring(0, 5);
@ -162,7 +165,7 @@ public class MapInformationController {
}
itr = items.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (itr.hasNext()) {
String code = (String)itr.next().get("holeCode");
code = code.substring(0, 5);
@ -207,6 +210,8 @@ public class MapInformationController {
public String detailSichuS(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
int holeCount = 0;
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
String minx = GeoinfoCommon.parseData(String.valueOf(params.get("minx")));
String maxx = GeoinfoCommon.parseData(String.valueOf(params.get("maxx")));
String miny = GeoinfoCommon.parseData(String.valueOf(params.get("miny")));
@ -298,7 +303,7 @@ public class MapInformationController {
holeList = mapInformationService.selectHoleList(params);
itr = holeList.iterator();
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (itr.hasNext()) {
String code = (String)itr.next().get("holeCode");
code = code.substring(0, 5);
@ -310,7 +315,7 @@ public class MapInformationController {
}
itr = holeList.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (itr.hasNext()) {
String code = (String)itr.next().get("holeCode");
code = code.substring(0, 5);
@ -361,7 +366,7 @@ public class MapInformationController {
items = mapInformationService.selectInfoItems(params);
itr = items.iterator();
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (itr.hasNext()) {
String code = (String)itr.next().get("holeCode");
code = code.substring(0, 5);
@ -373,7 +378,7 @@ public class MapInformationController {
}
itr = items.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (itr.hasNext()) {
String code = (String)itr.next().get("holeCode");
code = code.substring(0, 5);
@ -402,6 +407,8 @@ public class MapInformationController {
String temp = GeoinfoCommon.parseData(String.valueOf(params.get("sichuValue")));
int holeCount = Integer.parseInt(temp);
int totalCnt = 0;
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
model.put("userId", request.getSession().getAttribute("USERID"));
@ -431,7 +438,7 @@ public class MapInformationController {
List<EgovMap> holeList = mapInformationService.selectHoleList(params);
Iterator<EgovMap> itr = holeList.iterator();
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (itr.hasNext()) {
String code = (String)itr.next().get("holeCode");
code = code.substring(0, 5);
@ -443,7 +450,7 @@ public class MapInformationController {
}
itr = holeList.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (itr.hasNext()) {
String code = (String)itr.next().get("holeCode");
code = code.substring(0, 5);
@ -505,6 +512,9 @@ public class MapInformationController {
if(request.getSession().getAttribute("USERID") == null) {
return "redirect:/index.do";
}
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
String fName = "";
String folder = "";
String mId = "";
@ -585,7 +595,8 @@ public class MapInformationController {
model.put("project", projectList);
model.put("params", params);
model.put("cls", nCls);
//return "map/popup/downloadPurpose";
return "map/popup/downloadPurposeSichuNew";
}

26
src/main/java/geoinfo/map/left/MapLeftController.java
View File

@ -56,6 +56,8 @@ import geoinfo.map.left.service.MapLeftService;
import geoinfo.map.mapControl.service.MapControlService;
import geoinfo.regi.header.service.HeaderService;
import geoinfo.regi.util.exportShp;
import geoinfo.util.JwtUtil;
import geoinfo.util.MyUtil;
import geoinfo.util.RequestWrapper;
@ -314,6 +316,8 @@ public class MapLeftController {
@RequestMapping(value = "/map/mapSearchAllArea.do")
public String mapSearchAllArea(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
String sido = GeoinfoCommon.parseData(params.get("sido").toString());
String gugun = GeoinfoCommon.parseData(params.get("gugun").toString());
String dong = GeoinfoCommon.parseData(params.get("dong").toString());
@ -535,7 +539,7 @@ public class MapLeftController {
String userId = (String)request.getSession().getAttribute("USERID");
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
if (iter.next().get("projectCode").equals(particularProjectCode1)) {
iter.remove();
@ -544,7 +548,7 @@ public class MapLeftController {
}
iter = result.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
if (iter.next().get("projectCode").equals(particularProjectCode2)) {
iter.remove();
@ -566,6 +570,8 @@ public class MapLeftController {
@RequestMapping(value = "/map/mapSearchPolygonCheck.do")
public String mapSearchPolygonCheck(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
int nCls = JwtUtil.getCls(request);
String holeCode = "";
String polygonType = (String)(params.get("polygonType"));
String minX = GeoinfoCommon.parseData(String.valueOf(params.get("minX")));
@ -629,7 +635,7 @@ public class MapLeftController {
String userId = (String)request.getSession().getAttribute("USERID");
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
String code = (String)iter.next().get("code");
code = code.substring(0, 5);
@ -641,7 +647,7 @@ public class MapLeftController {
}
iter = searchHoleCode.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
String code = (String)iter.next().get("code");
code = code.substring(0, 5);
@ -739,6 +745,8 @@ public class MapLeftController {
@RequestMapping(value = "/map/mapSearchSqurePolygonCheck.do")
public String mapSearchSqurePolygonCheck(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
int nCls = JwtUtil.getCls(request);
String holeCode = "";
String polygonType = "squre";
EgovMap searchPassCount = mapControlService.searchPassCountHoleCode(params);
@ -757,7 +765,7 @@ public class MapLeftController {
String userId = (String)request.getSession().getAttribute("USERID");
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
String code = (String)iter.next().get("code");
code = code.substring(0, 5);
@ -769,7 +777,7 @@ public class MapLeftController {
}
iter = data.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
String code = (String)iter.next().get("code");
code = code.substring(0, 5);
@ -808,6 +816,8 @@ public class MapLeftController {
@RequestMapping(value = "/map/mapSearchArea.do")
public String mapSearchArea(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
int nCls = JwtUtil.getCls(request);
String sido = GeoinfoCommon.parseData(params.get("sido").toString());
String gugun = GeoinfoCommon.parseData(params.get("gugun").toString());
String dong = GeoinfoCommon.parseData(params.get("dong").toString());
@ -896,7 +906,7 @@ public class MapLeftController {
List<EgovMap> result = mapLeftService.getAreaSearchList(params);
Iterator<EgovMap> iter = result.iterator();
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
if (iter.next().get("projectCode").equals(particularProjectCode1)) {
iter.remove();
@ -905,7 +915,7 @@ public class MapLeftController {
}
iter = result.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
if (iter.next().get("projectCode").equals(particularProjectCode2)) {
iter.remove();

8
src/main/java/geoinfo/map/projectSearch/MapProjectSearchController.java
View File

@ -4,6 +4,7 @@ import egovframework.com.cmm.service.EgovProperties;
import egovframework.rte.psl.dataaccess.util.EgovMap;
import geoinfo.com.GeoinfoCommon;
import geoinfo.map.projectSearch.service.MapProjectSearchService;
import geoinfo.util.MyUtil;
import java.net.URLDecoder;
import java.util.ArrayList;
@ -34,6 +35,9 @@ public class MapProjectSearchController {
@RequestMapping(value = "/map/projectSearch.do")
public String projectSearch(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
String test1 = GeoinfoCommon.parseData(String.valueOf(params.get("test1")));
String tcr = GeoinfoCommon.parseData(String.valueOf(params.get("tcr")));
String dsf = GeoinfoCommon.parseData(String.valueOf(params.get("dsf")));//
@ -283,7 +287,7 @@ public class MapProjectSearchController {
}
Iterator<EgovMap> iter = items.iterator();
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
if (iter.next().get("projectCode").equals(particularProjectCode1)) {
iter.remove();
@ -292,7 +296,7 @@ public class MapProjectSearchController {
}
iter = items.iterator();
if (!userId.equals(particularId2) && !userId.equals("admin_user")) {
if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) {
while (iter.hasNext()) {
if (iter.next().get("projectCode").equals(particularProjectCode2)) {
iter.remove();

18
src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java
View File

@ -57,6 +57,8 @@ public class CompleteServiceImpl implements CompleteService {
@Override
public void getCompleteList(HttpServletRequest request, HttpServletResponse response, JSONObject jsonResponse, HashMap<String, Object> params, ModelMap model) throws Exception {
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
// 관리자 아닐 경우 back();
if (!request.getSession().getAttribute("CLS").equals("9")) {
throw new Exception( "로그인이 필요한 서비스 입니다." );
@ -103,6 +105,21 @@ public class CompleteServiceImpl implements CompleteService {
params.put("searchUserName", searchUserName);
params.put("searchCreateName", searchCreateName);
/*params.put("LoginUserId", LoginUserId);*/
params.put("cls", nCls);
// 정렬 파라미터 가공
if (params.get("sort[0][field]") != null) {
String sortField = (String) params.get("sort[0][field]");
String sortDir = (String) params.get("sort[0][dir]");
// SQL Injection 방지를 위해 허용된 컬럼명인지 확인하는 로직 추가 필요
// 예: if ("projectName".equals(sortField) || "userName".equals(sortField) ...)
// MyBatis에서 사용할 단순한 이름으로 파라미터를 추가합니다.
params.put("sortField", sortField);
params.put("sortDir", sortDir);
}
Long pageSize = MyUtil.getLongFromObject( params.get("pageSize") );
if( pageSize == null ) {
@ -129,6 +146,7 @@ public class CompleteServiceImpl implements CompleteService {
params.put("recordCountPerPage", paginationInfo.getRecordCountPerPage());
params.put("cls", nCls);
// data정보
arrayData = selectCompleteItems(params);
params.put("LoginUserId", LoginUserId);

5
src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java
View File

@ -20,6 +20,7 @@ import egovframework.com.json.JSONObject;
import geoinfo.regi.holeCoordinate.service.HoleCoordinateService;
import geoinfo.regi.manageList.service.ManageListService;
import geoinfo.regi.status.service.RegiPageService;
import geoinfo.util.MyUtil;
import ictway.comm.util.parseData;
import ictway.comm.web.WebUtil;
@ -38,6 +39,9 @@ public class HoleCoordinateController {
// 지반정보등록 (관리자) - 좌표수정목록
@RequestMapping(value = "/holeCoord.do")
public String holeCoord(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
strUtil sUtil = new strUtil();
WebUtil wUtil = new WebUtil();
wUtil.topTabId = "manageCoordinate"; // 검수일때 tab 활성화 시켜주기 위해
@ -50,6 +54,7 @@ public class HoleCoordinateController {
String searchUserName = sUtil.checkNull(parseData.parseData((String)params.get("searchUserName")));
String searchCreateName = sUtil.checkNull(parseData.parseData((String)params.get("searchCreateName")));
params.put("loginUserId", loginUserId);
params.put("cls", nCls);
int count = 0;

12
src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java
View File

@ -7128,7 +7128,17 @@ public class ManageExcelUploadProc03Controller {
map.put("CORE_NUM",j+1 );
map.put("CORE_LOCAL",extracted[j].getName() );
map.put("CORE_PIC", saveName );
map.put("CORE_DESC",excel3Wp.get("col1",j+1).trim() );
String CoreDesc = null;
if( 1 < excel3Wp.getLength() ) {
CoreDesc = excel3Wp.get("col1",j+1);
CoreDesc = CoreDesc.trim();
} else {
CoreDesc = "-";
params.put("resultMsg", "코어 사진 설명을 입력하세요. 없는 경우 '- 를 입력하세요.");
return params;
}
map.put("CORE_DESC", CoreDesc );
map.put("USERID",request.getSession().getAttribute("USERID"));
coreList.add(map);
//headerService.insertTempHeaderCore(params);

5
src/main/java/geoinfo/regi/status/RegiController.java
View File

@ -66,6 +66,9 @@ public class RegiController {
// 지반정보 입력시스템 - 프로젝트 현황
@RequestMapping(value = "/webManage.do")
public String manageRegi(ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
WebUtil wUtil = new WebUtil();
wUtil.topTabId = "manageIndex"; // 검수일때 tab 활성화 시켜주기 위해
String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID"));
@ -74,7 +77,7 @@ public class RegiController {
int ING_CNT = 0;
int CONFIRM_CNT = 0;
if ("admin_user".equals(LoginUserId) == false) {
if ("admin_user".equals(LoginUserId) == false && nCls != 65535) {
EgovMap regiCount = masterService.getRegiCountAdmin();
model.addAttribute("WAIT_CNT", regiCount.get("WAIT_CNT"));

3
src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java
View File

@ -159,7 +159,8 @@ public class RegiPageServiceImpl implements RegiPageService {
return regiPageMapper.selectWebCommCode(params);
}
@Override
// thkim 20251017 기준 selectCompleteItems를 호출하는 곳이 없음
@Override
public ArrayList selectCompleteItems(HashMap<String, Object> params) throws Exception {
return regiPageMapper.selectCompleteItems(params);
}

57
src/main/java/geoinfo/util/JwtUtil.java Normal file
View File

@ -0,0 +1,57 @@
package geoinfo.util;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.httpclient.NameValuePair;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
/**
* JWT 용 util class
* @author thkim
*
*/
public final class JwtUtil {
private static final Logger logger = LoggerFactory.getLogger(JwtUtil.class);
public static final String VERSION = "20251017_1430";
private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss");
// 주석 다는 기준: https://www.oracle.com/technetwork/java/javase/tech/index-137868.html
/*
* 로그인 된 사용자의 cls값을 구한다.
*/
public static int getCls(HttpServletRequest request) {
if( request.getSession() != null ) {
return -1;
}
if( request.getSession().getAttribute("CLS") == null ) {
return -1;
}
return MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
}
}

4
src/main/resources/egovframework/sqlmap/mapper/regi/complete.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="geoinfo.regi.complete.service.CompleteMapper">
<!-- 관리자 리스트 -->
<!-- 관리자 리스트 : thkim 20251017 여기를 호출하는 곳이 없는 것으로 보임. -->
<select id="getComList" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT
@ -63,7 +63,7 @@
<if test="searchHistSeq != null and searchHistSeq != '' ">
<![CDATA[ AND T.HIST_SEQ = #{HIST_SEQ} ]]>
</if>
<if test="loginUserId != 'admin_user'">
<if test="loginUserId != 'admin_user' and cls != 65535">
<![CDATA[ AND T.PROJECT_MASTER_COMPANY_O_CODE = (SELECT MASTER_COMPANY_CODE FROM WEB_MEMBER_IN WHERE USERID = #{loginUserId} ) ]]>
</if>
<![CDATA[

174
src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml
View File

@ -14,97 +14,87 @@
</select>
<select id="selectCompleteItems" parameterType="map" resultType="egovMap">
SELECT
*
FROM
(
SELECT
T.CLASS_CODE
, T.PROJECT_CODE
, T.REPORT_TYPE
, T.REPORT_TYPE_NAME
, REPLACE(T.PROJECT_NAME,'"','''') AS PROJECT_NAME
, T.USERID
, T.USER_NAME
, T.STATE
, T.STATE_NAME
, T.CREATE_NAME
, T.CREATE_USERID
, T.DATETIME
, T.MAP
, T.INS
, T.MODIFYCALL
, OB.HIST_SEQ
, TO_CHAR(OB.CREATEDATE,'YYYY-MM-DD HH24:MI:SS') AS CREATEDATE
, TO_CHAR(OB.MODIFY_CALL_DATE,'YYYY-MM-DD HH24:MI:SS') AS MODIFYCALLDATE
, NVL((SELECT DISTINCT(REPORT_FILE) FROM TEMP_EXPERT_OPINION WHERE PROJECT_CODE = T.PROJECT_CODE),'NO') AS EXPERT_FILE
, ROW_NUMBER() OVER(ORDER BY T.DATETIME DESC) AS RNK
FROM
(
SELECT
CLASS_CODE
, PROJECT_CODE
, REPORT_TYPE
, FUNC_COMM_NAME('CM016',REPORT_TYPE ) REPORT_TYPE_NAME
, PROJECT_NAME
, USERID
, (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = INFO.USERID) AS USER_NAME
, STATE
, FUNC_COMM_NAME('CM001',STATE ) STATE_NAME
, (
SELECT
(SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = M.USERID)
FROM
TEMP_MANAGE_STATE M
WHERE
M.PROJECT_CODE = INFO.PROJECT_CODE
) AS CREATE_NAME
, (SELECT M.USERID FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE) AS CREATE_USERID
, TO_CHAR(DATETIME,'YYYY-MM-DD HH24:MI:SS') AS DATETIME
, DECODE(REPORT_TYPE,'CH','map','') AS MAP
, PROJECT_MASTER_COMPANY_O_CODE
, DECODE(STATE,'6','insert') AS INS
, DECODE(STATE,'6','modifycall') AS MODIFYCALL
FROM
TEMP_PROJECT_INFO INFO
<![CDATA[
WHERE NVL(USE_YN,' ') <> 'N' AND STATE = '6'
]]>
) T
, TEMP_MANAGE_STATE OB
WHERE
T.PROJECT_CODE = OB.PROJECT_CODE(+)
<if test="srchReportType != null and srchReportType != '' and srchReportType != 'null'">
AND T.REPORT_TYPE = #{srchReportType}
</if>
<if test="searchProjectName != null and searchProjectName != '' and searchProjectName != 'null'">
AND T.PROJECT_NAME LIKE '%${searchProjectName}%'
</if>
<if test="searchProjectCode != null and searchProjectCode != '' and searchProjectCode != 'null'">
AND T.PROJECT_CODE LIKE '%${searchProjectCode}%'
</if>
<if test="searchUserName != null and searchUserName != '' and searchUserName != 'null'">
AND T.USER_NAME = #{searchUserName}
</if>
<if test="searchCreateName != null and searchCreateName != '' and searchCreateName != 'null'">
AND T.CREATE_NAME = #{searchCreateName}
</if>
<if test="searchHistSeq != null and searchHistSeq != '' and searchHistSeq != 'null'">
AND OB.HIST_SEQ = #{searchHistSeq}
</if>
<if test="LoginUserId != 'admin_user' and LoginUserId != null and LoginUserId != '' ">
AND T.PROJECT_MASTER_COMPANY_O_CODE = (SELECT MASTER_COMPANY_CODE FROM WEB_MEMBER_IN WHERE USERID = #{LoginUserId})
</if>
ORDER BY
T.DATETIME DESC
) A
WHERE
<![CDATA[
A.RNK BETWEEN #{firstIndex} + 1
AND #{firstIndex} + #{recordCountPerPage}
]]>
SELECT
*
FROM
(
SELECT
T.CLASS_CODE,
T.PROJECT_CODE,
T.REPORT_TYPE,
T.REPORT_TYPE_NAME,
REPLACE(T.PROJECT_NAME, '"', '''') AS "projectName",
T.USERID,
T.USER_NAME AS "userName",
T.STATE,
T.STATE_NAME AS "stateName",
T.CREATE_NAME AS "createName",
T.CREATE_USERID AS "createUserid",
T.DATETIME AS "datetime",
T.MAP AS "map",
T.INS AS "ins",
T.MODIFYCALL AS "modifycall",
OB.HIST_SEQ AS "histSeq",
TO_CHAR(OB.CREATEDATE, 'YYYY-MM-DD HH24:MI:SS') AS "createdate",
TO_CHAR(OB.MODIFY_CALL_DATE, 'YYYY-MM-DD HH24:MI:SS') AS "modifycalldate",
NVL((SELECT DISTINCT (REPORT_FILE) FROM TEMP_EXPERT_OPINION WHERE PROJECT_CODE = T.PROJECT_CODE), 'NO') AS "expertFile",
ROW_NUMBER() OVER(
ORDER BY
<choose>
<when test="sortField == 'projectName'"> T.PROJECT_NAME ${sortDir} </when>
<when test="sortField == 'userName'"> T.USER_NAME ${sortDir} </when>
<when test="sortField == 'datetime'">
T.DATETIME ${sortDir} <if test='sortDir == "desc"'> NULLS LAST </if>
</when>
<when test="sortField == 'createdate'">
OB.CREATEDATE ${sortDir} <if test='sortDir == "desc"'> NULLS LAST </if>
</when>
<when test="sortField == 'modifycalldate'">
OB.MODIFY_CALL_DATE ${sortDir} <if test='sortDir == "desc"'> NULLS LAST </if>
</when>
<when test="sortField == 'stateName'"> T.STATE_NAME ${sortDir} </when>
<when test="sortField == 'createName'"> T.CREATE_NAME ${sortDir} </when>
<when test="sortField == 'histSeq'">
OB.HIST_SEQ ${sortDir} <if test='sortDir == "desc"'> NULLS LAST </if>
</when>
<otherwise> T.DATETIME DESC NULLS LAST </otherwise>
</choose>
) AS RNK
FROM
(
SELECT
CLASS_CODE,
PROJECT_CODE,
REPORT_TYPE,
FUNC_COMM_NAME('CM016', REPORT_TYPE) REPORT_TYPE_NAME,
PROJECT_NAME,
USERID,
(SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = INFO.USERID) AS USER_NAME,
STATE,
FUNC_COMM_NAME('CM001', STATE) STATE_NAME,
(SELECT (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = M.USERID)
FROM TEMP_MANAGE_STATE M
WHERE M.PROJECT_CODE = INFO.PROJECT_CODE) AS CREATE_NAME,
(SELECT M.USERID FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE) AS CREATE_USERID,
TO_CHAR(DATETIME, 'YYYY-MM-DD HH24:MI:SS') AS DATETIME,
DECODE(REPORT_TYPE, 'CH', 'map', '') AS MAP,
PROJECT_MASTER_COMPANY_O_CODE,
DECODE(STATE, '6', 'insert') AS INS,
DECODE(STATE, '6', 'modifycall') AS MODIFYCALL
FROM TEMP_PROJECT_INFO INFO
WHERE NVL(USE_YN, ' ') != 'N' AND STATE = '6'
) T,
TEMP_MANAGE_STATE OB
WHERE T.PROJECT_CODE = OB.PROJECT_CODE(+)
<if test="searchProjectName != null and searchProjectName != '' and searchProjectName != 'null'">
AND T.PROJECT_NAME LIKE '%${searchProjectName}%'
</if>
) A
WHERE
A.RNK BETWEEN #{firstIndex} + 1 AND #{firstIndex} + #{recordCountPerPage}
</select>
<select id="selectCompleteItemsCnt" parameterType="hashmap" resultType="long">
@ -155,7 +145,7 @@
<if test="searchHistSeq != null and searchHistSeq != '' and searchHistSeq != 'null'">
AND OB.HIST_SEQ = #{searchHistSeq}
</if>
<if test="LoginUserId != 'admin_user' and LoginUserId != null and LoginUserId != '' ">
<if test="LoginUserId != 'admin_user' and LoginUserId != null and LoginUserId != '' and cls != 65535 ">
AND T.PROJECT_MASTER_COMPANY_O_CODE = (SELECT MASTER_COMPANY_CODE FROM WEB_MEMBER_IN WHERE USERID = #{LoginUserId})
</if>

65
src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml
View File

@ -7,39 +7,40 @@
<select id="getDataList" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT T.CLASS_CODE, T.PROJECT_CODE, T.REPORT_TYPE, T.REPORT_TYPE_NAME, REPLACE(REPLACE(T.PROJECT_NAME, '"',''''), '''', ' ') AS "PROJECT_NAME", T.USERID, T.USER_NAME, T.STATE, T.STATE_NAME, T.CREATE_NAME, T.CREATE_USERID, T.DATETIME, T.MAP, T.INS
FROM (
SELECT
CLASS_CODE, PROJECT_CODE, REPORT_TYPE, FUNC_COMM_NAME('CM016',REPORT_TYPE ) REPORT_TYPE_NAME
, PROJECT_NAME, USERID, (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = INFO.USERID) AS USER_NAME
, STATE, FUNC_COMM_NAME('CM001',STATE ) STATE_NAME, (SELECT (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = M.USERID)
FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE ) AS CREATE_NAME
, (SELECT M.USERID FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE) AS CREATE_USERID
, TO_CHAR(DATETIME,'YYYY-MM-DD HH24:MI:SS') AS DATETIME
, DECODE(REPORT_TYPE,'CH','map','') AS MAP
, DECODE(STATE,'6','insert') AS INS
, PROJECT_MASTER_COMPANY_O_CODE
FROM TEMP_PROJECT_INFO INFO
WHERE NVL(USE_YN,' ') <> 'N' AND STATE = '6'
AND REPORT_TYPE = 'CH'
) T
WHERE 1=1 ]]>
<if test="searchProjectName != null and searchProjectName != '' ">
<![CDATA[ AND T.PROJECT_NAME LIKE '%' || #{searchProjectName} || '%' ]]>
</if>
<if test="searchUserName != null and searchUserName != '' ">
<![CDATA[ AND T.USER_NAME = #{searchUserName} ]]>
</if>
<if test="searchCreateName != null and searchCreateName != '' ">
<![CDATA[ AND T.CREATE_NAME = #{searchCreateName} ]]>
</if>
<if test="loginUserId != 'admin_user'">
<![CDATA[ AND T.PROJECT_MASTER_COMPANY_O_CODE = (SELECT MASTER_COMPANY_CODE FROM WEB_MEMBER_IN WHERE USERID = #{loginUserId} ) ]]>
</if>
<![CDATA[
ORDER BY T.DATETIME DESC
]]>
FROM (
SELECT
CLASS_CODE, PROJECT_CODE, REPORT_TYPE, FUNC_COMM_NAME('CM016',REPORT_TYPE ) REPORT_TYPE_NAME
, PROJECT_NAME, USERID, (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = INFO.USERID) AS USER_NAME
, STATE, FUNC_COMM_NAME('CM001',STATE ) STATE_NAME, (SELECT (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = M.USERID)
FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE ) AS CREATE_NAME
, (SELECT M.USERID FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE) AS CREATE_USERID
, TO_CHAR(DATETIME,'YYYY-MM-DD HH24:MI:SS') AS DATETIME
, DECODE(REPORT_TYPE,'CH','map','') AS MAP
, DECODE(STATE,'6','insert') AS INS
, PROJECT_MASTER_COMPANY_O_CODE
FROM TEMP_PROJECT_INFO INFO
WHERE NVL(USE_YN,' ') <> 'N' AND STATE = '6'
AND REPORT_TYPE = 'CH'
) T
WHERE 1=1 ]]>
<if test="searchProjectName != null and searchProjectName != '' ">
<![CDATA[ AND T.PROJECT_NAME LIKE '%' || #{searchProjectName} || '%' ]]>
</if>
<if test="searchUserName != null and searchUserName != '' ">
<![CDATA[ AND T.USER_NAME = #{searchUserName} ]]>
</if>
<if test="searchCreateName != null and searchCreateName != '' ">
<![CDATA[ AND T.CREATE_NAME = #{searchCreateName} ]]>
</if>
<if test="loginUserId != 'admin_user' and cls != 65535 ">
<![CDATA[ AND T.PROJECT_MASTER_COMPANY_O_CODE = (SELECT MASTER_COMPANY_CODE FROM WEB_MEMBER_IN WHERE USERID = #{loginUserId} ) ]]>
</if>
<![CDATA[
ORDER BY T.DATETIME DESC
]]>
</select>
<select id="getCoordList" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT PROJECT_CODE

2
src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml
View File

@ -533,7 +533,7 @@
<if test="searchHistSeq != null">
AND OB.HIST_SEQ = #{searchHistSeq}
</if>
<if test="LoginUserId != 'admin_user'">
<if test="LoginUserId != 'admin_user' and cls != 65535 ">
AND T.PROJECT_MASTER_COMPANY_O_CODE = (SELECT MASTER_COMPANY_CODE FROM WEB_MEMBER_IN WHERE USERID = #{LoginUserId})
</if>

2
src/main/webapp/WEB-INF/views/body/download/downloadPurpose.jsp
View File

@ -71,7 +71,7 @@ ${msg}
<td><a href="#" onClick="purposeCheck(20)"><img name="imgM" id="imgM_20" src="/images/down/menu_20.gif" border="0"></a></td>
<td><a href="#" onClick="purposeCheck(9)"><img name="imgM" id="imgM_09" src="/images/down/menu_09.gif" border="0"></a></td>
</tr>
<c:if test="${USERID eq 'admin_user'}">
<c:if test="${USERID eq 'admin_user' || cls == 65535}">
<tr>
<td colspan="2"><a href="#" onClick="purposeCheck(21)"><img name="imgM" id="imgM_21" src="/images/down/menu_21.gif" border="0"></a></td>
</tr>

2
src/main/webapp/WEB-INF/views/home/include/left_menu.jsp
View File

@ -219,7 +219,7 @@
<span class="title">장바구니</span>
</a>
</li>
<c:if test="${userid == 'admin_user'}">
<c:if test="${userid == 'admin_user' || cls == 65535 }">
<li class="nav-item">
<a href="#" onClick="go_passch('in4')" onFocus="this.blur()" class="nav-link nav-toggle">
<span class="title">비밀번호 초기화</span>

4
src/main/webapp/WEB-INF/views/home/include/top.jsp
View File

@ -45,12 +45,12 @@
<a href="logout.do?location=index" onFocus='this.blur()' class="btn top-btn-member logout-btn">로그아웃</a>
</li>
<!--20220927 박정빈 유통자료 생성 알림 -->
<c:if test="${userid ne 'admin_user'}">
<c:if test="${userid ne 'admin_user' && cls != 65535}">
<li>
<a href="#" onClick="gourl('registrationExit')" onFocus='this.blur()' class="btn top-btn-member secession-btn">회원탈퇴</a>
</li>
</c:if>
<c:if test="${userid eq 'admin_user'}">
<c:if test="${userid eq 'admin_user' || cls == 65535}">
<li class="circulation-notice">
<a href="javascript:;" onClick="window.open('/manageList.do')" class="btn top-btn-member notice-btn">검수등록대기건수</a>
<c:if test="${WAIT_CNT > 0}">

2
src/main/webapp/WEB-INF/views/home/index.jsp
View File

@ -30,7 +30,7 @@
var loginCheck = '${userId}' == "" ? false : true;
var popupFlag = Cookies.get("popupFlag");
if (loginCheck && popupFlag !== "N") {
if(('${userId}' == 'admin_user')){
if(('${userId}' == 'admin_user' || ${cls} === 65535 )){
openPop();
}

6
src/main/webapp/WEB-INF/views/home/main.jsp
View File

@ -482,7 +482,7 @@
</script>
<!-- 마이페이지 > 비밀번호 수정 끝 -->
</c:if>
<c:if test="${eGovUrl == 'loginCount_reset.do' && userid == 'admin_user'}">
<c:if test="${eGovUrl == 'loginCount_reset.do' && (userid == 'admin_user' || cls == 65535 )}">
<!-- 마이페이지 > 비밀번호 초기화 시작 -->
<h1 class="page-title">
<span class="page-title-text">비밀번호 초기화</span>
@ -501,7 +501,7 @@
<!-- 마이페이지 > 비밀번호 초기화 끝 -->
</c:if>
<c:if test="${eGovUrl == 'joinEx.do' && userid == 'admin_user'}">
<c:if test="${eGovUrl == 'joinEx.do' && (userid == 'admin_user' || cls == 65535 )}">
<!-- 마이페이지 > 회원가입 시작 -->
<h1 class="page-title">
<span class="page-title-text">회원가입</span>
@ -520,7 +520,7 @@
<!-- 마이페이지 > 비밀번호 초기화 끝 -->
</c:if>
<c:if test="${eGovUrl == 'jusandoNew.do' && userid == 'admin_user'}">
<c:if test="${eGovUrl == 'jusandoNew.do' && (userid == 'admin_user' || cls == 65535 )}">
<!-- 마이페이지 > 회원가입 시작 -->
<h1 class="page-title">
<span class="page-title-text">주상도 만들기</span>

8
src/main/webapp/WEB-INF/views/layouts/home/main.jsp
View File

@ -174,7 +174,7 @@ function go_passch(load){
<tr>
<td align="center"><a onclick="go_passch('in3')" href="#"><img name="passch3" width="212" height="37" onmouseover="passch_img('in3');" onmouseout="passch_img('out3');" src="./images/join/left_menu_05.gif"></a></td>
</tr>
<c:if test="${userid == 'admin_user'}">
<c:if test="${userid == 'admin_user' || cls == 65535}">
<tr>
<td align="center"><a onclick="go_passch('in4')" href="#"><img name="passch4" width="212" height="37" onmouseover="passch_img('in4');" onmouseout="passch_img('out4');" src="./images/join/left_menu_06.gif"></a></td>
</tr>
@ -203,7 +203,7 @@ function go_passch(load){
<tr>
<td align="center"><a onclick="go_passch('in3')" href="#"><img name="passch3" width="212" height="37" onmouseover="passch_img('in3');" onmouseout="passch_img('out3');" src="./images/join/left_menu_05.gif"></a></td>
</tr>
<c:if test="${userid == 'admin_user'}">
<c:if test="${userid == 'admin_user' || cls == 65535}">
<tr>
<td align="center"><a onclick="go_passch('in4')" href="#"><img name="passch4" width="212" height="37" onmouseover="passch_img('in4');" onmouseout="passch_img('out4');" src="./images/join/left_menu_06.gif"></a></td>
</tr>
@ -232,7 +232,7 @@ function go_passch(load){
<tr>
<td align="center"><img name="down" width="212" height="37" src="./images/join/left_menu_05_over.gif"></td>
</tr>
<c:if test="${userid == 'admin_user'}">
<c:if test="${userid == 'admin_user' || cls == 65535}">
<tr>
<td align="center"><a onclick="go_passch('in4')" href="#"><img name="passch4" width="212" height="37" onmouseover="passch_img('in4');" onmouseout="passch_img('out4');" src="./images/join/left_menu_06.gif"></a></td>
</tr>
@ -243,7 +243,7 @@ function go_passch(load){
</table>
</c:if>
<!-- 마이페이지 비밀번호 초기화 -->
<c:if test="${eGovUrl == 'loginCount_reset.do' && userid == 'admin_user'}">
<c:if test="${eGovUrl == 'loginCount_reset.do' && (userid == 'admin_user' || cls == 65535)}">
<table width="236" border="0" cellspacing="0" cellpadding="0">
<tr>
<td><img src="./images/join/left_tit_01.gif" width="236" height="60" /></td>

2
src/main/webapp/WEB-INF/views/web/include/includeTopInput_2021_back.jsp
View File

@ -39,7 +39,7 @@
<li><a href="/manage/complete.do" id="manageComplete">검수등록완료 목록</a></li>
<li><a href="/list_reg.do" id="manageRegList">입력중인프로젝트 현황</a>
<li><a href="/holeCoord.do" id="manageCoordinate">좌표수정</a></li>
<c:if test="${'admin_user' == topUserId}">
<c:if test="${'admin_user' == topUserId || cls == 65535 }">
<li><a href="/webManageAdd.do" id="manageAdd">검수자 관리</a></li>
</c:if>
</ul>

67
src/main/webapp/WEB-INF/views/web/manage/complete.jsp
View File

@ -18,7 +18,11 @@ function fn_Search() {
if (!fn_fromToCheckAlert($("#startDate").val(), $("#endDate").val(), "기간시작일", "기간종료일", "startDate"))
return false;
document.frmSearch.submit();
var grid = kendoJQuery("#grid_type_1").data("kendoGrid");
if (grid) {
// 검색 시 항상 첫 페이지로 이동
grid.dataSource.page(1);
}
}
//load
@ -88,7 +92,7 @@ function insBtnTemplate(reportType, projectCode, createUserid, expertFile, ins)
function insBtnClick(reportType, projectCode, createUserid, expertFile) {
//alert("보고서 양식 - " + expertFile);
if("admin_user"=="${params.LoginUserId}" || createUserid == "${params.LoginUserId}"){ //사용자체크
if("admin_user"=="${params.LoginUserId}" || "65535" === "${cls}" || createUserid == "${params.LoginUserId}"){ //사용자체크
var expertFileNm = expertFile;
//alert("보고서 양식 - " + expertFileNm);
if (confirm("재등록 하여 유통자료 재생성 하시겠습니까? ")) {
@ -99,7 +103,7 @@ function insBtnClick(reportType, projectCode, createUserid, expertFile) {
alert("해당 검수자가 아닙니다.");
}
/* if("admin_user"=="${params.LoginUserId}" || createUserid == "${params.LoginUserId}"){ //사용자체크
/* if("admin_user"=="${params.LoginUserId}" || "65535" === "${cls}" || createUserid == "${params.LoginUserId}"){ //사용자체크
var expertFileNm = expertFile;
//alert("보고서 양식 - " + expertFileNm);
if ( expertFileNm == "" || expertFileNm == "NO" || expertFileNm == "null" ) {
@ -128,7 +132,7 @@ function modifycallBtnTemplate(projectCode, createUserid, modifycall) {
// 수정요청 클릭
function modifycallBtnClick(projectCode, createUserid) {
if("admin_user"=="${params.LoginUserId}" || createUserid == "${params.LoginUserId}"){ //사용자체크
if("admin_user"=="${params.LoginUserId}" || "65535" === "${cls}" || createUserid == "${params.LoginUserId}"){ //사용자체크
$("#ProviderInfo").addClass("trViewOff"); //div 열려 있는거 닫기
// 수정요청사유 등록
@ -149,7 +153,7 @@ function modifyuserBtnTemplate(projectCode, createUserid) {
//변경요청 클릭
function modifyuserBtnClick(projectCode, id) {
if("admin_user"=="${params.LoginUserId}"){ //사용자체크
if("admin_user"=="${params.LoginUserId}" || "65535" === "${cls}" ){ //사용자체크
$("#ProviderInfo").addClass("trViewOff"); //div 열려 있는거 닫기
// 수정요청사유 등록
@ -224,25 +228,37 @@ function kendoGrid() {
if( searchCreateNameEle ) {
searchCreateName = searchCreateNameEle.value;
}
$.ajax({
url: "/manage/complete/list.do?pageIndex=" + currentPage
+ "&" + "searchProjectName=" + searchProjectName
+ "&" + "searchProjectCode=" + searchProjectCode
+ "&" + "searchHistSeq=" + searchHistSeq
+ "&" + "searchUserName=" + searchUserName
+ "&" + "searchCreateName=" + searchCreateName
,
contentType: 'application/json',
dataType: "json",
type: 'GET',
success: function(result) {
options.success(result);
},
error: function(result) {
options.error(result);
}
});
// 정렬 파라미터를 담을 변수 추가
var sortParams = "";
if (options.data.sort && options.data.sort.length > 0) {
for (var i = 0; i < options.data.sort.length; i++) {
sortParams += "&sort[" + i + "][field]=" + options.data.sort[i].field;
sortParams += "&sort[" + i + "][dir]=" + options.data.sort[i].dir;
}
}
$.ajax({
              url: "/manage/complete/list.do", // URL은 순수 경로만 지정
data: { // 파라미터는 data 객체로 전달
pageIndex: currentPage,
searchProjectName: searchProjectName,
searchProjectCode: searchProjectCode,
searchHistSeq: searchHistSeq,
searchUserName: searchUserName,
searchCreateName: searchCreateName,
// Kendo UI가 전달하는 정렬, 페이징 정보 등을 options.data에서 가져와 추가
sort: options.data.sort
},
              contentType: 'application/json',
              dataType: "json",
              type: 'GET',
              success: function(result) {
                  options.success(result);
              },
              error: function(result) {
                options.error(result);
              }
            });
},
},
schema: {
@ -254,7 +270,8 @@ function kendoGrid() {
}
},
pageSize: 10,
serverPaging: true
serverPaging: true,
serverSorting: true
});
kendoJQuery("#grid_type_1").kendoGrid({

6
src/main/webapp/WEB-INF/views/web/manage/complete_2021_back.jsp
View File

@ -96,7 +96,7 @@ function insBtnTemplate(reportType, projectCode, createUserid, expertFile, ins)
function insBtnClick(reportType, projectCode, createUserid, expertFile) {
//alert("보고서 양식 - " + expertFile);
if("admin_user"=="${params.LoginUserId}" || createUserid == "${params.LoginUserId}"){ //사용자체크
if("admin_user"=="${params.LoginUserId}" || "65535" === "${cls}" || createUserid == "${params.LoginUserId}"){ //사용자체크
var expertFileNm = expertFile;
//alert("보고서 양식 - " + expertFileNm);
if ( expertFileNm == "" || expertFileNm == "NO" || expertFileNm == "null" ) {
@ -122,7 +122,7 @@ function modifycallBtnTemplate(projectCode, createUserid, modifycall) {
// 수정요청 클릭
function modifycallBtnClick(projectCode, createUserid) {
if("admin_user"=="${params.LoginUserId}" || createUserid == "${params.LoginUserId}"){ //사용자체크
if("admin_user"=="${params.LoginUserId}" || "65535" === "${cls}" || createUserid == "${params.LoginUserId}"){ //사용자체크
$("#ProviderInfo").addClass("trViewOff"); //div 열려 있는거 닫기
// 수정요청사유 등록
@ -143,7 +143,7 @@ function modifyuserBtnTemplate(projectCode, createUserid) {
//변경요청 클릭
function modifyuserBtnClick(projectCode, id) {
if("admin_user"=="${params.LoginUserId}"){ //사용자체크
if("admin_user"=="${params.LoginUserId}" || "65535" === "${cls}" ){ //사용자체크
$("#ProviderInfo").addClass("trViewOff"); //div 열려 있는거 닫기
// 수정요청사유 등록

4
src/main/webapp/WEB-INF/views/web/manage/complete_old.jsp
View File

@ -82,7 +82,7 @@
//등록 및 유통자료 생성
if (dataField == "ins") {
if ("admin_user"=="${params.LoginUserId}" || gridData[rowIndex]["createUserid"] == "${params.LoginUserId}") { //사용자체크
if ("admin_user"=="${params.LoginUserId}" || "65535" === "${cls}" || gridData[rowIndex]["createUserid"] == "${params.LoginUserId}") { //사용자체크
var expertFileNm = gridRoot.getItemFieldAt(rowIndex, "expertFile");
//alert("보고서 양식 - " + expertFileNm);
if ( expertFileNm == "" || expertFileNm == "NO" || expertFileNm == "null" ) {
@ -100,7 +100,7 @@
//수정요청
if (dataField == "modifycall") {
if ("admin_user"=="${params.LoginUserId}" || gridData[rowIndex]["createUserid"] == "${params.LoginUserId}") { //사용자체크
if ("admin_user"=="${params.LoginUserId}" || "65535" === "${cls}" || gridData[rowIndex]["createUserid"] == "${params.LoginUserId}") { //사용자체크
$("#ProviderInfo").addClass("trViewOff"); //div 열려 있는거 닫기
// 수정요청사유 등록

4
src/main/webapp/WEB-INF/views/web/manage/hole_coord.jsp
View File

@ -62,8 +62,8 @@ function insBtnTemplate(report_type, project_code, checkuserid, expertFile, ins)
}
//등록 및 유통자료 생성 클릭
function insBtnClick(reportType, projectCode, createUserid, expertFile) {
/* if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ */ //사용자체크
if("admin_user"=="${loginUserId}" || createUserid == "${loginUserId}"){ //사용자체크
/* if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ */ //사용자체크
if("admin_user"=="${loginUserId}" || "65535" === "${cls}" || createUserid == "${loginUserId}"){ //사용자체크
if(confirm("재등록 하여 유통자료 재생성 하시겠습니까? ")){
fn_submit(reportType, projectCode, 'CREATE');

4
src/main/webapp/WEB-INF/views/web/manage/hole_coord_2021_back.jsp
View File

@ -71,8 +71,8 @@ function insBtnTemplate(report_type, project_code, checkuserid, expertFile, ins)
}
//등록 및 유통자료 생성 클릭
function insBtnClick(reportType, projectCode, createUserid, expertFile) {
/* if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ */ //사용자체크
if("admin_user"=="${loginUserId}" || createUserid == "${loginUserId}"){ //사용자체크
/* if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ */ //사용자체크
if("admin_user"=="${loginUserId}" || "65535" === "${cls}" || createUserid == "${loginUserId}"){ //사용자체크
if(confirm("재등록 하여 유통자료 재생성 하시겠습니까? ")){
fn_submit(reportType, projectCode, 'CREATE');

2
src/main/webapp/WEB-INF/views/web/manage/hole_coord_old.jsp
View File

@ -73,7 +73,7 @@ var rMateGridOnLoad = function() {
var dataField = column.getDataField();
//등록 및 유통자료 생성
if(dataField == "ins"){
if("admin_user"=="${loginUserId}" || gridData[rowIndex]["createUserid"] == "${loginUserId}"){ //사용자체크
if("admin_user"=="${loginUserId}" || "65535" === "${cls}" || gridData[rowIndex]["createUserid"] == "${loginUserId}"){ //사용자체크
if(confirm("재등록 하여 유통자료 재생성 하시겠습니까? ")){
fn_submit(gridData[rowIndex]["reportType"],gridData[rowIndex]["projectCode"],"CREATE");
}

8
src/main/webapp/WEB-INF/views/web/manage/list.jsp
View File

@ -141,7 +141,7 @@ function checkokBtnTemplate(report_type, project_code, checkuserid, checkok) {
//검수완료 클릭
function checkokBtnClick(report_type, project_code, checkuserid) {
if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ //사용자체크
if(confirm("검수완료하시겠습니까?")){
fn_submit(report_type,project_code, 'COMPLETE');
}
@ -161,7 +161,7 @@ function insBtnTemplate(report_type, project_code, checkuserid, expertFile, ins)
// 등록 및 유통자료 생성 클릭
function insBtnClick(report_type, project_code, checkuserid, expertFile) {
if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ //사용자체크
var expertFileNm = expertFile;
if ( expertFileNm == "" || expertFileNm == "NO" || expertFileNm == "null" ) {
alert("지반조사보고서가 등록되지 않으면 등록하실 수 없습니다.");
@ -190,7 +190,7 @@ function authinsBtnTemplate(report_type, project_code, checkuserid, expertFile,
}
// 직권등록 및 유통자료 생성 클릭
function authinsBtnClick(report_type, project_code, checkuserid, expertFile) {
if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ //사용자체크
var expertFileNm = expertFile;
if ( expertFileNm == "" || expertFileNm == "NO" || expertFileNm == "null" ) {
alert("지반조사보고서가 등록되지 않으면 등록하실 수 없습니다.");
@ -235,7 +235,7 @@ function modifycallBtnTemplate(project_code, checkuserid, modifycall) {
}
// 수정요청 클릭
function modifycallBtnClick(project_code, checkuserid) {
if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ //사용자체크
$("#ProviderInfo").addClass("trViewOff"); //div 열려 있는거 닫기
// 수정요청사유 등록

8
src/main/webapp/WEB-INF/views/web/manage/list_2021_back.jsp
View File

@ -146,7 +146,7 @@ function checkokBtnTemplate(report_type, project_code, checkuserid, checkok) {
//검수완료 클릭
function checkokBtnClick(report_type, project_code, checkuserid) {
if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ //사용자체크
if(confirm("검수완료하시겠습니까?")){
fn_submit(report_type,project_code, 'COMPLETE');
}
@ -166,7 +166,7 @@ function insBtnTemplate(report_type, project_code, checkuserid, expertFile, ins)
// 등록 및 유통자료 생성 클릭
function insBtnClick(report_type, project_code, checkuserid, expertFile) {
if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ //사용자체크
var expertFileNm = expertFile;
if ( expertFileNm == "" || expertFileNm == "NO" || expertFileNm == "null" ) {
alert("지반조사보고서가 등록되지 않으면 등록하실 수 없습니다.");
@ -195,7 +195,7 @@ function authinsBtnTemplate(report_type, project_code, checkuserid, expertFile,
}
// 직권등록 및 유통자료 생성 클릭
function authinsBtnClick(report_type, project_code, checkuserid, expertFile) {
if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ //사용자체크
var expertFileNm = expertFile;
if ( expertFileNm == "" || expertFileNm == "NO" || expertFileNm == "null" ) {
alert("지반조사보고서가 등록되지 않으면 등록하실 수 없습니다.");
@ -240,7 +240,7 @@ function modifycallBtnTemplate(project_code, checkuserid, modifycall) {
}
// 수정요청 클릭
function modifycallBtnClick(project_code, checkuserid) {
if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ //사용자체크
$("#ProviderInfo").addClass("trViewOff"); //div 열려 있는거 닫기
// 수정요청사유 등록

8
src/main/webapp/WEB-INF/views/web/manage/list_old.jsp
View File

@ -133,7 +133,7 @@ var rMateGridOnLoad = function() {
//검수완료
if(dataField == "checkok"){
if("admin_user"=="${LoginUserId}" || gridRoot.getItemFieldAt(rowIndex, "checkuserid") == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || gridRoot.getItemFieldAt(rowIndex, "checkuserid") == "${LoginUserId}"){ //사용자체크
if(confirm("검수완료하시겠습니까?")){
fn_submit(gridRoot.getItemFieldAt(rowIndex, "reportType"), gridRoot.getItemFieldAt(rowIndex, "projectCode"),"COMPLETE");
}
@ -144,7 +144,7 @@ var rMateGridOnLoad = function() {
//등록 및 유통자료 생성
if(dataField == "ins"){
if("admin_user"=="${LoginUserId}" || gridRoot.getItemFieldAt(rowIndex, "checkuserid") == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || gridRoot.getItemFieldAt(rowIndex, "checkuserid") == "${LoginUserId}"){ //사용자체크
var expertFileNm = gridRoot.getItemFieldAt(rowIndex, "expertFile");
//alert("보고서 양식 - " + expertFileNm);
if ( expertFileNm == "" || expertFileNm == "NO" || expertFileNm == "null" ) {
@ -164,7 +164,7 @@ var rMateGridOnLoad = function() {
%>
//직권 등록 및 유통자료 생성
if(dataField == "authins"){
if("admin_user"=="${LoginUserId}" || gridRoot.getItemFieldAt(rowIndex, "checkuserid") == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || gridRoot.getItemFieldAt(rowIndex, "checkuserid") == "${LoginUserId}"){ //사용자체크
var expertFileNm = gridRoot.getItemFieldAt(rowIndex, "expertFile");
//alert("보고서 양식 - " + expertFileNm);
if ( expertFileNm == "" || expertFileNm == "NO" || expertFileNm == "null" ) {
@ -193,7 +193,7 @@ var rMateGridOnLoad = function() {
//수정요청
if(dataField == "modifycall"){
if("admin_user"=="${LoginUserId}" || gridRoot.getItemFieldAt(rowIndex, "checkuserid") == "${LoginUserId}"){ //사용자체크
if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || gridRoot.getItemFieldAt(rowIndex, "checkuserid") == "${LoginUserId}"){ //사용자체크
$("#ProviderInfo").addClass("trViewOff"); //div 열려 있는거 닫기
// 수정요청사유 등록

2
src/main/webapp/WEB-INF/views/web/manage/re_name.jsp
View File

@ -62,7 +62,7 @@ function insBtnTemplate(report_type, project_code, checkuserid, expertFile, ins)
}
//등록 및 유통자료 생성 클릭
function insBtnClick(reportType, projectCode, createUserid, expertFile) {
/* if("admin_user"=="${LoginUserId}" || checkuserid == "${LoginUserId}"){ */ //사용자체크
/* if("admin_user"=="${LoginUserId}" || "65535" === "${cls}" || checkuserid == "${LoginUserId}"){ */ //사용자체크
if("9"=="${cls}" || createUserid == "${loginUserId}"){ //사용자체크
if(confirm("재등록 하여 유통자료 재생성 하시겠습니까? ")){

2
src/main/webapp/WEB-INF/views/web/project/checklist.jsp
View File

@ -1154,7 +1154,7 @@ var userId='<c:out value='${userId}'/>';
for(var i=0;i<tableSize;i++){
var checkTdSize = $(".table_checklist:eq("+i+") #checkTd").size();
if($(".table_checklist")[i].id == 'sampleInfo' && userId == 'admin_user'){
if($(".table_checklist")[i].id == 'sampleInfo' && (userId == 'admin_user' || "65535" === "${cls}") ){
sampleInfo = true;
}else{
for(var j=0;j<checkTdSize;j++){