From e47c88fb6ce4fdedf414fe499811dc93f580fe4e Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 29 Jul 2024 13:12:14 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B8=B0=EB=B3=B8=EB=AC=BC=EC=84=B1?= =?UTF-8?q?=EC=8B=9C=ED=97=98=20=EA=B1=B4=EB=84=88=EB=9B=B0=EA=B8=B0=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../geoinfo/main/main/MainController.java | 2 +- .../regi/sampleInfo/SampleInfoController.java | 37 +++++++++++++++++++ .../sampleInfo/service/SampleInfoMapper.java | 3 ++ .../sampleInfo/service/SampleInfoService.java | 2 + .../service/impl/SampleInfoServiceImpl.java | 10 +++++ .../sqlmap/mapper/regi/sampleInfo.xml | 19 ++++++++++ src/main/webapp/WEB-INF/views/vote/main.jsp | 2 +- .../WEB-INF/views/web/input/sampleInfo.jsp | 15 +++++--- 8 files changed, 82 insertions(+), 8 deletions(-) diff --git a/src/main/java/geoinfo/main/main/MainController.java b/src/main/java/geoinfo/main/main/MainController.java index 8b7d757d..750b4ca8 100644 --- a/src/main/java/geoinfo/main/main/MainController.java +++ b/src/main/java/geoinfo/main/main/MainController.java @@ -649,9 +649,9 @@ public class MainController if(!"".equals(searchKey) && searchKey != null && !"null".equals(searchKey) && !"undefined".equals(searchKey)) { searchKey = (String)params.get("searchKey"); + searchKey = searchKey.replaceAll(" ", ""); }else { searchKey = ""; - } String userid = ""; diff --git a/src/main/java/geoinfo/regi/sampleInfo/SampleInfoController.java b/src/main/java/geoinfo/regi/sampleInfo/SampleInfoController.java index 07639f52..d100db1d 100644 --- a/src/main/java/geoinfo/regi/sampleInfo/SampleInfoController.java +++ b/src/main/java/geoinfo/regi/sampleInfo/SampleInfoController.java @@ -1,6 +1,7 @@ package geoinfo.regi.sampleInfo; import geoinfo.regi.common.service.CommonService; +import geoinfo.regi.header.service.HeaderService; import geoinfo.regi.sampleInfo.service.SampleInfoService; import ictway.comm.util.parseData; import ictway.comm.util.strUtil; @@ -11,6 +12,7 @@ import java.net.MalformedURLException; import java.text.ParseException; import java.util.ArrayList; import java.util.HashMap; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -42,6 +44,9 @@ public class SampleInfoController { @Resource(name = "commonService") private CommonService commonService; + + @Resource(name = "headerService") + private HeaderService headerService; /* 20231223트랜젝션 * @Autowired @@ -216,11 +221,18 @@ public class SampleInfoController { } + boolean isFoundSkipSampleInfo = false; + + String projectCode = ""; + for (int i = 0; i < jobNodeDOC.getLength(); i++) { String job = jobNodeDOC.item(i).getFirstChild().getNodeValue(); Element data = (Element)dataNodeDOC.item(i); String key; + if ("ignore".equals(job) ) { + isFoundSkipSampleInfo = true; + } if ("U".equals(job) || "I".equals(job) || "ignore".equals(job) ) { // delete, insert 처리 NodeList nPROJECT_CODE=data.getElementsByTagName("projectCode"); @@ -238,6 +250,8 @@ public class SampleInfoController { NodeList nSAMPLE_RD=data.getElementsByTagName("sampleRd"); NodeList nSAMPLE_DESC=data.getElementsByTagName("sampleDesc"); + projectCode = wUtil.isNullNode(nPROJECT_CODE ); + params.put("PROJECT_CODE", wUtil.isNullNode(nPROJECT_CODE )); params.put("HOLE_CODE", wUtil.isNullNode(nHOLE_CODE )); params.put("SAMPLE_CODE", wUtil.isNullNode(nHOLE_CODE ) + wUtil.isNullNode(nSAMPLE_NUMBER )); @@ -273,6 +287,29 @@ public class SampleInfoController { } //현재 저장된 시료형태에 따른 토사시험정보 삭제 + + if( isFoundSkipSampleInfo ) { + Map map = new HashMap<>(); + map.put("projectCode", projectCode); + map.put("SAMPLEINFO_EXCEPTION", "Y" ); + headerService.sampleInfoEx(map); + } else { + Map map = new HashMap<>(); + map.put("projectCode", projectCode); + map.put("SAMPLEINFO_EXCEPTION", null); + headerService.sampleInfoEx(map); + } + + params.put("PROJECT_CODE", projectCode); + if( sampleService.isSkipedSampleInfo(params) ) { + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " " + " 기본물성시험이 없는 시추공:" + + "\n--------------------------------------------------------------\n" + + "PROJECT_CODE:[" + projectCode + "]\n" + + "\n--------------------------------------------------------------\n" + ); + } wUtil.deleteSandInfo(oPROJECT_CODE,oHOLE_CODE,request,params,sampleService); diff --git a/src/main/java/geoinfo/regi/sampleInfo/service/SampleInfoMapper.java b/src/main/java/geoinfo/regi/sampleInfo/service/SampleInfoMapper.java index c608e86f..439fa0e3 100644 --- a/src/main/java/geoinfo/regi/sampleInfo/service/SampleInfoMapper.java +++ b/src/main/java/geoinfo/regi/sampleInfo/service/SampleInfoMapper.java @@ -43,5 +43,8 @@ int deleteTempConsolidation(HashMap params) throws Exception; int deleteTempTriaxialUu(HashMap params) throws Exception; int deleteTempTriaxialUsual(HashMap params) throws Exception; + + ArrayList isSkipedSampleInfo(HashMap params) throws Exception; + } diff --git a/src/main/java/geoinfo/regi/sampleInfo/service/SampleInfoService.java b/src/main/java/geoinfo/regi/sampleInfo/service/SampleInfoService.java index b44b56fd..08f89594 100644 --- a/src/main/java/geoinfo/regi/sampleInfo/service/SampleInfoService.java +++ b/src/main/java/geoinfo/regi/sampleInfo/service/SampleInfoService.java @@ -41,4 +41,6 @@ public interface SampleInfoService { int deleteTempTriaxialUu(HashMap params) throws Exception; int deleteTempTriaxialUsual(HashMap params) throws Exception; + + boolean isSkipedSampleInfo(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/sampleInfo/service/impl/SampleInfoServiceImpl.java b/src/main/java/geoinfo/regi/sampleInfo/service/impl/SampleInfoServiceImpl.java index 3f6885e5..fddf9788 100644 --- a/src/main/java/geoinfo/regi/sampleInfo/service/impl/SampleInfoServiceImpl.java +++ b/src/main/java/geoinfo/regi/sampleInfo/service/impl/SampleInfoServiceImpl.java @@ -112,5 +112,15 @@ public class SampleInfoServiceImpl implements SampleInfoService { return sampleInfoMapper.deleteTempTriaxialUsual(params); } + @Override + public boolean isSkipedSampleInfo(HashMap params) throws Exception { + ArrayList result = sampleInfoMapper.isSkipedSampleInfo(params); + if( result != null && result.size() == 1 ) { + return true; + } + return false; + } + + } diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/sampleInfo.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/sampleInfo.xml index d16721e5..0e831d2a 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/sampleInfo.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/sampleInfo.xml @@ -218,5 +218,24 @@ WHERE PROJECT_CODE=#{PROJECT_CODE} (SELECT SAMPLE_CODE FROM TEMP_SAMPLE_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND HOLE_CODE=#{HOLE_CODE}) ]]> + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/vote/main.jsp b/src/main/webapp/WEB-INF/views/vote/main.jsp index 83a6933d..bb15c964 100644 --- a/src/main/webapp/WEB-INF/views/vote/main.jsp +++ b/src/main/webapp/WEB-INF/views/vote/main.jsp @@ -19,7 +19,7 @@ - + 설문조사 diff --git a/src/main/webapp/WEB-INF/views/web/input/sampleInfo.jsp b/src/main/webapp/WEB-INF/views/web/input/sampleInfo.jsp index 974ba583..6e4df102 100644 --- a/src/main/webapp/WEB-INF/views/web/input/sampleInfo.jsp +++ b/src/main/webapp/WEB-INF/views/web/input/sampleInfo.jsp @@ -857,7 +857,7 @@ function fn_grid_refresh(){ editor: comboEditor2, template: "#=getTeacherName2((sampleShape == null) ? ' ' : sampleShape)#", }, - { field: "sampleWc", title: "함수비(%)", editor: chooseEditor, width:100, attributes: { style:"text-align: right" }, + { field: "sampleWc", title: "함수비(%)
값 없을 시
-999 입력
", editor: chooseEditor, width:100, attributes: { style:"text-align: right" }, format:"{0:n2}", template: function (dataItem) { if (dataItem.sampleWc == null) @@ -866,7 +866,7 @@ function fn_grid_refresh(){ return dataItem.sampleWc; } }, - { field: "sampleGs", title: "비중", editor: chooseEditor, width:100, attributes: { style:"text-align: right" }, + { field: "sampleGs", title: "비중
값 없을 시
-999 입력
", editor: chooseEditor, width:100, attributes: { style:"text-align: right" }, template: function (dataItem) { if (dataItem.sampleGs == null) dataItem._set("sampleGs", "0"); @@ -874,7 +874,7 @@ function fn_grid_refresh(){ return dataItem.sampleGs; } }, - { field: "sampleLl", title: "액성한계(%)", editor: chooseEditor, width:100, attributes: { style:"text-align: right" }, + { field: "sampleLl", title: "액성한계(%)
값 없을 시
-999 입력
", editor: chooseEditor, width:100, attributes: { style:"text-align: right" }, template: function (dataItem) { if (dataItem.sampleLl == null) dataItem._set("sampleLl", "0"); @@ -882,7 +882,7 @@ function fn_grid_refresh(){ return dataItem.sampleLl; } }, - { field: "samplePi", title: "소성지수", editor: chooseEditor, width:100, attributes: { style:"text-align: right" }, + { field: "samplePi", title: "소성지수
값 없을 시
-999 입력
", editor: chooseEditor, width:100, attributes: { style:"text-align: right" }, template: function (dataItem) { if (dataItem.samplePi == null) dataItem._set("samplePi", "0"); @@ -891,7 +891,7 @@ function fn_grid_refresh(){ } }, { field: "sampleDesc", title: "비고", width:100, attributes: { style:"text-align: left" }, template: "
#= (sampleDesc == null) ? '0' : sampleDesc #
" }, - { field: "sampleRd", title: "단위중량(${sampleUnit})", editor: chooseEditor, width:140, attributes: { style:"text-align: right" }, + { field: "sampleRd", title: "단위중량(${sampleUnit})
값 없을 시
-999 입력
", editor: chooseEditor, width:140, attributes: { style:"text-align: right" }, template: function (dataItem) { if (dataItem.sampleRd == null) dataItem._set("sampleRd", "0"); @@ -1079,12 +1079,15 @@ function fn_grid_refresh(){ +
+ 기본물성시험을 하지 않은 시추공인 경우, 입력없이 저장하시면 됩니다.↑ +

- ※ 시료번호 변경시, 입력된 토사시험정보가 삭제됩니다.   ('함수비(%)', '비중', '액성한계(%)', '소성지수', '단위중량()' 값없을 시, 음수 -999 입력 ) + ※ 시료번호 변경시, 입력된 토사시험정보가 삭제됩니다.