Merge branch 'tolag'
This commit is contained in:
commit
652b8083c9
@ -627,7 +627,15 @@ public class ApmController {
|
|||||||
//처리일자
|
//처리일자
|
||||||
PgrCmmVO adrEndDeDayVO = new PgrCmmVO();
|
PgrCmmVO adrEndDeDayVO = new PgrCmmVO();
|
||||||
adrEndDeDayVO.setAdrSeq(cmmVO.getAdrSeq());
|
adrEndDeDayVO.setAdrSeq(cmmVO.getAdrSeq());
|
||||||
model.addAttribute("adrEndDeDay", cmmService.selectAdrEndDeDay(adrEndDeDayVO).getAdrEndDeDay());
|
|
||||||
|
PgrCmmVO PgrCmmVO = new PgrCmmVO();
|
||||||
|
PgrCmmVO = cmmService.selectAdrEndDeDay(adrEndDeDayVO);
|
||||||
|
String adrEndDeDay = "";
|
||||||
|
if(PgrCmmVO != null) {
|
||||||
|
adrEndDeDay = PgrCmmVO.getAdrEndDeDay();
|
||||||
|
}
|
||||||
|
|
||||||
|
model.addAttribute("adrEndDeDay", adrEndDeDay);
|
||||||
|
|
||||||
}catch(Exception ex) {
|
}catch(Exception ex) {
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
|
|||||||
@ -178,7 +178,7 @@ Globals.oz.devServerIp=192.168.0.176:8086
|
|||||||
Globals.oz.devSchedulerIp=192.168.0.200
|
Globals.oz.devSchedulerIp=192.168.0.200
|
||||||
#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data
|
#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data
|
||||||
Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out
|
Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out
|
||||||
Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr
|
Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9
|
||||||
Globals.oz.realServerIp=192.168.39.145:8080
|
Globals.oz.realServerIp=192.168.39.145:8080
|
||||||
Globals.oz.realSchedulerIp=192.168.39.147
|
Globals.oz.realSchedulerIp=192.168.39.147
|
||||||
Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out
|
Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out
|
||||||
|
|||||||
@ -187,7 +187,7 @@ Globals.oz.devSchedulerIp=192.168.0.200
|
|||||||
#scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4.
|
#scheduler \uc11c\ubc84\uc5d0 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c \uc785\ub2c8\ub2e4.
|
||||||
#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data/out
|
#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data/out
|
||||||
Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out
|
Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out
|
||||||
Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr
|
Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9
|
||||||
Globals.oz.realServerIp=192.168.39.145:8080
|
Globals.oz.realServerIp=192.168.39.145:8080
|
||||||
Globals.oz.realSchedulerIp=192.168.39.147
|
Globals.oz.realSchedulerIp=192.168.39.147
|
||||||
Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out
|
Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out
|
||||||
|
|||||||
@ -176,7 +176,7 @@ Globals.prod.islocal=real
|
|||||||
Globals.oz.devServerIp=192.168.0.176:8086
|
Globals.oz.devServerIp=192.168.0.176:8086
|
||||||
Globals.oz.devSchedulerIp=192.168.0.176
|
Globals.oz.devSchedulerIp=192.168.0.176
|
||||||
Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data
|
Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data
|
||||||
Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr
|
Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||172.25.0.9
|
||||||
Globals.oz.realServerIp=192.168.39.145:8080
|
Globals.oz.realServerIp=192.168.39.145:8080
|
||||||
Globals.oz.realSchedulerIp=192.168.39.147
|
Globals.oz.realSchedulerIp=192.168.39.147
|
||||||
#Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out
|
#Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user