fix: 일축압축 S-S 그래프 입력 오류 수정 건

암석시험정보 > 일축압축에서 '일축압축시험결과 그래프'에서 파괴형태 만 업로드 후 저장한다. 그리고 다시 Stress-Strain 그래프만 업로드하려고 하면 아래와 같이 에러가 발생한다.

list.txt

@@ -1,7 +1,3 @@
 #src\main\resources\egovframework\egovProps\globals.properties
-# 일축압축 첨부파일 하나 씩 올리면 에러나는 버그
+# 일축압축 첨부 파일 하나 씩 올리면 에러나는 버그 수정중.. 2025-01-06 18:01
-src\main\webapp\WEB-INF\views\web\input\sand\unconfined_usual.jsp
 src\main\webapp\WEB-INF\views\web\input\uniaxial\rockUniaxial.jsp
-
-# 검색유통 사업 검색
-src\main\java\geoinfo\map\projectSearch\MapProjectSearchController.java

src/main/java/geoinfo/regi/projectList/ProjectListController.java

@@ -309,9 +309,10 @@ public class ProjectListController {
 							return "/web/index_db";
 						}
 
-						// 지반정보등록 (관리자)
+						// 지반정보등록 (관리자 및 사용자)
 						@RequestMapping(value = "/checkList.do")
 						public ModelAndView checkList(@RequestParam HashMap<String,Object> params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response) throws Exception{
+							
 							request.setCharacterEncoding("euc-kr");
 							String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID"));
 							model.addObject("userId", LoginUserId);

src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml

@@ -28,19 +28,17 @@
 
     <!-- 입력중, 수정요청 프로젝트 -->
     <select id="selectCnt" resultType="String">
-    <![CDATA[
     	SELECT COUNT(PROJECT_CODE) CNT
+    	<![CDATA[
     	FROM TEMP_PROJECT_INFO
     	WHERE
     		NVL(USE_YN,' ') <> 'N' AND 
+    		
+    	]]>
    		<if test="userId != null">
    			USERID = #{userId} AND
    		</if>
-    		<if test="userid != null">
-    			USERID = #{userid} AND
-    		</if>
    		STATE= #{state}
-    ]]>
     </select>
 
     <!-- 시추공수 -->

src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml

@@ -659,17 +659,19 @@
 	</select>
 
 	<select id="selectProjectList" parameterType="map" resultType="egovMap">
-	<![CDATA[
+	
 			SELECT
 				*
 			FROM
 				TBL_PROJECT_INFO
 			WHERE
+			<![CDATA[
 				NVL(USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) IN
+			]]>
 			<foreach collection="projectList" item="project" index="index" open="(" close=")" separator=",">
 				#{project}
 			</foreach>
-	]]>
+	
 	</select>
 
 	<select id="selectWebDownloadLog" parameterType="map" resultType="egovMap">
@@ -1048,7 +1050,6 @@
 	</select>
 
 	<select id="selectTblProjectInformationYn"  parameterType="map" resultType="egovMap">	
-	<![CDATA[
 	 select
                 b.HOLE_CODE,
                 B.HOLE_TOTAL_DEPTH DEPTH,
@@ -1384,7 +1385,7 @@
             <if test="density != 0">
             left join (select distinct(hole_code) from TBL_DENSITY where hole_code like #{pcodePer}) C3 on C3.hole_code = b.hole_code
 			</if>
-
+			<![CDATA[
             where NVL(B.USE_YN,' ') <> 'N' AND b.project_code = #{pcode} order by b.hole_code
             ]]>
 	</select>

src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml

@@ -28,14 +28,13 @@
 			TBL_CLASS_DETAIL A, TBL_PROJECT_INFO B
 		WHERE
 			NVL(B.USE_YN,' ') <> 'N' AND A.CLASS_DETAIL_CODE = B.CLASS_CODE
-
+		]]>
 		<if test="masterCode != 0">
 			AND B.PROJECT_MASTER_COMPANY_CODE = #{masterCode}
 		</if>
 
 		GROUP BY A.CLASS_DETAIL_NAME , A.CLASS_DETAIL_CODE
 		ORDER BY A.CLASS_DETAIL_CODE
-		]]>
 	</select>
 
 	<select id="selectTblWorkCompany" parameterType="map" resultType="egovMap">

src/main/resources/egovframework/sqlmap/mapper/regi/projectList.xml

@@ -239,7 +239,6 @@ INSERT INTO TEMP_META_INFO (
 		DECODE(NVL(HOLE_DIA,''),'','시추공경 - 필수입력<br/>','') AS HOLE_DIA,
 		DECODE(NVL(HOLE_BORING_MACHINE,''),'','시추장비 - 필수입력<br/>','') AS HOLE_BORING_MACHINE,
 		DECODE(NVL(HOLE_BORING_METHOD,''),'','시추방법 - 필수입력<br/>','') AS HOLE_BORING_METHOD,
-
 	    CASE WHEN NVL(HOLE_TOTAL_DEPTH, '') = '' THEN ''
 	         WHEN HOLE_TOTAL_DEPTH > (SELECT NVL(MAX(LAYER_DEPTH_TO),0) FROM TEMP_LAYER_INFO SA
 	                                     WHERE SA.PROJECT_CODE = A.PROJECT_CODE
@@ -248,7 +247,7 @@ INSERT INTO TEMP_META_INFO (
 	    ELSE ''
 	    END HOLE_TOTAL_DEPTH_ERR1
 	FROM TEMP_HEADER A , TABLE(FUNC_HOLECODE_LIST(#{PROJECT_CODE})) B WHERE NVL(A.USE_YN,' ') <> 'N' AND A.PROJECT_CODE(+) = B.PROJECT_CODE AND A.HOLE_CODE(+) = B.HOLE_CODE ORDER BY B.POSITION, B.HOLE_CODE
-]]>
+	]]>
 </select>
 <select id="getLayerInfo" parameterType="map" resultType="java.util.HashMap">
 					<![CDATA[

src/main/webapp/WEB-INF/views/web/input/header.jsp

@@ -1764,7 +1764,7 @@ function fn_HoleLoad(){
 										<tr>
 											<th class="td-head">케이싱심도(m) </th>
 											<td colspan="3">(-) :
-												<input name="HOLE_CASING_DEPTH" id="HOLE_CASING_DEPTH" type="text" style="width:200px;" maxlength="11" value="${mapHeader.holeCasingDepth == -999 ? '-' : mapHeader.holeCasingDepth}" valid="notnull" validNm="케이싱심도"/> m (케이싱심도 ≤ 굴진심도)
+												<input name="HOLE_CASING_DEPTH" id="HOLE_CASING_DEPTH" type="text" style="width:200px;" maxlength="11" value="${mapHeader.holeCasingDepth == -999 ? '-' : mapHeader.holeCasingDepth}" valid="notnull" validNm="케이싱심도"/> m (케이싱심도 ≤ 굴진심도) <span style="color:blue">[값이 없는 경우, <span style="color:red; "> - </span>(하이픈) 입력]</span>
 											</td>
 										</tr>
 										<tr>

src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp

@@ -162,12 +162,22 @@ function fn_save(rUrl){
 		fn_fileTotalCheck(fileImgID2);
 	}
 
+	if( fileImgBkCheck1 && fileImgCheck1 ) {
+		alert("파괴형태 그림 첨부는 필수입니다.");
+		return false;
+	} else if( fileImgBkCheck2 && fileImgCheck2 ) {
+		alert("Stress-Strain 그래프 첨부는 필수입니다.");
+		return false;
+	}
+	/*
 	if(fileImgCheck1 === true || fileImgCheck2 === true){
 		if (fileImgBkCheck1 === true || fileImgBkCheck2 === true){
+			
 			alert("그래프 업로드는 필수입니다.");
 			return false;
 		}
 	}
+	*/
 	/* if(fileImgBkCheck1 === true || fileImgBkCheck2 === true){ */
 	/* } */
 	//그리드 저장