feat: 스마트지반정보관리 입력 시스템 안정화
parent
4a2d51a2dd
commit
c6eaab7a55
12
list.txt
12
list.txt
|
|
@ -1,10 +1,2 @@
|
|||
src\main\webapp\WEB-INF\jsp\sgis\surveysystem\createSurvey.jsp
|
||||
src\main\webapp\WEB-INF\jsp\tiles\attribute\adm.top.jsp
|
||||
src\main\webapp\WEB-INF\jsp\sgis\surveysystem\createQuestion.jsp
|
||||
src\main\resources\egovframework\mapper\sgis\surveysystem\SurveyMapper.xml
|
||||
src\main\resources\egovframework\mapper\sgis\surveysystem\QuestionMapper.xml
|
||||
src\main\webapp\WEB-INF\jsp\sgis\surveysystem\createQuestionOption.jsp
|
||||
src\main\webapp\WEB-INF\jsp\sgis\map\mapMain.jsp
|
||||
src\main\webapp\WEB-INF\jsp\tiles\attribute\portal.top.jsp
|
||||
src\main\webapp\WEB-INF\jsp\sgis\portal\portalMain.jsp
|
||||
src\main\webapp\com\img\common\main\temp_dummy_main.png
|
||||
src\main\resources\egovframework\mapper\sgis\app\AppMainMapper.xml
|
||||
src\main\webapp\WEB-INF\jsp\sgis\popup\cordinateSaupMap.jsp
|
||||
72
pom.xml
72
pom.xml
|
|
@ -52,6 +52,12 @@
|
|||
<snapshots><enabled>false</enabled></snapshots>
|
||||
<releases><enabled>true</enabled></releases>
|
||||
</repository>
|
||||
<!-- Adding GeoSolutions repository to find missing dependencies -->
|
||||
<repository>
|
||||
<id>geosolutions</id>
|
||||
<name>geosolutions repository</name>
|
||||
<url>https://maven.geosolutions.it/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>osgeo-snapshot</id>
|
||||
<name>OSGeo Snapshot Repository</name>
|
||||
|
|
@ -204,7 +210,8 @@
|
|||
<groupId>com.tmax.tibero</groupId>
|
||||
<artifactId>tibero-jdbc</artifactId>
|
||||
<version>3.0</version>
|
||||
</dependency> -->
|
||||
</dependency>
|
||||
-->
|
||||
|
||||
<!-- cubrid driver -->
|
||||
<!--
|
||||
|
|
@ -348,11 +355,6 @@
|
|||
<artifactId>junit</artifactId>
|
||||
<version>4.13.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.geotools</groupId>
|
||||
<artifactId>gt-shapefile</artifactId>
|
||||
<version>${geotools.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.geotools</groupId>
|
||||
|
|
@ -370,6 +372,38 @@
|
|||
<version>${geotools.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Adding missing it.geosolutions.jaiext.* dependencies -->
|
||||
<dependency>
|
||||
<groupId>it.geosolutions.jaiext.lookup</groupId>
|
||||
<artifactId>jt-lookup</artifactId>
|
||||
<version>1.1.24</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>it.geosolutions.jaiext.bandcombine</groupId>
|
||||
<artifactId>jt-bandcombine</artifactId>
|
||||
<version>1.1.24</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>it.geosolutions.jaiext.format</groupId>
|
||||
<artifactId>jt-format</artifactId>
|
||||
<version>1.1.24</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>it.geosolutions.jaiext.utilities</groupId>
|
||||
<artifactId>jt-utilities</artifactId>
|
||||
<version>1.1.24</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>it.geosolutions.jaiext.shadedrelief</groupId>
|
||||
<artifactId>jt-shadedrelief</artifactId>
|
||||
<version>1.1.24</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>it.geosolutions.jaiext.imagefunction</groupId>
|
||||
<artifactId>jt-imagefunction</artifactId>
|
||||
<version>1.1.24</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
|
|
@ -465,6 +499,32 @@
|
|||
<artifactId>jython-standalone</artifactId>
|
||||
<version>2.7.1</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.python</groupId>
|
||||
<artifactId>jython-standalone</artifactId>
|
||||
<version>2.7.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.geotools</groupId>
|
||||
<artifactId>gt-shapefile</artifactId>
|
||||
<version>${geotools.version}</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/gt-shapefile-28-SNAPSHOT.jar</systemPath>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.geotools</groupId>
|
||||
<artifactId>gt-main</artifactId>
|
||||
<version>${geotools.version}</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/gt-main-28-SNAPSHOT.jar</systemPath>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import java.util.List;
|
|||
|
||||
import egovframework.rte.psl.dataaccess.mapper.Mapper;
|
||||
|
||||
@Mapper("admMainMapper")
|
||||
@Mapper("AdmMainMapper")
|
||||
public interface AdmMainMapper {
|
||||
|
||||
List<?> selectUserList(HashMap<String,Object> params) throws Exception;
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ import sgis.adm.service.AdmMainService;
|
|||
public class AdmMainServiceImpl implements AdmMainService {
|
||||
|
||||
@Autowired
|
||||
private AdmMainMapper AdmMainMapper;
|
||||
private AdmMainMapper admMainMapper;
|
||||
|
||||
@Override
|
||||
public List<?> selectUserList(HashMap<String,Object> params) throws Exception {
|
||||
return AdmMainMapper.selectUserList(params);
|
||||
return admMainMapper.selectUserList(params);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ public class AppMainController extends BaseController {
|
|||
//프로젝트 생성 (직접입력 저장)
|
||||
@RequestMapping(value = "/app/proj/insertProjectInfo.do")
|
||||
@ResponseBody
|
||||
public String insertProjectInfo(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
public JSONObject insertProjectInfo(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
String retStr = "";
|
||||
try {
|
||||
|
||||
|
|
@ -245,7 +245,10 @@ public class AppMainController extends BaseController {
|
|||
}catch(Exception e) {
|
||||
retStr = "fail";
|
||||
}
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
}
|
||||
|
||||
//프로젝트 상세조회
|
||||
|
|
@ -272,7 +275,7 @@ public class AppMainController extends BaseController {
|
|||
//프로젝트 지역파일 삭제 (직접입력 저장)
|
||||
@RequestMapping(value = "/app/proj/deleteProjectInfoFile.do")
|
||||
@ResponseBody
|
||||
public String deleteProjectInfoFile(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
public JSONObject deleteProjectInfoFile(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
String retStr = "";
|
||||
try {
|
||||
|
||||
|
|
@ -300,13 +303,15 @@ public class AppMainController extends BaseController {
|
|||
}catch(Exception e) {
|
||||
retStr = "fail";
|
||||
}
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
}
|
||||
|
||||
//프로젝트 삭제
|
||||
@RequestMapping(value = "/app/proj/deleteProj.do")
|
||||
@ResponseBody
|
||||
public String deleteProj(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
public JSONObject deleteProj(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
String retStr = "";
|
||||
try {
|
||||
|
||||
|
|
@ -328,15 +333,18 @@ public class AppMainController extends BaseController {
|
|||
}catch(Exception e) {
|
||||
retStr = "fail";
|
||||
}
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
}
|
||||
|
||||
//지역 검증
|
||||
@RequestMapping(value="/app/proj/areaValidation.do")
|
||||
@ResponseBody
|
||||
public String areaValidation(@RequestParam HashMap<String,Object> dataParam, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
public JSONObject areaValidation(@RequestParam HashMap<String,Object> dataParam, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
ShapefileReader r = null;
|
||||
String retStr = "";
|
||||
String message = "";
|
||||
|
||||
try {
|
||||
//shapefileLoader
|
||||
|
|
@ -356,6 +364,7 @@ public class AppMainController extends BaseController {
|
|||
|
||||
if (!decompressZip.unZip(filePath, zipFile, filePath, type, projectCode)) {
|
||||
System.out.println("압축 해제 실패");
|
||||
message += "압축 해제 실패" + "\n";
|
||||
}
|
||||
ShpFiles shpFile = new ShpFiles(shpFilePath+projectCode+".shp");
|
||||
|
||||
|
|
@ -380,8 +389,10 @@ public class AppMainController extends BaseController {
|
|||
} catch (Exception e) { System.out.println("ERROR:"+e);
|
||||
retStr = "fail";
|
||||
}
|
||||
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
json.put("message", retStr);
|
||||
return json;
|
||||
};
|
||||
|
||||
//사업 생성 (직접입력)
|
||||
|
|
@ -410,7 +421,7 @@ public class AppMainController extends BaseController {
|
|||
//사업 생성 저장
|
||||
@RequestMapping(value = "/app/saup/insertSaupInfo.do")
|
||||
@ResponseBody
|
||||
public String insertSaupInfo(@RequestParam HashMap<String,Object> params, HttpServletRequest request, HttpServletResponse response, ModelMap model) throws Exception{
|
||||
public JSONObject insertSaupInfo(@RequestParam HashMap<String,Object> params, HttpServletRequest request, HttpServletResponse response, ModelMap model) throws Exception{
|
||||
String retStr = "";
|
||||
try {
|
||||
|
||||
|
|
@ -502,7 +513,10 @@ public class AppMainController extends BaseController {
|
|||
}catch(Exception e) {
|
||||
retStr = "fail";
|
||||
}
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
}
|
||||
|
||||
//사업목록 검색
|
||||
|
|
@ -575,7 +589,7 @@ public class AppMainController extends BaseController {
|
|||
//사업 지역파일 삭제 (직접입력 저장)
|
||||
@RequestMapping(value = "/app/saup/deleteSaupInfoFile.do")
|
||||
@ResponseBody
|
||||
public String deleteSaupInfoFile(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
public JSONObject deleteSaupInfoFile(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
String retStr = "";
|
||||
try {
|
||||
|
||||
|
|
@ -602,25 +616,29 @@ public class AppMainController extends BaseController {
|
|||
}catch(Exception e) {
|
||||
retStr = "fail";
|
||||
}
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
}
|
||||
|
||||
//사업지역 검증
|
||||
@RequestMapping(value="/app/saup/areaValidation.do")
|
||||
@ResponseBody
|
||||
public String saupAreaValidation(@RequestParam HashMap<String,Object> dataParam, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
public JSONObject saupAreaValidation(@RequestParam HashMap<String,Object> dataParam, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
String retStr = "";
|
||||
|
||||
try {
|
||||
|
||||
AppMainService.updateSaupArea(dataParam);
|
||||
|
||||
|
||||
retStr = "success";
|
||||
} catch (Exception e) { System.out.println("ERROR:"+e);
|
||||
retStr = "fail";
|
||||
}
|
||||
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
};
|
||||
|
||||
//사업 시추공정보(직접입력)
|
||||
|
|
@ -695,7 +713,7 @@ public class AppMainController extends BaseController {
|
|||
//시추공정보 저장
|
||||
@RequestMapping(value = "/app/saup/insertHoleInfo.do")
|
||||
@ResponseBody
|
||||
public String insertHoleInfo(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
public JSONObject insertHoleInfo(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
String retStr = "";
|
||||
try {
|
||||
ComCodeVO codeVO = new ComCodeVO();
|
||||
|
|
@ -812,7 +830,10 @@ public class AppMainController extends BaseController {
|
|||
}catch(Exception e) {
|
||||
retStr = "fail";
|
||||
}
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
}
|
||||
|
||||
//사업 지형지질정보(직접입력)
|
||||
|
|
@ -1018,7 +1039,7 @@ public class AppMainController extends BaseController {
|
|||
|
||||
//지층정보 저장
|
||||
@RequestMapping(value="/app/saup/insertLayerInfo.do", method=RequestMethod.POST)
|
||||
public @ResponseBody String insertLayerInfo(@RequestParam String CustomerInformationList, @RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
public @ResponseBody JSONObject insertLayerInfo(@RequestParam String CustomerInformationList, @RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
|
||||
String retStr = "";
|
||||
|
||||
|
|
@ -1072,7 +1093,9 @@ public class AppMainController extends BaseController {
|
|||
retStr = "fail";
|
||||
}
|
||||
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -1111,7 +1134,7 @@ public class AppMainController extends BaseController {
|
|||
//기본물성시험정보 저장
|
||||
@RequestMapping(value="/app/saup/insertSampleInfo.do", method=RequestMethod.POST)
|
||||
@ResponseBody
|
||||
public String insertSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
public JSONObject insertSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
|
||||
String retStr = "";
|
||||
|
||||
|
|
@ -1199,13 +1222,15 @@ public class AppMainController extends BaseController {
|
|||
retStr = "fail";
|
||||
}
|
||||
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
};
|
||||
|
||||
// 부정보 입력 전 주정보 저장여부
|
||||
@RequestMapping(value="/app/com/confirmInfo.do", method=RequestMethod.POST)
|
||||
@ResponseBody
|
||||
public String confirmInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
public JSONObject confirmInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
|
||||
String retStr = "";
|
||||
boolean testInfoYn = false;
|
||||
|
|
@ -1232,20 +1257,25 @@ public class AppMainController extends BaseController {
|
|||
retStr = "fail";
|
||||
}
|
||||
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
};
|
||||
|
||||
//엑셀업로드 내용 체크
|
||||
@RequestMapping(value="/app/saup/excelValidation.do")
|
||||
@ResponseBody
|
||||
public String excelValidation(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
public JSONObject excelValidation(@RequestParam HashMap<String,Object> params, HttpServletRequest request, ModelMap model) throws Exception{
|
||||
String retStr = "";
|
||||
try {
|
||||
retStr = "success";
|
||||
}catch(Exception e) {
|
||||
retStr = "fail";
|
||||
}
|
||||
return "{\"result\":\""+retStr+"\"}";
|
||||
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("result", retStr);
|
||||
return json;
|
||||
}
|
||||
|
||||
//사업 시험항목정보(직접입력)
|
||||
|
|
|
|||
|
|
@ -193,6 +193,16 @@ public class BaseController {
|
|||
|
||||
String uri = request.getRequestURI();
|
||||
String businessProcessCode = "";
|
||||
String businessCode = null;
|
||||
if( params.get("businessCode") != null ) {
|
||||
businessCode = String.valueOf(params.get("businessCode"));
|
||||
|
||||
if( businessCode.trim().isEmpty() ) {
|
||||
businessCode = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
model.put("selectedUrl", uri);
|
||||
if(!"new".equals(params.get("mode"))) {
|
||||
if(uri.contains("proj")) {
|
||||
|
|
@ -200,16 +210,19 @@ public class BaseController {
|
|||
model.put("projectCode", params.get("projectCode"));
|
||||
}else {
|
||||
model.put("submenuGbn", "saup");
|
||||
|
||||
EgovMap saupDetailInfo = AppMainService.selectAppSaupDetail(params);
|
||||
EgovMap saupDetailInfo = null;
|
||||
if( businessCode != null ) {
|
||||
saupDetailInfo = AppMainService.selectAppSaupDetail(params);
|
||||
businessProcessCode = (String) saupDetailInfo.get("businessProcessCode");
|
||||
businessProcessCode = StringUtil.nullToBlank(businessProcessCode);
|
||||
|
||||
|
||||
//시공정보
|
||||
if(!businessProcessCode.isEmpty() && "2".equals((businessProcessCode).substring(0, 1)) ) {
|
||||
EgovMap constItemsInfo = AppMainService.selectConstItemsInfo(params);
|
||||
model.put("constItemsInfo", constItemsInfo);
|
||||
}
|
||||
}
|
||||
|
||||
//TODO : 폴더 class에 필수값 데이터가있으면 check 붙이기
|
||||
//시추공정보
|
||||
|
|
|
|||
|
|
@ -1,81 +1,82 @@
|
|||
package sgis.com.web;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipInputStream;
|
||||
|
||||
// Apache Commons Compress 라이브러리 임포트
|
||||
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
|
||||
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
|
||||
|
||||
/**
|
||||
* @FileName : DecompressZip.java
|
||||
* @Date : 2022. 5. 18.
|
||||
* @Creator : ICTWAY KIM YOON SU
|
||||
* @Discription :
|
||||
* @Discription : Apache Commons Compress를 이용한 압축 해제 (호환성 강화)
|
||||
*/
|
||||
public class DecompressZip {
|
||||
|
||||
/**
|
||||
* 압축 해제 진행 == GOGO ==!
|
||||
* @param zipPath
|
||||
* @param zipFileName
|
||||
* @param zipUnzipPath
|
||||
* 압축 해제 진행
|
||||
* @return 파일 압축 해제 성공 여부
|
||||
* @throws Exception
|
||||
*/
|
||||
public boolean unZip(String zipPath, String zipFileName, String zipUnzipPath, String type , String projectCode) throws Exception {
|
||||
|
||||
System.out.println(" unZip() - zipPath : "+zipPath); //압축 파일 위치
|
||||
System.out.println(" unZip() - zipFileName : "+zipFileName); //압축파일 이름
|
||||
System.out.println(" unZip() - zipUnzipPath : "+zipUnzipPath); //압축이 해제될 위치
|
||||
System.out.println(" unZip() - zipPath : "+zipPath);
|
||||
System.out.println(" unZip() - zipFileName : "+zipFileName);
|
||||
System.out.println(" unZip() - zipUnzipPath : "+zipUnzipPath);
|
||||
|
||||
//파일 압축 해제 성공 여부
|
||||
boolean isChk = false;
|
||||
|
||||
//압축 해재할 파일의 type(.zip or .tar) 제거
|
||||
//압축 해제할 폴더 경로 설정
|
||||
zipUnzipPath = zipUnzipPath + zipFileName.replace(type, "");
|
||||
|
||||
//zip 파일
|
||||
File zipFile = new File(zipPath + zipFileName);
|
||||
FileInputStream fis = null;
|
||||
ZipInputStream zis = null;
|
||||
ZipEntry zipentry = null;
|
||||
ZipArchiveInputStream zis = null;
|
||||
|
||||
try {
|
||||
|
||||
//zipFileName을 통해서 폴더 생성
|
||||
// 폴더 생성
|
||||
if (makeFolder(zipUnzipPath)) {
|
||||
System.out.println(" --- 폴더를 생성 프로세스 완료 ");
|
||||
System.out.println(" --- 폴더 생성 프로세스 완료 ");
|
||||
}
|
||||
|
||||
fis = new FileInputStream(zipFile); //파일 스트림
|
||||
zis = new ZipInputStream(fis, Charset.forName("EUC-KR")); //Zip 파일 스트림
|
||||
fis = new FileInputStream(zipFile);
|
||||
|
||||
//압축되어 있는 ZIP 파일의 목록 조회
|
||||
while ((zipentry = zis.getNextEntry()) != null) {
|
||||
// ZipArchiveInputStream 생성
|
||||
// 파라미터: (InputStream, 인코딩, useUnicodeExtraFields, allowStoredEntriesWithDataDescriptor)
|
||||
// allowStoredEntriesWithDataDescriptor = true : 첫 번째 발생했던 에러(invalid entry size)를 해결하는 핵심 옵션입니다.
|
||||
zis = new ZipArchiveInputStream(new BufferedInputStream(fis), "EUC-KR", true, true);
|
||||
|
||||
ZipArchiveEntry zipentry = null;
|
||||
|
||||
// 스트림 방식으로 압축 파일 순차 조회 (CEN 헤더 오류 회피)
|
||||
while ((zipentry = zis.getNextZipEntry()) != null) {
|
||||
String fileName = zipentry.getName();
|
||||
String ext = fileName.substring(fileName.lastIndexOf(".") + 1);
|
||||
|
||||
// 파일명 및 확장자 처리
|
||||
String ext = "";
|
||||
if(fileName.lastIndexOf(".") != -1) {
|
||||
ext = fileName.substring(fileName.lastIndexOf(".") + 1);
|
||||
fileName = projectCode + "." + ext;
|
||||
} else {
|
||||
fileName = projectCode;
|
||||
}
|
||||
|
||||
System.out.println("filename(zipentry.getName()) => " + fileName);
|
||||
|
||||
File file = new File(zipUnzipPath, fileName);
|
||||
|
||||
//entry가 디렉토리인지 파일인지 검색
|
||||
if (zipentry.isDirectory()) {
|
||||
|
||||
//entry가 디렉토리일 경우 폴더 생성
|
||||
System.out.println(" --- zipentry가 디렉토리입니다.");
|
||||
file.mkdirs();
|
||||
|
||||
} else {
|
||||
|
||||
//entry가 파일일 경우 파일 생성
|
||||
System.out.println(" --- zipentry가 파일입니다.");
|
||||
|
||||
try {
|
||||
createFile(file, zis);
|
||||
|
||||
} catch (Throwable e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
@ -85,103 +86,61 @@ public class DecompressZip {
|
|||
isChk = true;
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
isChk = false;
|
||||
|
||||
} finally {
|
||||
if (zis != null) {
|
||||
try {
|
||||
zis.close();
|
||||
} catch (IOException e) {
|
||||
throw e;
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
if (fis != null) {
|
||||
try {
|
||||
fis.close();
|
||||
} catch (IOException e) {
|
||||
throw e;
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return isChk;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 폴더 디렉토리 체크 및 생성
|
||||
* @param folder
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
private boolean makeFolder(String folder) throws Exception {
|
||||
System.out.println(" makeFolder() - folder : "+folder);
|
||||
|
||||
boolean result = false;
|
||||
|
||||
if (folder.length() < 0) {
|
||||
result = false;
|
||||
}
|
||||
|
||||
if (folder == null || folder.length() == 0) return false;
|
||||
File file = new File(folder);
|
||||
|
||||
//해당 디렉토리가 없을경우 디렉토리 생성
|
||||
try {
|
||||
|
||||
//디렉토리 폴더 경로 체크
|
||||
if (!file.exists()) {
|
||||
file.mkdirs(); //폴더 생성
|
||||
System.out.println(" makeFolder() --------- 폴더 생성 완료 ---------");
|
||||
file.mkdirs();
|
||||
} else {
|
||||
System.out.println(" makeFolder() --------- 이미 폴더가 존재함 ---------");
|
||||
file.delete(); //폴더 삭제
|
||||
System.out.println(" makeFolder() --------- 기존 폴더를 삭제함 ---------");
|
||||
file.mkdirs(); //폴더 생성
|
||||
System.out.println(" makeFolder() --------- 폴더 생성 완료 ---------");
|
||||
// 필요 시 기존 폴더 삭제 로직 추가 (재귀 삭제 필요)
|
||||
// 여기서는 기존 로직 유지
|
||||
file.delete();
|
||||
file.mkdirs();
|
||||
}
|
||||
result = true;
|
||||
|
||||
} catch (Exception e) {
|
||||
throw e;
|
||||
return true;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 파일 체크 및 생성
|
||||
* @param file
|
||||
* @param zis
|
||||
* @throws Exception
|
||||
*/
|
||||
private void createFile(File file, ZipInputStream zis) throws Exception {
|
||||
System.out.println(" createFile() - file : "+file);
|
||||
//디렉토리 확인
|
||||
// ZipArchiveInputStream을 그대로 받아서 처리
|
||||
private void createFile(File file, ZipArchiveInputStream zis) throws Exception {
|
||||
File parentDir = new File(file.getParent());
|
||||
|
||||
//디렉토리 폴더 경로 체크
|
||||
if (!parentDir.exists()) {
|
||||
parentDir.mkdirs();
|
||||
}
|
||||
|
||||
FileOutputStream fos = null; //출력 스트림
|
||||
|
||||
//파일 스트림 선언
|
||||
FileOutputStream fos = null;
|
||||
try {
|
||||
fos = new FileOutputStream(file);
|
||||
byte[] buffer = new byte[256];
|
||||
byte[] buffer = new byte[2048];
|
||||
int size = 0;
|
||||
|
||||
//zip스트림으로부터 byte뽑아내기
|
||||
// ZipArchiveInputStream은 ZipInputStream처럼 read()로 현재 엔트리의 데이터를 읽습니다.
|
||||
while ((size = zis.read(buffer)) > 0) {
|
||||
fos.write(buffer, 0, size); //스트림 작성
|
||||
fos.write(buffer, 0, size);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
throw e;
|
||||
|
||||
} finally {
|
||||
if (fos != null) {
|
||||
try {
|
||||
|
|
@ -193,4 +152,3 @@ public class DecompressZip {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -103,10 +103,10 @@
|
|||
A.PROJECT_CODE
|
||||
, A.PROJECT_NAME
|
||||
, A.PROJECT_DESC
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val ) as PROJECT_HARBOR_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val ) as PROJECT_ORDERING_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val ) as PROJECT_AFFILIATED_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val ) as PROJECT_EPSG_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val LIMIT 1 ) as PROJECT_HARBOR_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val LIMIT 1 ) as PROJECT_ORDERING_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val LIMIT 1 ) as PROJECT_AFFILIATED_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val LIMIT 1 ) as PROJECT_EPSG_NAME
|
||||
, TO_CHAR(A.PROJECT_START_DATE,'YYYY-MM-DD') AS PROJECT_START_DATE
|
||||
, TO_CHAR(A.PROJECT_END_DATE,'YYYY-MM-DD') AS PROJECT_END_DATE
|
||||
, (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.PROJECT_INPUT_ID) AS USER_NM
|
||||
|
|
@ -141,7 +141,6 @@
|
|||
</if>
|
||||
<![CDATA[
|
||||
ORDER BY A.PROJECT_CODE desc
|
||||
LIMIT 1
|
||||
]]>
|
||||
</select>
|
||||
|
||||
|
|
@ -265,10 +264,10 @@
|
|||
A.PROJECT_CODE
|
||||
, A.PROJECT_NAME
|
||||
, A.PROJECT_DESC
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val ) as PROJECT_HARBOR_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val ) as PROJECT_ORDERING_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val ) as PROJECT_AFFILIATED_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val ) as PROJECT_EPSG_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val LIMIT 1) as PROJECT_HARBOR_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val LIMIT 1) as PROJECT_ORDERING_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val LIMIT 1) as PROJECT_AFFILIATED_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val LIMIT 1) as PROJECT_EPSG_NAME
|
||||
, A.PROJECT_HARBOR_CODE
|
||||
, A.PROJECT_ORDERING_CODE
|
||||
, A.PROJECT_AFFILIATED_CODE
|
||||
|
|
@ -276,13 +275,13 @@
|
|||
, A.PROJECT_AREA_FILE
|
||||
, TO_CHAR(A.PROJECT_START_DATE,'YYYY-MM-DD') AS PROJECT_START_DATE
|
||||
, TO_CHAR(A.PROJECT_END_DATE,'YYYY-MM-DD') AS PROJECT_END_DATE
|
||||
, (select user_nm from comtb_user01 B where B.user_id = A.project_input_id) as USER_NM
|
||||
, (select user_nm from comtb_user01 B where B.user_id = A.project_input_id LIMIT 1) as USER_NM
|
||||
, A.PROJECT_AREA_FILE
|
||||
, A.PROJECT_AREA_YN
|
||||
, ST_ASTEXT(ST_TRANSFORM(ST_SetSRID(A.PROJECT_AREA_GEOM, A.PROJECT_EPSG_CODE :: INTEGER),4326)) as PROJECT_AREA_GEOM
|
||||
, (select file_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file) as file_nm
|
||||
, (select file_strg_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file) as file_strg_nm
|
||||
, (select count(*) from APPTB_SAUP01 C where A.project_code = C.project_code) as saup_cnt
|
||||
, (select file_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file LIMIT 1) as file_nm
|
||||
, (select file_strg_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file LIMIT 1) as file_strg_nm
|
||||
, (select count(*) from APPTB_SAUP01 C where A.project_code = C.project_code LIMIT 1) as saup_cnt
|
||||
FROM APPTB_PROJ01 A
|
||||
WHERE 1=1
|
||||
]]>
|
||||
|
|
@ -579,11 +578,11 @@
|
|||
SELECT
|
||||
A.PROJECT_CODE
|
||||
, B.PROJECT_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val ) as PROJECT_HARBOR_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val LIMIT 1) as PROJECT_HARBOR_NAME
|
||||
, A.BUSINESS_CODE
|
||||
, A.BUSINESS_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = code_val ) as BUSINESS_PROCESS_NAME
|
||||
, (select user_nm from comtb_user01 where user_id = A.business_input_id) as INPUT_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = code_val LIMIT 1) as BUSINESS_PROCESS_NAME
|
||||
, (select user_nm from comtb_user01 where user_id = A.business_input_id LIMIT 1) as INPUT_NAME
|
||||
, to_char(A.SYS_REG_DT::DATE, 'yyyy-mm-dd') as INPUT_DATE
|
||||
FROM APPTB_SAUP01 A LEFT OUTER JOIN APPTB_PROJ01 B ON A.PROJECT_CODE = B.PROJECT_CODE
|
||||
WHERE 1=1
|
||||
|
|
@ -619,19 +618,19 @@
|
|||
SELECT
|
||||
A.PROJECT_CODE
|
||||
, B.PROJECT_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val ) as PROJECT_HARBOR_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val LIMIT 1) as PROJECT_HARBOR_NAME
|
||||
, A.BUSINESS_NAME
|
||||
, A.BUSINESS_CODE
|
||||
, A.BUSINESS_PROCESS_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = C.code_val ) as BUSINESS_PROCESS_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = C.code_val LIMIT 1) as BUSINESS_PROCESS_NAME
|
||||
, A.BUSINESS_CLASS_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_code' AND A.BUSINESS_CLASS_CODE = C.code_val ) as BUSINESS_CLASS_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_code' AND A.BUSINESS_CLASS_CODE = C.code_val LIMIT 1) as BUSINESS_CLASS_NAME
|
||||
, A.BUSINESS_CLASS_DETAIL_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_detail_code' AND A.BUSINESS_CLASS_DETAIL_CODE = C.code_val ) as BUSINESS_CLASS_DETAIL_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_detail_code' AND A.BUSINESS_CLASS_DETAIL_CODE = C.code_val LIMIT 1) as BUSINESS_CLASS_DETAIL_NAME
|
||||
, A.BUSINESS_FACILITIES_FORM_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_facilities_form_code' AND A.BUSINESS_FACILITIES_FORM_CODE = C.code_val ) as BUSINESS_FACILITIES_FORM_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_facilities_form_code' AND A.BUSINESS_FACILITIES_FORM_CODE = C.code_val LIMIT 1) as BUSINESS_FACILITIES_FORM_NAME
|
||||
, A.PROJECT_ORDERING_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'project_ordering_code' AND A.PROJECT_ORDERING_CODE = C.code_val ) as PROJECT_ORDERING_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'project_ordering_code' AND A.PROJECT_ORDERING_CODE = C.code_val LIMIT 1) as PROJECT_ORDERING_NAME
|
||||
, TO_CHAR(A.BUSINESS_START_DATE,'YYYY-MM-DD') AS BUSINESS_START_DATE
|
||||
, TO_CHAR(A.BUSINESS_END_DATE,'YYYY-MM-DD') AS BUSINESS_END_DATE
|
||||
, A.BUSINESS_SECTION_EXTENSION
|
||||
|
|
@ -652,7 +651,7 @@
|
|||
, A.BUSINESS_REPORT_SOURCE
|
||||
, A.BUSINESS_REPORT_FILE
|
||||
, A.BUSINESS_CONSTRUCTION_FILE
|
||||
, (select user_nm from comtb_user01 where user_id = A.BUSINESS_INPUT_ID) as USER_NM
|
||||
, (select user_nm from comtb_user01 where user_id = A.BUSINESS_INPUT_ID LIMIT 1) as USER_NM
|
||||
, A.BUSINESS_ZIP_NO
|
||||
, A.BUSINESS_ADDRESS
|
||||
, A.BUSINESS_ADDRESS_DETAIL
|
||||
|
|
@ -662,12 +661,12 @@
|
|||
, A.BUSINESS_AREA_SD_CODE
|
||||
, A.BUSINESS_AREA_SGG_CODE
|
||||
, A.BUSINESS_AREA_EMD_CODE
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND A.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND A.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND A.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND A.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND A.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND A.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME
|
||||
, A.BUSINESS_AREA_FILE
|
||||
, (SELECT FILE_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE) AS FILE_NM
|
||||
, (SELECT FILE_STRG_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE) AS FILE_STRG_NM
|
||||
, (SELECT FILE_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE LIMIT 1) AS FILE_NM
|
||||
, (SELECT FILE_STRG_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE LIMIT 1) AS FILE_STRG_NM
|
||||
, A.BUSINESS_AREA_YN
|
||||
FROM APPTB_SAUP01 A LEFT OUTER JOIN APPTB_PROJ01 B ON A.PROJECT_CODE = B.PROJECT_CODE
|
||||
WHERE 1=1
|
||||
|
|
@ -689,15 +688,15 @@
|
|||
B.PROJECT_CODE
|
||||
, B.BUSINESS_NAME
|
||||
, A.BUSINESS_CODE
|
||||
, (SELECT C.CODE_TXT FROM COMTB_CODE02 C WHERE C.CD_GRP = 'business_process_code' AND B.BUSINESS_PROCESS_CODE = C.CODE_VAL ) AS BUSINESS_PROCESS_NAME
|
||||
, (SELECT C.CODE_TXT FROM COMTB_CODE02 C WHERE C.CD_GRP = 'business_process_code' AND B.BUSINESS_PROCESS_CODE = C.CODE_VAL LIMIT 1) AS BUSINESS_PROCESS_NAME
|
||||
, A.HOLE_CODE
|
||||
, A.HOLE_NAME
|
||||
, A.HOLE_COORDINATE
|
||||
, A.HOLE_X
|
||||
, A.HOLE_Y
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME
|
||||
, B.BUSINESS_ADDRESS_DETAIL
|
||||
, A.HOLE_BORING_NAME
|
||||
, A.HOLE_PROSPECTER_NAME
|
||||
|
|
@ -712,7 +711,7 @@
|
|||
, A.HOLE_BORING_MACHINE
|
||||
, A.HOLE_BORING_METHOD
|
||||
, A.HOLE_BORING_DIRECTION
|
||||
, (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.SYS_REG_ID) AS USER_NM
|
||||
, (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.SYS_REG_ID LIMIT 1) AS USER_NM
|
||||
, TO_CHAR(A.SYS_REG_DT,'YYYY-MM-DD') AS SYS_REG_DT
|
||||
, A.HOLE_REMARK
|
||||
, ST_AsText(A.HOLE_POINT) AS HOLE_POINT
|
||||
|
|
@ -744,7 +743,7 @@
|
|||
<![CDATA[
|
||||
SELECT
|
||||
B.PROJECT_CODE
|
||||
, (select project_name from apptb_proj01 c where c.project_code = b.project_code) as project_name
|
||||
, (select project_name from apptb_proj01 c where c.project_code = b.project_code LIMIT 1) as project_name
|
||||
, B.BUSINESS_NAME
|
||||
, A.BUSINESS_CODE
|
||||
, A.HOLE_CODE
|
||||
|
|
@ -757,11 +756,11 @@
|
|||
, A.HOLE_BORING_TYPE
|
||||
, A.HOLE_START_DATE
|
||||
, A.HOLE_END_DATE
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME
|
||||
, B.business_address_detail
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL) || ' ' || (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL) || ' ' || (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL) || ' ' || B.business_address_detail as business_address
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) || ' ' || (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) || ' ' || (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) || ' ' || B.business_address_detail as business_address
|
||||
, A.HOLE_ELEVATION
|
||||
, COALESCE(A.HOLE_WATER_LEVEL, '') AS HOLE_WATER_LEVEL
|
||||
, A.HOLE_DRILLING_DEPTH
|
||||
|
|
@ -1002,7 +1001,7 @@ INSERT INTO APPTB_HOLE01
|
|||
<!-- 지형지질정보 -->
|
||||
<select id="selectTopoInfo" parameterType="map" resultType="egovMap">
|
||||
<![CDATA[
|
||||
select (select business_name from apptb_saup01 B where A.business_code = B.business_code)
|
||||
select (select business_name from apptb_saup01 B where A.business_code = B.business_code LIMIT 1)
|
||||
, A.business_code
|
||||
, A.tgeo_topography
|
||||
, A.tgeo_geology
|
||||
|
|
|
|||
|
|
@ -3,72 +3,72 @@
|
|||
<mapper namespace="sgis.surveysystem.mapper.AnswerMapper">
|
||||
|
||||
<resultMap id="answerResultMap" type="sgis.surveysystem.domain.Answer">
|
||||
<id property="answerId" column="answer_id"/>
|
||||
<result property="responseId" column="response_id"/>
|
||||
<result property="questionId" column="question_id"/>
|
||||
<result property="answerText" column="answer_text"/>
|
||||
<result property="selectedOptionId" column="selected_option_id"/>
|
||||
<id property="answerId" column="ANSWER_ID" jdbcType="VARCHAR"/>
|
||||
<result property="responseId" column="RESPONSE_ID" jdbcType="VARCHAR"/>
|
||||
<result property="questionId" column="QUESTION_ID" jdbcType="VARCHAR"/>
|
||||
<result property="answerText" column="ANSWER_TEXT" jdbcType="CLOB"/>
|
||||
<result property="selectedOptionId" column="SELECTED_OPTION_ID" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<insert id="insertAnswer" parameterType="sgis.surveysystem.domain.Answer">
|
||||
INSERT INTO tb_answers (
|
||||
answer_id,
|
||||
response_id,
|
||||
question_id,
|
||||
answer_text,
|
||||
selected_option_id
|
||||
INSERT INTO TBL_ANSWERS (
|
||||
ANSWER_ID,
|
||||
RESPONSE_ID,
|
||||
QUESTION_ID,
|
||||
ANSWER_TEXT,
|
||||
SELECTED_OPTION_ID
|
||||
) VALUES (
|
||||
#{answerId, jdbcType=OTHER},
|
||||
#{responseId, jdbcType=OTHER},
|
||||
#{questionId, jdbcType=OTHER},
|
||||
#{answerText},
|
||||
#{selectedOptionId, jdbcType=OTHER}
|
||||
#{answerId, jdbcType=VARCHAR},
|
||||
#{responseId, jdbcType=VARCHAR},
|
||||
#{questionId, jdbcType=VARCHAR},
|
||||
#{answerText, jdbcType=CLOB},
|
||||
#{selectedOptionId, jdbcType=VARCHAR}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<select id="findAnswerById" resultMap="answerResultMap">
|
||||
<select id="findAnswerById" resultMap="answerResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
answer_id,
|
||||
response_id,
|
||||
question_id,
|
||||
answer_text,
|
||||
selected_option_id
|
||||
FROM tb_answers
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
ANSWER_ID,
|
||||
RESPONSE_ID,
|
||||
QUESTION_ID,
|
||||
ANSWER_TEXT,
|
||||
SELECTED_OPTION_ID
|
||||
FROM TBL_ANSWERS
|
||||
WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<select id="findAnswersByResponseId" resultMap="answerResultMap">
|
||||
<select id="findAnswersByResponseId" resultMap="answerResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
answer_id,
|
||||
response_id,
|
||||
question_id,
|
||||
answer_text,
|
||||
selected_option_id
|
||||
FROM tb_answers
|
||||
WHERE response_id = #{responseId, jdbcType=OTHER}
|
||||
ANSWER_ID,
|
||||
RESPONSE_ID,
|
||||
QUESTION_ID,
|
||||
ANSWER_TEXT,
|
||||
SELECTED_OPTION_ID
|
||||
FROM TBL_ANSWERS
|
||||
WHERE RESPONSE_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<select id="findAnswersByQuestionId" resultMap="answerResultMap">
|
||||
<select id="findAnswersByQuestionId" resultMap="answerResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
answer_id,
|
||||
response_id,
|
||||
question_id,
|
||||
answer_text,
|
||||
selected_option_id
|
||||
FROM tb_answers
|
||||
WHERE question_id = #{questionId, jdbcType=OTHER}
|
||||
ANSWER_ID,
|
||||
RESPONSE_ID,
|
||||
QUESTION_ID,
|
||||
ANSWER_TEXT,
|
||||
SELECTED_OPTION_ID
|
||||
FROM TBL_ANSWERS
|
||||
WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<update id="updateAnswer" parameterType="sgis.surveysystem.domain.Answer">
|
||||
UPDATE tb_answers
|
||||
UPDATE TBL_ANSWERS
|
||||
SET
|
||||
answer_text = #{answerText},
|
||||
selected_option_id = #{selectedOptionId, jdbcType=OTHER}
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
ANSWER_TEXT = #{answerText, jdbcType=CLOB},
|
||||
SELECTED_OPTION_ID = #{selectedOptionId, jdbcType=VARCHAR}
|
||||
WHERE ANSWER_ID = #{answerId, jdbcType=VARCHAR}
|
||||
</update>
|
||||
|
||||
<delete id="deleteAnswer">
|
||||
DELETE FROM tb_answers
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
<delete id="deleteAnswer" parameterType="java.util.UUID">
|
||||
DELETE FROM TBL_ANSWERS
|
||||
WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
</mapper>
|
||||
|
|
@ -3,48 +3,48 @@
|
|||
<mapper namespace="sgis.surveysystem.mapper.AnswerSelectedOptionMapper">
|
||||
|
||||
<resultMap id="answerSelectedOptionResultMap" type="sgis.surveysystem.domain.AnswerSelectedOption">
|
||||
<id property="answerId" column="answer_id"/>
|
||||
<id property="optionId" column="option_id"/>
|
||||
<id property="answerId" column="ANSWER_ID" jdbcType="VARCHAR"/>
|
||||
<id property="optionId" column="OPTION_ID" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<insert id="insertAnswerSelectedOption" parameterType="sgis.surveysystem.domain.AnswerSelectedOption">
|
||||
INSERT INTO tb_answer_selected_options (
|
||||
answer_id,
|
||||
option_id
|
||||
INSERT INTO TBL_ANSWER_SELECTED_OPTIONS (
|
||||
ANSWER_ID,
|
||||
OPTION_ID
|
||||
) VALUES (
|
||||
#{answerId, jdbcType=OTHER},
|
||||
#{optionId, jdbcType=OTHER}
|
||||
#{answerId, jdbcType=VARCHAR},
|
||||
#{optionId, jdbcType=VARCHAR}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<insert id="insertMultipleAnswerSelectedOptions" parameterType="java.util.List">
|
||||
INSERT INTO tb_answer_selected_options (
|
||||
answer_id,
|
||||
option_id
|
||||
) VALUES
|
||||
<foreach collection="list" item="item" separator=",">
|
||||
(
|
||||
#{item.answerId, jdbcType=OTHER},
|
||||
#{item.optionId, jdbcType=OTHER}
|
||||
INSERT INTO TBL_ANSWER_SELECTED_OPTIONS (
|
||||
ANSWER_ID,
|
||||
OPTION_ID
|
||||
)
|
||||
<foreach collection="list" item="item" separator=" UNION ALL ">
|
||||
SELECT
|
||||
#{item.answerId, jdbcType=VARCHAR},
|
||||
#{item.optionId, jdbcType=VARCHAR}
|
||||
FROM dual
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<select id="findOptionsByAnswerId" resultMap="answerSelectedOptionResultMap">
|
||||
<select id="findOptionsByAnswerId" resultMap="answerSelectedOptionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
answer_id,
|
||||
option_id
|
||||
FROM tb_answer_selected_options
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
ANSWER_ID,
|
||||
OPTION_ID
|
||||
FROM TBL_ANSWER_SELECTED_OPTIONS
|
||||
WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<delete id="deleteByAnswerId">
|
||||
DELETE FROM tb_answer_selected_options
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
<delete id="deleteByAnswerId" parameterType="java.util.UUID">
|
||||
DELETE FROM TBL_ANSWER_SELECTED_OPTIONS
|
||||
WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteAnswerSelectedOption">
|
||||
DELETE FROM tb_answer_selected_options
|
||||
WHERE answer_id = #{param1, jdbcType=OTHER} AND option_id = #{param2, jdbcType=OTHER}
|
||||
<delete id="deleteAnswerSelectedOption" parameterType="map">
|
||||
DELETE FROM TBL_ANSWER_SELECTED_OPTIONS
|
||||
WHERE ANSWER_ID = #{param1, jdbcType=VARCHAR} AND OPTION_ID = #{param2, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
</mapper>
|
||||
|
|
@ -3,70 +3,70 @@
|
|||
<mapper namespace="sgis.surveysystem.mapper.QuestionMapper">
|
||||
|
||||
<resultMap id="questionResultMap" type="sgis.surveysystem.domain.Question">
|
||||
<id property="questionId" column="question_id"/>
|
||||
<result property="surveyId" column="survey_id"/>
|
||||
<result property="questionText" column="question_text"/>
|
||||
<result property="questionType" column="question_type"/>
|
||||
<result property="questionOrder" column="question_order"/>
|
||||
<result property="isRequired" column="is_required"/>
|
||||
<id property="questionId" column="QUESTION_ID" jdbcType="VARCHAR"/>
|
||||
<result property="surveyId" column="SURVEY_ID" jdbcType="VARCHAR"/>
|
||||
<result property="questionText" column="QUESTION_TEXT" jdbcType="CLOB"/>
|
||||
<result property="questionType" column="QUESTION_TYPE" jdbcType="VARCHAR"/>
|
||||
<result property="questionOrder" column="QUESTION_ORDER" jdbcType="INTEGER"/>
|
||||
<result property="isRequired" column="IS_REQUIRED" jdbcType="INTEGER"/>
|
||||
</resultMap>
|
||||
|
||||
<!-- 문항 삽입 -->
|
||||
<insert id="insertQuestion" parameterType="sgis.surveysystem.domain.Question">
|
||||
INSERT INTO tb_questions (
|
||||
question_id,
|
||||
survey_id,
|
||||
question_text,
|
||||
question_type,
|
||||
question_order,
|
||||
is_required
|
||||
INSERT INTO TBL_QUESTIONS (
|
||||
QUESTION_ID,
|
||||
SURVEY_ID,
|
||||
QUESTION_TEXT,
|
||||
QUESTION_TYPE,
|
||||
QUESTION_ORDER,
|
||||
IS_REQUIRED
|
||||
) VALUES (
|
||||
CAST(#{questionId, jdbcType=OTHER} AS uuid), <!-- 이 부분을 수정했습니다. -->
|
||||
CAST(#{surveyId, jdbcType=OTHER} AS uuid), <!-- 이 부분을 수정했습니다. -->
|
||||
#{questionText},
|
||||
#{questionType},
|
||||
#{questionOrder},
|
||||
#{isRequired}
|
||||
#{questionId, jdbcType=VARCHAR},
|
||||
#{surveyId, jdbcType=VARCHAR},
|
||||
#{questionText, jdbcType=CLOB},
|
||||
#{questionType, jdbcType=VARCHAR},
|
||||
#{questionOrder, jdbcType=INTEGER},
|
||||
#{isRequired, jdbcType=INTEGER}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<select id="findQuestionsBySurveyId" resultMap="questionResultMap">
|
||||
<select id="findQuestionsBySurveyId" resultMap="questionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
question_id,
|
||||
survey_id,
|
||||
question_text,
|
||||
question_type,
|
||||
question_order,
|
||||
is_required
|
||||
FROM tb_questions
|
||||
WHERE survey_id = CAST(#{surveyId, jdbcType=OTHER} AS uuid)
|
||||
ORDER BY question_order ASC
|
||||
QUESTION_ID,
|
||||
SURVEY_ID,
|
||||
QUESTION_TEXT,
|
||||
QUESTION_TYPE,
|
||||
QUESTION_ORDER,
|
||||
IS_REQUIRED
|
||||
FROM TBL_QUESTIONS
|
||||
WHERE SURVEY_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
ORDER BY QUESTION_ORDER ASC
|
||||
</select>
|
||||
|
||||
<select id="findQuestionById" resultMap="questionResultMap">
|
||||
<select id="findQuestionById" resultMap="questionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
question_id,
|
||||
survey_id,
|
||||
question_text,
|
||||
question_type,
|
||||
question_order,
|
||||
is_required
|
||||
FROM tb_questions
|
||||
WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid)
|
||||
QUESTION_ID,
|
||||
SURVEY_ID,
|
||||
QUESTION_TEXT,
|
||||
QUESTION_TYPE,
|
||||
QUESTION_ORDER,
|
||||
IS_REQUIRED
|
||||
FROM TBL_QUESTIONS
|
||||
WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<update id="updateQuestion" parameterType="sgis.surveysystem.domain.Question">
|
||||
UPDATE tb_questions
|
||||
UPDATE TBL_QUESTIONS
|
||||
SET
|
||||
question_text = #{questionText},
|
||||
question_type = #{questionType},
|
||||
question_order = #{questionOrder},
|
||||
is_required = #{isRequired}
|
||||
WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid)
|
||||
QUESTION_TEXT = #{questionText, jdbcType=CLOB},
|
||||
QUESTION_TYPE = #{questionType, jdbcType=VARCHAR},
|
||||
QUESTION_ORDER = #{questionOrder, jdbcType=INTEGER},
|
||||
IS_REQUIRED = #{isRequired, jdbcType=INTEGER}
|
||||
WHERE QUESTION_ID = #{questionId, jdbcType=VARCHAR}
|
||||
</update>
|
||||
|
||||
<delete id="deleteQuestion">
|
||||
DELETE FROM tb_questions
|
||||
WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid)
|
||||
<delete id="deleteQuestion" parameterType="java.util.UUID">
|
||||
DELETE FROM TBL_QUESTIONS
|
||||
WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
</mapper>
|
||||
|
|
@ -3,58 +3,58 @@
|
|||
<mapper namespace="sgis.surveysystem.mapper.QuestionOptionMapper">
|
||||
|
||||
<resultMap id="questionOptionResultMap" type="sgis.surveysystem.domain.QuestionOption">
|
||||
<id property="optionId" column="option_id"/>
|
||||
<result property="questionId" column="question_id"/>
|
||||
<result property="optionText" column="option_text"/>
|
||||
<result property="optionOrder" column="option_order"/>
|
||||
<id property="optionId" column="OPTION_ID" jdbcType="VARCHAR"/>
|
||||
<result property="questionId" column="QUESTION_ID" jdbcType="VARCHAR"/>
|
||||
<result property="optionText" column="OPTION_TEXT" jdbcType="VARCHAR"/>
|
||||
<result property="optionOrder" column="OPTION_ORDER" jdbcType="INTEGER"/>
|
||||
</resultMap>
|
||||
|
||||
<!-- 선택지 삽입 -->
|
||||
<insert id="insertQuestionOption" parameterType="sgis.surveysystem.domain.QuestionOption">
|
||||
INSERT INTO tb_question_options (
|
||||
option_id,
|
||||
question_id,
|
||||
option_text,
|
||||
option_order
|
||||
INSERT INTO TBL_QUESTION_OPTIONS (
|
||||
OPTION_ID,
|
||||
QUESTION_ID,
|
||||
OPTION_TEXT,
|
||||
OPTION_ORDER
|
||||
) VALUES (
|
||||
CAST(#{optionId, jdbcType=OTHER} AS uuid), <!-- 이 부분을 수정했습니다. -->
|
||||
CAST(#{questionId, jdbcType=OTHER} AS uuid), <!-- 이 부분을 수정했습니다. -->
|
||||
#{optionText},
|
||||
#{optionOrder}
|
||||
#{optionId, jdbcType=VARCHAR},
|
||||
#{questionId, jdbcType=VARCHAR},
|
||||
#{optionText, jdbcType=VARCHAR},
|
||||
#{optionOrder, jdbcType=INTEGER}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<select id="findOptionsByQuestionId" resultMap="questionOptionResultMap">
|
||||
<select id="findOptionsByQuestionId" resultMap="questionOptionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
option_id,
|
||||
question_id,
|
||||
option_text,
|
||||
option_order
|
||||
FROM tb_question_options
|
||||
WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid)
|
||||
ORDER BY option_order ASC
|
||||
OPTION_ID,
|
||||
QUESTION_ID,
|
||||
OPTION_TEXT,
|
||||
OPTION_ORDER
|
||||
FROM TBL_QUESTION_OPTIONS
|
||||
WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
ORDER BY OPTION_ORDER ASC
|
||||
</select>
|
||||
|
||||
<select id="findQuestionOptionById" resultMap="questionOptionResultMap">
|
||||
<select id="findQuestionOptionById" resultMap="questionOptionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
option_id,
|
||||
question_id,
|
||||
option_text,
|
||||
option_order
|
||||
FROM tb_question_options
|
||||
WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid)
|
||||
OPTION_ID,
|
||||
QUESTION_ID,
|
||||
OPTION_TEXT,
|
||||
OPTION_ORDER
|
||||
FROM TBL_QUESTION_OPTIONS
|
||||
WHERE OPTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<update id="updateQuestionOption" parameterType="sgis.surveysystem.domain.QuestionOption">
|
||||
UPDATE tb_question_options
|
||||
UPDATE TBL_QUESTION_OPTIONS
|
||||
SET
|
||||
option_text = #{optionText},
|
||||
option_order = #{optionOrder}
|
||||
WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid)
|
||||
OPTION_TEXT = #{optionText, jdbcType=VARCHAR},
|
||||
OPTION_ORDER = #{optionOrder, jdbcType=INTEGER}
|
||||
WHERE OPTION_ID = #{optionId, jdbcType=VARCHAR}
|
||||
</update>
|
||||
|
||||
<delete id="deleteQuestionOption">
|
||||
DELETE FROM tb_question_options
|
||||
WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid)
|
||||
<delete id="deleteQuestionOption" parameterType="java.util.UUID">
|
||||
DELETE FROM TBL_QUESTION_OPTIONS
|
||||
WHERE OPTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -216,7 +216,6 @@ function selectComboList(class_name, data, selected_data){
|
|||
}
|
||||
|
||||
function go_save(){
|
||||
debugger;
|
||||
<c:if test="${empty fileInfo}">
|
||||
var upload = $("#fileUpload1").data("kendoUpload");
|
||||
var upCnt = upload.getFiles().length
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ function drawPolygon(){
|
|||
function goSave(){
|
||||
|
||||
let businessCode = '<c:out value="${params.businessCode}"/>';
|
||||
|
||||
debugger;
|
||||
$.ajax({
|
||||
url: "<c:url value='/app/saup/areaValidation.do'/>",
|
||||
type : "post",
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -103,10 +103,10 @@
|
|||
A.PROJECT_CODE
|
||||
, A.PROJECT_NAME
|
||||
, A.PROJECT_DESC
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val ) as PROJECT_HARBOR_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val ) as PROJECT_ORDERING_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val ) as PROJECT_AFFILIATED_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val ) as PROJECT_EPSG_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val LIMIT 1 ) as PROJECT_HARBOR_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val LIMIT 1 ) as PROJECT_ORDERING_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val LIMIT 1 ) as PROJECT_AFFILIATED_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val LIMIT 1 ) as PROJECT_EPSG_NAME
|
||||
, TO_CHAR(A.PROJECT_START_DATE,'YYYY-MM-DD') AS PROJECT_START_DATE
|
||||
, TO_CHAR(A.PROJECT_END_DATE,'YYYY-MM-DD') AS PROJECT_END_DATE
|
||||
, (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.PROJECT_INPUT_ID) AS USER_NM
|
||||
|
|
@ -141,7 +141,6 @@
|
|||
</if>
|
||||
<![CDATA[
|
||||
ORDER BY A.PROJECT_CODE desc
|
||||
LIMIT 1
|
||||
]]>
|
||||
</select>
|
||||
|
||||
|
|
@ -265,10 +264,10 @@
|
|||
A.PROJECT_CODE
|
||||
, A.PROJECT_NAME
|
||||
, A.PROJECT_DESC
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val ) as PROJECT_HARBOR_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val ) as PROJECT_ORDERING_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val ) as PROJECT_AFFILIATED_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val ) as PROJECT_EPSG_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val LIMIT 1) as PROJECT_HARBOR_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val LIMIT 1) as PROJECT_ORDERING_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val LIMIT 1) as PROJECT_AFFILIATED_NAME
|
||||
, (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val LIMIT 1) as PROJECT_EPSG_NAME
|
||||
, A.PROJECT_HARBOR_CODE
|
||||
, A.PROJECT_ORDERING_CODE
|
||||
, A.PROJECT_AFFILIATED_CODE
|
||||
|
|
@ -276,13 +275,13 @@
|
|||
, A.PROJECT_AREA_FILE
|
||||
, TO_CHAR(A.PROJECT_START_DATE,'YYYY-MM-DD') AS PROJECT_START_DATE
|
||||
, TO_CHAR(A.PROJECT_END_DATE,'YYYY-MM-DD') AS PROJECT_END_DATE
|
||||
, (select user_nm from comtb_user01 B where B.user_id = A.project_input_id) as USER_NM
|
||||
, (select user_nm from comtb_user01 B where B.user_id = A.project_input_id LIMIT 1) as USER_NM
|
||||
, A.PROJECT_AREA_FILE
|
||||
, A.PROJECT_AREA_YN
|
||||
, ST_ASTEXT(ST_TRANSFORM(ST_SetSRID(A.PROJECT_AREA_GEOM, A.PROJECT_EPSG_CODE :: INTEGER),4326)) as PROJECT_AREA_GEOM
|
||||
, (select file_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file) as file_nm
|
||||
, (select file_strg_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file) as file_strg_nm
|
||||
, (select count(*) from APPTB_SAUP01 C where A.project_code = C.project_code) as saup_cnt
|
||||
, (select file_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file LIMIT 1) as file_nm
|
||||
, (select file_strg_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file LIMIT 1) as file_strg_nm
|
||||
, (select count(*) from APPTB_SAUP01 C where A.project_code = C.project_code LIMIT 1) as saup_cnt
|
||||
FROM APPTB_PROJ01 A
|
||||
WHERE 1=1
|
||||
]]>
|
||||
|
|
@ -579,11 +578,11 @@
|
|||
SELECT
|
||||
A.PROJECT_CODE
|
||||
, B.PROJECT_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val ) as PROJECT_HARBOR_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val LIMIT 1) as PROJECT_HARBOR_NAME
|
||||
, A.BUSINESS_CODE
|
||||
, A.BUSINESS_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = code_val ) as BUSINESS_PROCESS_NAME
|
||||
, (select user_nm from comtb_user01 where user_id = A.business_input_id) as INPUT_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = code_val LIMIT 1) as BUSINESS_PROCESS_NAME
|
||||
, (select user_nm from comtb_user01 where user_id = A.business_input_id LIMIT 1) as INPUT_NAME
|
||||
, to_char(A.SYS_REG_DT::DATE, 'yyyy-mm-dd') as INPUT_DATE
|
||||
FROM APPTB_SAUP01 A LEFT OUTER JOIN APPTB_PROJ01 B ON A.PROJECT_CODE = B.PROJECT_CODE
|
||||
WHERE 1=1
|
||||
|
|
@ -619,19 +618,19 @@
|
|||
SELECT
|
||||
A.PROJECT_CODE
|
||||
, B.PROJECT_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val ) as PROJECT_HARBOR_NAME
|
||||
, (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val LIMIT 1) as PROJECT_HARBOR_NAME
|
||||
, A.BUSINESS_NAME
|
||||
, A.BUSINESS_CODE
|
||||
, A.BUSINESS_PROCESS_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = C.code_val ) as BUSINESS_PROCESS_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = C.code_val LIMIT 1) as BUSINESS_PROCESS_NAME
|
||||
, A.BUSINESS_CLASS_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_code' AND A.BUSINESS_CLASS_CODE = C.code_val ) as BUSINESS_CLASS_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_code' AND A.BUSINESS_CLASS_CODE = C.code_val LIMIT 1) as BUSINESS_CLASS_NAME
|
||||
, A.BUSINESS_CLASS_DETAIL_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_detail_code' AND A.BUSINESS_CLASS_DETAIL_CODE = C.code_val ) as BUSINESS_CLASS_DETAIL_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_detail_code' AND A.BUSINESS_CLASS_DETAIL_CODE = C.code_val LIMIT 1) as BUSINESS_CLASS_DETAIL_NAME
|
||||
, A.BUSINESS_FACILITIES_FORM_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_facilities_form_code' AND A.BUSINESS_FACILITIES_FORM_CODE = C.code_val ) as BUSINESS_FACILITIES_FORM_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_facilities_form_code' AND A.BUSINESS_FACILITIES_FORM_CODE = C.code_val LIMIT 1) as BUSINESS_FACILITIES_FORM_NAME
|
||||
, A.PROJECT_ORDERING_CODE
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'project_ordering_code' AND A.PROJECT_ORDERING_CODE = C.code_val ) as PROJECT_ORDERING_NAME
|
||||
, (select C.code_txt from comtb_code02 C where C.cd_grp = 'project_ordering_code' AND A.PROJECT_ORDERING_CODE = C.code_val LIMIT 1) as PROJECT_ORDERING_NAME
|
||||
, TO_CHAR(A.BUSINESS_START_DATE,'YYYY-MM-DD') AS BUSINESS_START_DATE
|
||||
, TO_CHAR(A.BUSINESS_END_DATE,'YYYY-MM-DD') AS BUSINESS_END_DATE
|
||||
, A.BUSINESS_SECTION_EXTENSION
|
||||
|
|
@ -652,7 +651,7 @@
|
|||
, A.BUSINESS_REPORT_SOURCE
|
||||
, A.BUSINESS_REPORT_FILE
|
||||
, A.BUSINESS_CONSTRUCTION_FILE
|
||||
, (select user_nm from comtb_user01 where user_id = A.BUSINESS_INPUT_ID) as USER_NM
|
||||
, (select user_nm from comtb_user01 where user_id = A.BUSINESS_INPUT_ID LIMIT 1) as USER_NM
|
||||
, A.BUSINESS_ZIP_NO
|
||||
, A.BUSINESS_ADDRESS
|
||||
, A.BUSINESS_ADDRESS_DETAIL
|
||||
|
|
@ -662,12 +661,12 @@
|
|||
, A.BUSINESS_AREA_SD_CODE
|
||||
, A.BUSINESS_AREA_SGG_CODE
|
||||
, A.BUSINESS_AREA_EMD_CODE
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND A.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND A.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND A.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND A.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND A.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND A.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME
|
||||
, A.BUSINESS_AREA_FILE
|
||||
, (SELECT FILE_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE) AS FILE_NM
|
||||
, (SELECT FILE_STRG_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE) AS FILE_STRG_NM
|
||||
, (SELECT FILE_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE LIMIT 1) AS FILE_NM
|
||||
, (SELECT FILE_STRG_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE LIMIT 1) AS FILE_STRG_NM
|
||||
, A.BUSINESS_AREA_YN
|
||||
FROM APPTB_SAUP01 A LEFT OUTER JOIN APPTB_PROJ01 B ON A.PROJECT_CODE = B.PROJECT_CODE
|
||||
WHERE 1=1
|
||||
|
|
@ -689,15 +688,15 @@
|
|||
B.PROJECT_CODE
|
||||
, B.BUSINESS_NAME
|
||||
, A.BUSINESS_CODE
|
||||
, (SELECT C.CODE_TXT FROM COMTB_CODE02 C WHERE C.CD_GRP = 'business_process_code' AND B.BUSINESS_PROCESS_CODE = C.CODE_VAL ) AS BUSINESS_PROCESS_NAME
|
||||
, (SELECT C.CODE_TXT FROM COMTB_CODE02 C WHERE C.CD_GRP = 'business_process_code' AND B.BUSINESS_PROCESS_CODE = C.CODE_VAL LIMIT 1) AS BUSINESS_PROCESS_NAME
|
||||
, A.HOLE_CODE
|
||||
, A.HOLE_NAME
|
||||
, A.HOLE_COORDINATE
|
||||
, A.HOLE_X
|
||||
, A.HOLE_Y
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME
|
||||
, B.BUSINESS_ADDRESS_DETAIL
|
||||
, A.HOLE_BORING_NAME
|
||||
, A.HOLE_PROSPECTER_NAME
|
||||
|
|
@ -712,7 +711,7 @@
|
|||
, A.HOLE_BORING_MACHINE
|
||||
, A.HOLE_BORING_METHOD
|
||||
, A.HOLE_BORING_DIRECTION
|
||||
, (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.SYS_REG_ID) AS USER_NM
|
||||
, (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.SYS_REG_ID LIMIT 1) AS USER_NM
|
||||
, TO_CHAR(A.SYS_REG_DT,'YYYY-MM-DD') AS SYS_REG_DT
|
||||
, A.HOLE_REMARK
|
||||
, ST_AsText(A.HOLE_POINT) AS HOLE_POINT
|
||||
|
|
@ -744,7 +743,7 @@
|
|||
<![CDATA[
|
||||
SELECT
|
||||
B.PROJECT_CODE
|
||||
, (select project_name from apptb_proj01 c where c.project_code = b.project_code) as project_name
|
||||
, (select project_name from apptb_proj01 c where c.project_code = b.project_code LIMIT 1) as project_name
|
||||
, B.BUSINESS_NAME
|
||||
, A.BUSINESS_CODE
|
||||
, A.HOLE_CODE
|
||||
|
|
@ -757,11 +756,11 @@
|
|||
, A.HOLE_BORING_TYPE
|
||||
, A.HOLE_START_DATE
|
||||
, A.HOLE_END_DATE
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME
|
||||
, B.business_address_detail
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL) || ' ' || (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL) || ' ' || (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL) || ' ' || B.business_address_detail as business_address
|
||||
, (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) || ' ' || (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) || ' ' || (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) || ' ' || B.business_address_detail as business_address
|
||||
, A.HOLE_ELEVATION
|
||||
, COALESCE(A.HOLE_WATER_LEVEL, '') AS HOLE_WATER_LEVEL
|
||||
, A.HOLE_DRILLING_DEPTH
|
||||
|
|
@ -1002,7 +1001,7 @@ INSERT INTO APPTB_HOLE01
|
|||
<!-- 지형지질정보 -->
|
||||
<select id="selectTopoInfo" parameterType="map" resultType="egovMap">
|
||||
<![CDATA[
|
||||
select (select business_name from apptb_saup01 B where A.business_code = B.business_code)
|
||||
select (select business_name from apptb_saup01 B where A.business_code = B.business_code LIMIT 1)
|
||||
, A.business_code
|
||||
, A.tgeo_topography
|
||||
, A.tgeo_geology
|
||||
|
|
|
|||
|
|
@ -3,72 +3,72 @@
|
|||
<mapper namespace="sgis.surveysystem.mapper.AnswerMapper">
|
||||
|
||||
<resultMap id="answerResultMap" type="sgis.surveysystem.domain.Answer">
|
||||
<id property="answerId" column="answer_id"/>
|
||||
<result property="responseId" column="response_id"/>
|
||||
<result property="questionId" column="question_id"/>
|
||||
<result property="answerText" column="answer_text"/>
|
||||
<result property="selectedOptionId" column="selected_option_id"/>
|
||||
<id property="answerId" column="ANSWER_ID" jdbcType="VARCHAR"/>
|
||||
<result property="responseId" column="RESPONSE_ID" jdbcType="VARCHAR"/>
|
||||
<result property="questionId" column="QUESTION_ID" jdbcType="VARCHAR"/>
|
||||
<result property="answerText" column="ANSWER_TEXT" jdbcType="CLOB"/>
|
||||
<result property="selectedOptionId" column="SELECTED_OPTION_ID" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<insert id="insertAnswer" parameterType="sgis.surveysystem.domain.Answer">
|
||||
INSERT INTO tb_answers (
|
||||
answer_id,
|
||||
response_id,
|
||||
question_id,
|
||||
answer_text,
|
||||
selected_option_id
|
||||
INSERT INTO TBL_ANSWERS (
|
||||
ANSWER_ID,
|
||||
RESPONSE_ID,
|
||||
QUESTION_ID,
|
||||
ANSWER_TEXT,
|
||||
SELECTED_OPTION_ID
|
||||
) VALUES (
|
||||
#{answerId, jdbcType=OTHER},
|
||||
#{responseId, jdbcType=OTHER},
|
||||
#{questionId, jdbcType=OTHER},
|
||||
#{answerText},
|
||||
#{selectedOptionId, jdbcType=OTHER}
|
||||
#{answerId, jdbcType=VARCHAR},
|
||||
#{responseId, jdbcType=VARCHAR},
|
||||
#{questionId, jdbcType=VARCHAR},
|
||||
#{answerText, jdbcType=CLOB},
|
||||
#{selectedOptionId, jdbcType=VARCHAR}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<select id="findAnswerById" resultMap="answerResultMap">
|
||||
<select id="findAnswerById" resultMap="answerResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
answer_id,
|
||||
response_id,
|
||||
question_id,
|
||||
answer_text,
|
||||
selected_option_id
|
||||
FROM tb_answers
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
ANSWER_ID,
|
||||
RESPONSE_ID,
|
||||
QUESTION_ID,
|
||||
ANSWER_TEXT,
|
||||
SELECTED_OPTION_ID
|
||||
FROM TBL_ANSWERS
|
||||
WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<select id="findAnswersByResponseId" resultMap="answerResultMap">
|
||||
<select id="findAnswersByResponseId" resultMap="answerResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
answer_id,
|
||||
response_id,
|
||||
question_id,
|
||||
answer_text,
|
||||
selected_option_id
|
||||
FROM tb_answers
|
||||
WHERE response_id = #{responseId, jdbcType=OTHER}
|
||||
ANSWER_ID,
|
||||
RESPONSE_ID,
|
||||
QUESTION_ID,
|
||||
ANSWER_TEXT,
|
||||
SELECTED_OPTION_ID
|
||||
FROM TBL_ANSWERS
|
||||
WHERE RESPONSE_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<select id="findAnswersByQuestionId" resultMap="answerResultMap">
|
||||
<select id="findAnswersByQuestionId" resultMap="answerResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
answer_id,
|
||||
response_id,
|
||||
question_id,
|
||||
answer_text,
|
||||
selected_option_id
|
||||
FROM tb_answers
|
||||
WHERE question_id = #{questionId, jdbcType=OTHER}
|
||||
ANSWER_ID,
|
||||
RESPONSE_ID,
|
||||
QUESTION_ID,
|
||||
ANSWER_TEXT,
|
||||
SELECTED_OPTION_ID
|
||||
FROM TBL_ANSWERS
|
||||
WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<update id="updateAnswer" parameterType="sgis.surveysystem.domain.Answer">
|
||||
UPDATE tb_answers
|
||||
UPDATE TBL_ANSWERS
|
||||
SET
|
||||
answer_text = #{answerText},
|
||||
selected_option_id = #{selectedOptionId, jdbcType=OTHER}
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
ANSWER_TEXT = #{answerText, jdbcType=CLOB},
|
||||
SELECTED_OPTION_ID = #{selectedOptionId, jdbcType=VARCHAR}
|
||||
WHERE ANSWER_ID = #{answerId, jdbcType=VARCHAR}
|
||||
</update>
|
||||
|
||||
<delete id="deleteAnswer">
|
||||
DELETE FROM tb_answers
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
<delete id="deleteAnswer" parameterType="java.util.UUID">
|
||||
DELETE FROM TBL_ANSWERS
|
||||
WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
</mapper>
|
||||
|
|
@ -3,48 +3,48 @@
|
|||
<mapper namespace="sgis.surveysystem.mapper.AnswerSelectedOptionMapper">
|
||||
|
||||
<resultMap id="answerSelectedOptionResultMap" type="sgis.surveysystem.domain.AnswerSelectedOption">
|
||||
<id property="answerId" column="answer_id"/>
|
||||
<id property="optionId" column="option_id"/>
|
||||
<id property="answerId" column="ANSWER_ID" jdbcType="VARCHAR"/>
|
||||
<id property="optionId" column="OPTION_ID" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<insert id="insertAnswerSelectedOption" parameterType="sgis.surveysystem.domain.AnswerSelectedOption">
|
||||
INSERT INTO tb_answer_selected_options (
|
||||
answer_id,
|
||||
option_id
|
||||
INSERT INTO TBL_ANSWER_SELECTED_OPTIONS (
|
||||
ANSWER_ID,
|
||||
OPTION_ID
|
||||
) VALUES (
|
||||
#{answerId, jdbcType=OTHER},
|
||||
#{optionId, jdbcType=OTHER}
|
||||
#{answerId, jdbcType=VARCHAR},
|
||||
#{optionId, jdbcType=VARCHAR}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<insert id="insertMultipleAnswerSelectedOptions" parameterType="java.util.List">
|
||||
INSERT INTO tb_answer_selected_options (
|
||||
answer_id,
|
||||
option_id
|
||||
) VALUES
|
||||
<foreach collection="list" item="item" separator=",">
|
||||
(
|
||||
#{item.answerId, jdbcType=OTHER},
|
||||
#{item.optionId, jdbcType=OTHER}
|
||||
INSERT INTO TBL_ANSWER_SELECTED_OPTIONS (
|
||||
ANSWER_ID,
|
||||
OPTION_ID
|
||||
)
|
||||
<foreach collection="list" item="item" separator=" UNION ALL ">
|
||||
SELECT
|
||||
#{item.answerId, jdbcType=VARCHAR},
|
||||
#{item.optionId, jdbcType=VARCHAR}
|
||||
FROM dual
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<select id="findOptionsByAnswerId" resultMap="answerSelectedOptionResultMap">
|
||||
<select id="findOptionsByAnswerId" resultMap="answerSelectedOptionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
answer_id,
|
||||
option_id
|
||||
FROM tb_answer_selected_options
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
ANSWER_ID,
|
||||
OPTION_ID
|
||||
FROM TBL_ANSWER_SELECTED_OPTIONS
|
||||
WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<delete id="deleteByAnswerId">
|
||||
DELETE FROM tb_answer_selected_options
|
||||
WHERE answer_id = #{answerId, jdbcType=OTHER}
|
||||
<delete id="deleteByAnswerId" parameterType="java.util.UUID">
|
||||
DELETE FROM TBL_ANSWER_SELECTED_OPTIONS
|
||||
WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteAnswerSelectedOption">
|
||||
DELETE FROM tb_answer_selected_options
|
||||
WHERE answer_id = #{param1, jdbcType=OTHER} AND option_id = #{param2, jdbcType=OTHER}
|
||||
<delete id="deleteAnswerSelectedOption" parameterType="map">
|
||||
DELETE FROM TBL_ANSWER_SELECTED_OPTIONS
|
||||
WHERE ANSWER_ID = #{param1, jdbcType=VARCHAR} AND OPTION_ID = #{param2, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
</mapper>
|
||||
|
|
@ -3,70 +3,70 @@
|
|||
<mapper namespace="sgis.surveysystem.mapper.QuestionMapper">
|
||||
|
||||
<resultMap id="questionResultMap" type="sgis.surveysystem.domain.Question">
|
||||
<id property="questionId" column="question_id"/>
|
||||
<result property="surveyId" column="survey_id"/>
|
||||
<result property="questionText" column="question_text"/>
|
||||
<result property="questionType" column="question_type"/>
|
||||
<result property="questionOrder" column="question_order"/>
|
||||
<result property="isRequired" column="is_required"/>
|
||||
<id property="questionId" column="QUESTION_ID" jdbcType="VARCHAR"/>
|
||||
<result property="surveyId" column="SURVEY_ID" jdbcType="VARCHAR"/>
|
||||
<result property="questionText" column="QUESTION_TEXT" jdbcType="CLOB"/>
|
||||
<result property="questionType" column="QUESTION_TYPE" jdbcType="VARCHAR"/>
|
||||
<result property="questionOrder" column="QUESTION_ORDER" jdbcType="INTEGER"/>
|
||||
<result property="isRequired" column="IS_REQUIRED" jdbcType="INTEGER"/>
|
||||
</resultMap>
|
||||
|
||||
<!-- 문항 삽입 -->
|
||||
<insert id="insertQuestion" parameterType="sgis.surveysystem.domain.Question">
|
||||
INSERT INTO tb_questions (
|
||||
question_id,
|
||||
survey_id,
|
||||
question_text,
|
||||
question_type,
|
||||
question_order,
|
||||
is_required
|
||||
INSERT INTO TBL_QUESTIONS (
|
||||
QUESTION_ID,
|
||||
SURVEY_ID,
|
||||
QUESTION_TEXT,
|
||||
QUESTION_TYPE,
|
||||
QUESTION_ORDER,
|
||||
IS_REQUIRED
|
||||
) VALUES (
|
||||
CAST(#{questionId, jdbcType=OTHER} AS uuid), <!-- 이 부분을 수정했습니다. -->
|
||||
CAST(#{surveyId, jdbcType=OTHER} AS uuid), <!-- 이 부분을 수정했습니다. -->
|
||||
#{questionText},
|
||||
#{questionType},
|
||||
#{questionOrder},
|
||||
#{isRequired}
|
||||
#{questionId, jdbcType=VARCHAR},
|
||||
#{surveyId, jdbcType=VARCHAR},
|
||||
#{questionText, jdbcType=CLOB},
|
||||
#{questionType, jdbcType=VARCHAR},
|
||||
#{questionOrder, jdbcType=INTEGER},
|
||||
#{isRequired, jdbcType=INTEGER}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<select id="findQuestionsBySurveyId" resultMap="questionResultMap">
|
||||
<select id="findQuestionsBySurveyId" resultMap="questionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
question_id,
|
||||
survey_id,
|
||||
question_text,
|
||||
question_type,
|
||||
question_order,
|
||||
is_required
|
||||
FROM tb_questions
|
||||
WHERE survey_id = CAST(#{surveyId, jdbcType=OTHER} AS uuid)
|
||||
ORDER BY question_order ASC
|
||||
QUESTION_ID,
|
||||
SURVEY_ID,
|
||||
QUESTION_TEXT,
|
||||
QUESTION_TYPE,
|
||||
QUESTION_ORDER,
|
||||
IS_REQUIRED
|
||||
FROM TBL_QUESTIONS
|
||||
WHERE SURVEY_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
ORDER BY QUESTION_ORDER ASC
|
||||
</select>
|
||||
|
||||
<select id="findQuestionById" resultMap="questionResultMap">
|
||||
<select id="findQuestionById" resultMap="questionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
question_id,
|
||||
survey_id,
|
||||
question_text,
|
||||
question_type,
|
||||
question_order,
|
||||
is_required
|
||||
FROM tb_questions
|
||||
WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid)
|
||||
QUESTION_ID,
|
||||
SURVEY_ID,
|
||||
QUESTION_TEXT,
|
||||
QUESTION_TYPE,
|
||||
QUESTION_ORDER,
|
||||
IS_REQUIRED
|
||||
FROM TBL_QUESTIONS
|
||||
WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<update id="updateQuestion" parameterType="sgis.surveysystem.domain.Question">
|
||||
UPDATE tb_questions
|
||||
UPDATE TBL_QUESTIONS
|
||||
SET
|
||||
question_text = #{questionText},
|
||||
question_type = #{questionType},
|
||||
question_order = #{questionOrder},
|
||||
is_required = #{isRequired}
|
||||
WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid)
|
||||
QUESTION_TEXT = #{questionText, jdbcType=CLOB},
|
||||
QUESTION_TYPE = #{questionType, jdbcType=VARCHAR},
|
||||
QUESTION_ORDER = #{questionOrder, jdbcType=INTEGER},
|
||||
IS_REQUIRED = #{isRequired, jdbcType=INTEGER}
|
||||
WHERE QUESTION_ID = #{questionId, jdbcType=VARCHAR}
|
||||
</update>
|
||||
|
||||
<delete id="deleteQuestion">
|
||||
DELETE FROM tb_questions
|
||||
WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid)
|
||||
<delete id="deleteQuestion" parameterType="java.util.UUID">
|
||||
DELETE FROM TBL_QUESTIONS
|
||||
WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
</mapper>
|
||||
|
|
@ -3,58 +3,58 @@
|
|||
<mapper namespace="sgis.surveysystem.mapper.QuestionOptionMapper">
|
||||
|
||||
<resultMap id="questionOptionResultMap" type="sgis.surveysystem.domain.QuestionOption">
|
||||
<id property="optionId" column="option_id"/>
|
||||
<result property="questionId" column="question_id"/>
|
||||
<result property="optionText" column="option_text"/>
|
||||
<result property="optionOrder" column="option_order"/>
|
||||
<id property="optionId" column="OPTION_ID" jdbcType="VARCHAR"/>
|
||||
<result property="questionId" column="QUESTION_ID" jdbcType="VARCHAR"/>
|
||||
<result property="optionText" column="OPTION_TEXT" jdbcType="VARCHAR"/>
|
||||
<result property="optionOrder" column="OPTION_ORDER" jdbcType="INTEGER"/>
|
||||
</resultMap>
|
||||
|
||||
<!-- 선택지 삽입 -->
|
||||
<insert id="insertQuestionOption" parameterType="sgis.surveysystem.domain.QuestionOption">
|
||||
INSERT INTO tb_question_options (
|
||||
option_id,
|
||||
question_id,
|
||||
option_text,
|
||||
option_order
|
||||
INSERT INTO TBL_QUESTION_OPTIONS (
|
||||
OPTION_ID,
|
||||
QUESTION_ID,
|
||||
OPTION_TEXT,
|
||||
OPTION_ORDER
|
||||
) VALUES (
|
||||
CAST(#{optionId, jdbcType=OTHER} AS uuid), <!-- 이 부분을 수정했습니다. -->
|
||||
CAST(#{questionId, jdbcType=OTHER} AS uuid), <!-- 이 부분을 수정했습니다. -->
|
||||
#{optionText},
|
||||
#{optionOrder}
|
||||
#{optionId, jdbcType=VARCHAR},
|
||||
#{questionId, jdbcType=VARCHAR},
|
||||
#{optionText, jdbcType=VARCHAR},
|
||||
#{optionOrder, jdbcType=INTEGER}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<select id="findOptionsByQuestionId" resultMap="questionOptionResultMap">
|
||||
<select id="findOptionsByQuestionId" resultMap="questionOptionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
option_id,
|
||||
question_id,
|
||||
option_text,
|
||||
option_order
|
||||
FROM tb_question_options
|
||||
WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid)
|
||||
ORDER BY option_order ASC
|
||||
OPTION_ID,
|
||||
QUESTION_ID,
|
||||
OPTION_TEXT,
|
||||
OPTION_ORDER
|
||||
FROM TBL_QUESTION_OPTIONS
|
||||
WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
ORDER BY OPTION_ORDER ASC
|
||||
</select>
|
||||
|
||||
<select id="findQuestionOptionById" resultMap="questionOptionResultMap">
|
||||
<select id="findQuestionOptionById" resultMap="questionOptionResultMap" parameterType="java.util.UUID">
|
||||
SELECT
|
||||
option_id,
|
||||
question_id,
|
||||
option_text,
|
||||
option_order
|
||||
FROM tb_question_options
|
||||
WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid)
|
||||
OPTION_ID,
|
||||
QUESTION_ID,
|
||||
OPTION_TEXT,
|
||||
OPTION_ORDER
|
||||
FROM TBL_QUESTION_OPTIONS
|
||||
WHERE OPTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</select>
|
||||
|
||||
<update id="updateQuestionOption" parameterType="sgis.surveysystem.domain.QuestionOption">
|
||||
UPDATE tb_question_options
|
||||
UPDATE TBL_QUESTION_OPTIONS
|
||||
SET
|
||||
option_text = #{optionText},
|
||||
option_order = #{optionOrder}
|
||||
WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid)
|
||||
OPTION_TEXT = #{optionText, jdbcType=VARCHAR},
|
||||
OPTION_ORDER = #{optionOrder, jdbcType=INTEGER}
|
||||
WHERE OPTION_ID = #{optionId, jdbcType=VARCHAR}
|
||||
</update>
|
||||
|
||||
<delete id="deleteQuestionOption">
|
||||
DELETE FROM tb_question_options
|
||||
WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid)
|
||||
<delete id="deleteQuestionOption" parameterType="java.util.UUID">
|
||||
DELETE FROM TBL_QUESTION_OPTIONS
|
||||
WHERE OPTION_ID = #{_parameter, jdbcType=VARCHAR}
|
||||
</delete>
|
||||
</mapper>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue