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

.

main
thkim 2025-01-14 16:35:47 +09:00
parent 21a2a6780b
commit 41cca0b766
11 changed files with 75 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
list.txt
View File

@ -1,3 +1,11 @@
#src\main\resources\egovframework\egovProps\globals.properties
# 일축압축 첨부 파일 하나 씩 올리면 에러나는 버그 수정중.. 2025-01-06 18:01
src\main\webapp\WEB-INF\views\web\input\uniaxial\rockUniaxial.jsp
src\main\webapp\WEB-INF\views\web\input\uniaxial\rockUniaxial.jsp
#건설현장 입력
src\main\webapp\WEB-INF\views\drilling\input\drilling_input.jsp
src\main\java\geoinfo\drilling\input\DrillingInputController.java
src\main\java\geoinfo\drilling\input\service\DrillingInputMapper.java
src\main\resources\egovframework\sqlmap\mapper\drilling\input\DrillingInputMapper.xml
src\main\java\geoinfo\main\login\service\impl\LoginServiceImpl.java
src\main\java\geoinfo\main\login\service\LoginMapper.java
src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml

2
src/main/java/geoinfo/drilling/input/DrillingInputController.java
View File

@ -84,7 +84,7 @@ public class DrillingInputController {
"\n--------------------------------------------------------------\n" +
request.getRequestURI() + " IN:" +
"\n--------------------------------------------------------------\n" +
"jstrJSON" + strJSON + "\n" +
"jstrJSON: \n" + strJSON + "\n" +
"\n--------------------------------------------------------------\n"
);

5
src/main/java/geoinfo/drilling/input/service/DrillingInputMapper.java
View File

@ -4,12 +4,15 @@ import java.sql.SQLException;
import java.util.HashMap;
import egovframework.rte.psl.dataaccess.mapper.Mapper;
import egovframework.rte.psl.dataaccess.util.EgovMap;
@Mapper("drillingInputMapper")
public interface DrillingInputMapper {
public HashMap<String, Object> callSpAddTblCsi(HashMap<String, Object> params) throws SQLException;
public HashMap<String, Object> spAddTblCsi(HashMap<String, Object> params) throws SQLException;
public String test(HashMap<String, Object> params) throws SQLException;
public Long findConstCompanyCodeByConstCompanyName(HashMap<String, Object> params) throws SQLException;
public EgovMap sPGetMasterCompanyDistrict(HashMap<String, Object> sPGetMasterCompanyDistrictParams) throws SQLException;
}

24
src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java
View File

@ -2,25 +2,47 @@ package geoinfo.drilling.input.service.impl;
import geoinfo.drilling.input.service.DrillingInputMapper;
import geoinfo.drilling.input.service.DrillingInputService;
import geoinfo.main.login.service.LoginMapper;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Service;
import egovframework.rte.psl.dataaccess.util.EgovMap;
@Service("drillingInputService")
public class DrillingInputServiceImpl implements DrillingInputService {
@Resource(name="drillingInputMapper")
private DrillingInputMapper drillingInputMapper;
@Resource(name="loginMapper")
private LoginMapper loginMapper;
@Override
public HashMap<String, Object> drillingInputAdd(HttpServletRequest request, HashMap<String, Object> params) throws Exception {
String userId = (String)request.getSession().getAttribute("USERID");
String projectMasterCompanyName = loginMapper.findProjectMasterCompanyNameByUserid(userId);
if( projectMasterCompanyName == null ) {
throw new Exception( "발주 기관 계정에 설정된 기관이 존재하지 않습니다" );
}
HashMap<String, Object> sPGetMasterCompanyDistrictParams = new HashMap<String, Object>();
sPGetMasterCompanyDistrictParams.put("projectMasterCompanyName", projectMasterCompanyName);
EgovMap egovMap = drillingInputMapper.sPGetMasterCompanyDistrict(sPGetMasterCompanyDistrictParams);
List test = egovMap.keyList();
params.put("userId", userId);
params.put("masterCompanyOCode", "01");
@ -33,7 +55,7 @@ public class DrillingInputServiceImpl implements DrillingInputService {
try {
Long constCompanyCode = drillingInputMapper.findConstCompanyCodeByConstCompanyName(params);
params.put("constCompanyCode", constCompanyCode);
drillingInputMapper.callSpAddTblCsi(params);
drillingInputMapper.spAddTblCsi(params);
return params;
} catch (SQLException e) {
throw new Exception( e.getMessage() );

2
src/main/java/geoinfo/main/login/service/LoginMapper.java
View File

@ -98,4 +98,6 @@ public interface LoginMapper {
EgovMap selectSearchIniUserId(Map<String, Object> params);
public int checkWebMemberIn(Map<String, Object> map) throws Exception;
String findProjectMasterCompanyNameByUserid(String userId);
}

1
src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java
View File

@ -4,7 +4,6 @@ import egovframework.com.cmm.service.EgovProperties;
import egovframework.rte.psl.dataaccess.util.EgovMap;
import geoinfo.main.login.service.LoginMapper;
import geoinfo.main.login.service.LoginService;
import geoinfo.main.login.service.selectSearchIdByNameAndPhoneAndDupinfoIsNullAndCertificationYnFalse;
import geoinfo.util.FileUtil;
import java.io.FileNotFoundException;

22
src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml
View File

@ -9,7 +9,14 @@
<result property="errMsg" column="p_err_msg" jdbcType="VARCHAR"/>
</resultMap>
<select id="callSpAddTblCsi" parameterType="map" statementType="CALLABLE" resultMap="spAddTblCsiResult">
<resultMap id="spGetMasterCompanyDistrictParams" type="java.util.HashMap">
<result property="v_gl" column="v_gl" jdbcType="VARCHAR"/>
<result property="v_gm" column="v_gm" jdbcType="VARCHAR"/>
<result property="v_gs" column="v_gs" jdbcType="VARCHAR"/>
<result property="v_gf" column="v_gf" jdbcType="VARCHAR"/>
</resultMap>
<select id="spAddTblCsi" parameterType="map" statementType="CALLABLE" resultMap="spAddTblCsiResult">
{ CALL SP_ADD_TBL_CSI(
#{constName},
#{constStartDate},
@ -42,4 +49,17 @@
</select>
<select id="sPGetMasterCompanyDistrict" parameterType="map" statementType="CALLABLE" >
{ CALL SP_GET_MASTER_COMPANY_DISTRICT(
#{projectMasterCompanyName},
#{v_gl, mode=OUT, jdbcType=VARCHAR},
#{v_gm, mode=OUT, jdbcType=VARCHAR},
#{v_gs, mode=OUT, jdbcType=VARCHAR},
#{v_gf, mode=OUT, jdbcType=VARCHAR}
) }
</select>
</mapper>

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

@ -272,7 +272,7 @@
AND TRIM(PASSWD) = #{pass}
</delete>
<!-- 사용자 권한 -->
<!-- 사용자 권한 2025-01-14 기준 호출하는 곳 없음 -->
<select id="selectGovementCode" resultType="String">
<![CDATA[
SELECT GOVEMENT_CODE

13
src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml
View File

@ -563,5 +563,18 @@
select COUNT(*) as count from web_member_log where userid = #{userId} and accept = '0'
]]>
</select>
<select id="findProjectMasterCompanyNameByUserid" parameterType="String" resultType="String">
<![CDATA[
SELECT
tmc.COM_NAME
FROM
WEB_MEMBER_IN wmi
LEFT JOIN TBL_MASTER_COMPANY tmc ON
wmi.PROJECT_MASTER_COMPANY_CODE = tmc.COM_CODE
WHERE
wmi.USERID=#{userid}
]]>
</select>
</mapper>

6
src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp
View File

@ -178,11 +178,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
jsonItem.constCompanyTel = constCompanyTelEle.value;
}
jsonData.push(jsonItem);
}
console.log('%o', jsonData);
}
let xhr;

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

@ -169,15 +169,6 @@ function fn_save(rUrl){
alert("Stress-Strain 그래프 첨부는 필수입니다.");
return false;
}
/*
if(fileImgCheck1 === true || fileImgCheck2 === true){
if (fileImgBkCheck1 === true || fileImgBkCheck2 === true){
alert("그래프 업로드는 필수입니다.");
return false;
}
}
*/
/* if(fileImgBkCheck1 === true || fileImgBkCheck2 === true){ */
/* } */
//그리드 저장