tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO'

Browse Source 
Conflicts:
	src/main/resources/egovframework/egovProps/globals_local.properties
This commit is contained in:
JIWOO 2024-10-23 16:18:30 +09:00
commit 2e22fabb73
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/seed/com/gtm/base/BaseController.java
View File

@ -56,9 +56,6 @@ public class BaseController {
@Autowired @Autowired
private SeedFileService fileService; private SeedFileService fileService;
@Value("#{globalSettings['gw.url']}")
private String gwUrl;
public void setSessionMessageRemove(HttpSession session){ public void setSessionMessageRemove(HttpSession session){
session.removeAttribute("sSiteIdx"); session.removeAttribute("sSiteIdx");
session.removeAttribute("url"); session.removeAttribute("url");
@ -270,9 +267,6 @@ public class BaseController {
params.put("sql", pageFolder+".selectCaseTrublResult"); params.put("sql", pageFolder+".selectCaseTrublResult");
params.put("selectCaseTrublResult", JSPUtil.fixNull(bservice.list(params))); params.put("selectCaseTrublResult", JSPUtil.fixNull(bservice.list(params)));
} }
//개발, 운영서버 그룹웨어 연동 url
params.put("gwUrl", gwUrl);
} }

16
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
View File

@ -16,6 +16,10 @@ String ipAddress=request.getRemoteAddr();
</style> </style>
<script src="/site/case/js/rceptEdit.js"></script> <script src="/site/case/js/rceptEdit.js"></script>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<spring:eval expression="@property['gw.url']" var="gwUrl"/> <!--그룹웨어 개발,운영 서버 구분 -->
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
var listChange = "N"; var listChange = "N";
@ -3285,8 +3289,8 @@ function SetPriceInput(str){
return retValue; return retValue;
} }
//문서 기안작성 및 결제상신 //문서 기안작성 및 결제상신(기존 나눔 그룹웨어 백업)
function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, function nanumApi_back(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){ obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){
if(jobID != '')$("#jobID").val(jobID); if(jobID != '')$("#jobID").val(jobID);
@ -3312,7 +3316,7 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
$("#typeNanum").val("S"); $("#typeNanum").val("S");
$("#nanumFrmCaseNo").val($("#caseNo").val()); $("#nanumFrmCaseNo").val($("#caseNo").val());
var param = jQuery('#nanumFrm').serialize(); var param = jQuery('#nanumFrm').serialize();
url = "/gtm/case/nanum/ajax/SanctnhistoryCnt.do"; url = "/gtm/case/nanum/ajax/SanctnhistoryCnt.do"; //착수보고 전자결재내역 조회
XHR2(url, param, function(r){ XHR2(url, param, function(r){
if(r.data.sanctnhistoryCnt == 0){ if(r.data.sanctnhistoryCnt == 0){
if(confirm("등록된 결재정보가 없습니다. 등록하시겠습니까?")){ if(confirm("등록된 결재정보가 없습니다. 등록하시겠습니까?")){
@ -3349,7 +3353,7 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
} }
//문서 기안작성 및 결제상신 //문서 기안작성 및 결제상신
function nanumApi_bizboxTest(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){ obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){
if(jobID != '')$("#jobID").val(jobID); if(jobID != '')$("#jobID").val(jobID);
@ -8479,9 +8483,7 @@ function nanumProcessStart(){
<!-- 기안문서 callurl --> <!-- 기안문서 callurl -->
<input type="hidden" id="callProcessUrl" name="callProcessUrl" <input type="hidden" id="callProcessUrl" name="callProcessUrl"
value="http://group.kofair.or.kr/nanum/cflow/document/sanc/wait/wait_dochandler.jsp"/> value="${gwUrl}/gw/outProcessLogOn.do"/>
<input type="hidden" id="callProcessUrl" name="callProcessUrl"
value="${gwUrl}/nanum/cflow/document/sanc/wait/wait_dochandler.jsp"/>
<!-- 결재진행문서 callurl --> <!-- 결재진행문서 callurl -->
<input type="hidden" id="nanumProcessUrl" name="nanumProcessUrl" <input type="hidden" id="nanumProcessUrl" name="nanumProcessUrl"