diff --git a/.gitignore b/.gitignore
index 40693b9..71d5639 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,8 +32,8 @@ replay_pid*
/.idea/
/src/main/UbiService/logs/
/src/main/UbiService/results/UBIHTML/
-/src/main/webapp/ubi4/logs/ubidebug.log.2025-09-04
-/src/main/webapp/ubi4/logs/ubiserver.log.2025-09-04
-/src/main/UbiService/results/
+/src/main/webapp/ubi4/logs/
/.vscode/settings.json
/CLAUDE.md
+/DEV-SERVER-REPORT-FILE/UbiService/logs/
+/DEV-SERVER-REPORT-FILE/UbiService/results/UBIHTML/
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/bin/nssm.exe b/DEV-SERVER-REPORT-FILE/UbiService/bin/nssm.exe
new file mode 100644
index 0000000..8faee45
Binary files /dev/null and b/DEV-SERVER-REPORT-FILE/UbiService/bin/nssm.exe differ
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/bin/nssm64.exe b/DEV-SERVER-REPORT-FILE/UbiService/bin/nssm64.exe
new file mode 100644
index 0000000..6ccfe3c
Binary files /dev/null and b/DEV-SERVER-REPORT-FILE/UbiService/bin/nssm64.exe differ
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/bin/restart.sh b/DEV-SERVER-REPORT-FILE/UbiService/bin/restart.sh
new file mode 100644
index 0000000..f43a4bc
--- /dev/null
+++ b/DEV-SERVER-REPORT-FILE/UbiService/bin/restart.sh
@@ -0,0 +1,26 @@
+JAVA_DIR=/usr/local/jdk1.6.0
+UBISERVICE_DIR=/webapp/myapp/UbiService
+PROPERTY_DIR=$UBISERVICE_DIR
+FONT_DIR=$UBISERVICE_DIR/fonts/
+CLASSPATH=$UBISERVICE_DIR/lib/UbiServer.jar
+XMS=1024M
+XMX=2048M
+
+GREP_STR=$UBISERVICE_DIR/lib/UbiServer.jar
+
+#For SunOS
+#if [ `/usr/ucb/ps -auxwww | grep $GREP_STR | grep -v grep | awk '{print $2}'` ];then
+# kill -9 `/usr/ucb/ps -auxwww | grep $GREP_STR | grep -v grep | awk '{print $2}'`
+
+if [ `ps -ef | grep $GREP_STR | grep -v grep | awk '{print $2}'` ];then
+ kill -9 `ps -ef | grep $GREP_STR | grep -v grep | awk '{print $2}'`
+ echo ""
+ echo ">>> UbiService has shutdown."
+ $JAVA_DIR/bin/java -Xms$XMS -Xmx$XMX -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dsun.java2d.fontpath=$FONT_DIR -classpath $CLASSPATH:. com.ubireport.service.UbiService4 $PROPERTY_DIR &
+ echo ">>> UbiService has started."
+ echo ""
+else
+ echo ""
+ echo ">>> UbiService is not running."
+ echo ""
+fi
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/bin/shutdown.sh b/DEV-SERVER-REPORT-FILE/UbiService/bin/shutdown.sh
new file mode 100644
index 0000000..3fcb771
--- /dev/null
+++ b/DEV-SERVER-REPORT-FILE/UbiService/bin/shutdown.sh
@@ -0,0 +1,18 @@
+UBISERVICE_DIR=/webapp/myapp/UbiService
+
+GREP_STR=$UBISERVICE_DIR/lib/UbiServer.jar
+
+#For SunOS
+#if [ `/usr/ucb/ps -auxwww | grep $GREP_STR | grep -v grep | awk '{print $2}'` ];then
+# kill -9 `/usr/ucb/ps -auxwww | grep $GREP_STR | grep -v grep | awk '{print $2}'`
+
+if [ `ps -ef | grep $GREP_STR | grep -v grep | awk '{print $2}'` ];then
+ kill -9 `ps -ef | grep $GREP_STR | grep -v grep | awk '{print $2}'`
+ echo ""
+ echo ">>> UbiService has shutdown."
+ echo ""
+else
+ echo ""
+ echo ">>> UbiService is not running."
+ echo ""
+fi
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/bin/startup.sh b/DEV-SERVER-REPORT-FILE/UbiService/bin/startup.sh
new file mode 100644
index 0000000..90ed14a
--- /dev/null
+++ b/DEV-SERVER-REPORT-FILE/UbiService/bin/startup.sh
@@ -0,0 +1,31 @@
+JAVA_DIR=/usr/local/jdk1.6.0
+UBISERVICE_DIR=/webapp/myapp/UbiService
+PROPERTY_DIR=$UBISERVICE_DIR
+FONT_DIR=$UBISERVICE_DIR/fonts/
+CLASSPATH=$UBISERVICE_DIR/lib/UbiServer.jar
+
+#For Redbc
+#CLASSPATH=$UBISERVICE_DIR/lib/UbiServer.jar:$UBISERVICE_DIR/lib/EzIssuerJava.jar
+
+#For Voiceye
+#CLASSPATH=$UBISERVICE_DIR/lib/UbiServer.jar:$UBISERVICE_DIR/lib/VERVMakerJNI.jar
+#CLASSPATH=$UBISERVICE_DIR/lib/UbiServer.jar:$UBISERVICE_DIR/lib/VERVMakerJNI64.jar
+
+XMS=1024M
+XMX=2048M
+
+GREP_STR=$UBISERVICE_DIR/lib/UbiServer.jar
+
+#For SunOS
+#if [ `/usr/ucb/ps -auxwww | grep $GREP_STR | grep -v grep | awk '{print $2}'` ];then
+
+if [ `ps -ef | grep $GREP_STR | grep -v grep | awk '{print $2}'` ];then
+ echo ""
+ echo ">>> UbiService is running."
+ echo ""
+else
+ $JAVA_DIR/bin/java -Xms$XMS -Xmx$XMX -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dsun.java2d.fontpath=$FONT_DIR -classpath $CLASSPATH:. com.ubireport.service.UbiService4 $PROPERTY_DIR &
+ echo ""
+ echo ">>> UbiService has started."
+ echo ""
+fi
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/bin/svcregist.bat b/DEV-SERVER-REPORT-FILE/UbiService/bin/svcregist.bat
new file mode 100644
index 0000000..b9b1cf5
--- /dev/null
+++ b/DEV-SERVER-REPORT-FILE/UbiService/bin/svcregist.bat
@@ -0,0 +1,68 @@
+echo off
+
+set INPUT=%1
+set UBISERVICE_DIR=C:\webapps\myapp\UbiService
+set BATPATH=%UBISERVICE_DIR%\bin\ubiservice.bat
+set NSSM=%UBISERVICE_DIR%\bin\nssm64.exe
+
+if "%INPUT%" == "" (
+
+ echo ----------------------------------------
+ echo ex : svcregist.bat [install] [uninstall]
+ echo ----------------------------------------
+ echo.
+) else (
+
+ if "%INPUT%" == "install" (
+
+ echo ----------------------------------------
+ echo UbiService Registration Job
+ echo ----------------------------------------
+ echo.
+
+ echo [UbiService Regist]
+ %NSSM% install UbiService %BATPATH%
+ echo.
+
+ echo [UbiService Set Description]
+ %NSSM% set UbiService Description "UbiService for UbiReport4.0"
+ echo.
+
+ echo [UbiService Start]
+ %NSSM% start UbiService
+ echo.
+ echo ----------------------------------------
+ echo Install Completed
+ echo ----------------------------------------
+ echo.
+ ) else (
+
+ if "%INPUT%" == "uninstall" (
+
+ echo ----------------------------------------
+ echo UbiService UnRegistration Job
+ echo ----------------------------------------
+ echo.
+
+ echo [UbiService Stop]
+ %NSSM% stop UbiService
+ echo.
+
+ echo [UbiService Unregist]
+ %NSSM% remove UbiService confirm
+ echo.
+
+ echo ----------------------------------------
+ echo Uninstall Completed
+ echo ----------------------------------------
+ echo.
+ ) else (
+
+ echo ----------------------------------------
+ echo ex : svcregist.bat [install] [uninstall]
+ echo ----------------------------------------
+ echo.
+ )
+ )
+)
+
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/bin/ubiservice.bat b/DEV-SERVER-REPORT-FILE/UbiService/bin/ubiservice.bat
new file mode 100644
index 0000000..b96ecbc
--- /dev/null
+++ b/DEV-SERVER-REPORT-FILE/UbiService/bin/ubiservice.bat
@@ -0,0 +1,34 @@
+echo off
+echo ----------------------------------------
+echo UbiService.bat
+echo ----------------------------------------
+echo.
+set JAVA_DIR=C:\paytollserver\ubiReport-java\jdk1.8.0_261
+set UBISERVICE_DIR=C:\paytollserver\apache-tomcat-9.0.54-windows-x64\apache-tomcat-9.0.54\webapps\UbiService
+set PROPERTY_DIR=%UBISERVICE_DIR%
+set FONT_DIR=%UBISERVICE_DIR%\fonts\
+set XMS=512M
+set XMX=1024M
+set CLASSPATH=%UBISERVICE_DIR%\lib\UbiServer.jar
+
+REM For Redbc
+REM set CLASSPATH=%UBISERVICE_DIR%\lib\UbiServer.jar;%UBISERVICE_DIR%\lib\EzIssuerJava.jar
+
+REM For Voiceye
+REM set CLASSPATH=%UBISERVICE_DIR%\lib\UbiServer.jar;%UBISERVICE_DIR%\lib\VERVMakerJNI.jar
+REM set CLASSPATH=%UBISERVICE_DIR%\lib\UbiServer.jar;%UBISERVICE_DIR%\lib\VERVMakerJNI64.jar
+
+
+echo.
+echo [Directory Information]
+echo - Java : %JAVA_DIR%
+echo - UbiService : %UBISERVICE_DIR%
+echo.
+
+echo [Java Information]
+%JAVA_DIR%\bin\java -version
+echo.
+
+echo [UbiService Start]
+%JAVA_DIR%\bin\java -Xms%XMS% -Xmx%XMX% -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dsun.java2d.fontpath=%FONT_DIR% -classpath %CLASSPATH%;. com.ubireport.service.UbiService4 %PROPERTY_DIR%
+
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/fonts/NGULIM.TTF b/DEV-SERVER-REPORT-FILE/UbiService/fonts/NGULIM.TTF
new file mode 100644
index 0000000..28ec0d2
Binary files /dev/null and b/DEV-SERVER-REPORT-FILE/UbiService/fonts/NGULIM.TTF differ
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/fonts/batang.ttc b/DEV-SERVER-REPORT-FILE/UbiService/fonts/batang.ttc
new file mode 100644
index 0000000..a496b2b
Binary files /dev/null and b/DEV-SERVER-REPORT-FILE/UbiService/fonts/batang.ttc differ
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/fonts/gulim.ttc b/DEV-SERVER-REPORT-FILE/UbiService/fonts/gulim.ttc
new file mode 100644
index 0000000..060ddf2
Binary files /dev/null and b/DEV-SERVER-REPORT-FILE/UbiService/fonts/gulim.ttc differ
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/fonts/malgun.ttf b/DEV-SERVER-REPORT-FILE/UbiService/fonts/malgun.ttf
new file mode 100644
index 0000000..fdf3b5a
Binary files /dev/null and b/DEV-SERVER-REPORT-FILE/UbiService/fonts/malgun.ttf differ
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/fonts/malgunbd.ttf b/DEV-SERVER-REPORT-FILE/UbiService/fonts/malgunbd.ttf
new file mode 100644
index 0000000..7469fd8
Binary files /dev/null and b/DEV-SERVER-REPORT-FILE/UbiService/fonts/malgunbd.ttf differ
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/fonts/malgunsl.ttf b/DEV-SERVER-REPORT-FILE/UbiService/fonts/malgunsl.ttf
new file mode 100644
index 0000000..bbf41ca
Binary files /dev/null and b/DEV-SERVER-REPORT-FILE/UbiService/fonts/malgunsl.ttf differ
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/ubiservice.xml b/DEV-SERVER-REPORT-FILE/UbiService/ubiservice.xml
new file mode 100644
index 0000000..f99a5f4
--- /dev/null
+++ b/DEV-SERVER-REPORT-FILE/UbiService/ubiservice.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DEV-SERVER-REPORT-FILE/UbiService/ubiservice_prd.xml b/DEV-SERVER-REPORT-FILE/UbiService/ubiservice_prd.xml
new file mode 100644
index 0000000..d793294
--- /dev/null
+++ b/DEV-SERVER-REPORT-FILE/UbiService/ubiservice_prd.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/UbiReport.MD b/UbiReport.MD
new file mode 100644
index 0000000..4792477
--- /dev/null
+++ b/UbiReport.MD
@@ -0,0 +1,29 @@
+신규 불법건축물관리 UbiReport
+각자 프로젝트 경로에 맞게 수정
+
+1. src/main/UbiService/ubiservice.xml
+
+
+2. src/main/UbiService/bin/ubiservice.bat
+ set JAVA_DIR=D:\DEV\.jdks\jdk1.8.0_271
+ set UBISERVICE_DIR=D:\workspace\git\IBMS_NEW\src\main\UbiService
+
+3. src/main/UbiService/bin/ubiservice.bat 파일 실행
+
+4. 프로젝트 구동
+
+5. http://localhost:8080/ubi4/ubihtml.jsp 호출 시 리포트 sample 정상적으로 보이면 완료
+ http://211.119.124.118:18080/ubi4/ubihtml.jsp 개발서버, 뜨는거 확인 완료
diff --git a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/LevyPrvntcActInfoVO.java b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/LevyPrvntcActInfoVO.java
index 18ec099..82e8bd7 100644
--- a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/LevyPrvntcActInfoVO.java
+++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/LevyPrvntcActInfoVO.java
@@ -22,6 +22,8 @@ import java.math.BigDecimal;
@NoArgsConstructor
@ToString
public class LevyPrvntcActInfoVO extends PagingVO {
+ private String impltTaskSeCd; //이행업무구분코드
+
private String pstnInfoId; //위치정보ID
private String ldcgCd; //지목코드
private String ldcgCdNm; //지목코드명
diff --git a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/service/impl/CrdnImpltTaskServiceImpl.java b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/service/impl/CrdnImpltTaskServiceImpl.java
index 6681b05..04bdb98 100644
--- a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/service/impl/CrdnImpltTaskServiceImpl.java
+++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/service/impl/CrdnImpltTaskServiceImpl.java
@@ -395,6 +395,32 @@ public class CrdnImpltTaskServiceImpl extends EgovAbstractServiceImpl implements
levyInfoVO.setImpltInfoId(vo.getImpltInfoId());
crdnLevyPrvntcMapper.updateImpltInfoId(levyInfoVO);
+ }else if( vo.getImpltTaskSeCd().equals(ImpltTaskSeConstants.IMPLT_TASK_SE_CD_5_LEVY) ){ //부과
+ crdnRegistAndViewVO.setLevyBgngYmd(vo.getImpltBgngYmd());
+ crdnRegistAndViewVO.setLevyEndYmd(vo.getImpltEndYmd());
+ crdnRegistAndViewVO.setCrdnPrcsSttsCd(CRDN_PRCS_STTS_CD_60_LEVY); //단속 처리 상태 코드 - 60: 부과
+
+ // 부과예고 일 경우, 등록 수정 시 tb_levy_info 테이블에 이행정보ID 값을 UPDATE 처리 해준다.
+ CrdnLevyInfoVO levyInfoVO = new CrdnLevyInfoVO();
+ levyInfoVO.setCrdnYr(vo.getCrdnYr());
+ levyInfoVO.setCrdnNo(vo.getCrdnNo());
+ levyInfoVO.setImpltTaskSeCd(vo.getImpltTaskSeCd());
+ levyInfoVO.setImpltInfoId(vo.getImpltInfoId());
+ crdnLevyPrvntcMapper.updateImpltInfoId(levyInfoVO);
+
+ }else if( vo.getImpltTaskSeCd().equals(ImpltTaskSeConstants.IMPLT_TASK_SE_CD_6_PAY_URG) ){ //납부촉구
+ crdnRegistAndViewVO.setPayUrgBgngYmd(vo.getImpltBgngYmd());
+ crdnRegistAndViewVO.setPayUrgEndYmd(vo.getImpltEndYmd());
+ crdnRegistAndViewVO.setCrdnPrcsSttsCd(CRDN_PRCS_STTS_CD_70_PAY_URG); //단속 처리 상태 코드 - 70: 납부촉구
+
+ // 부과예고 일 경우, 등록 수정 시 tb_levy_info 테이블에 이행정보ID 값을 UPDATE 처리 해준다.
+ CrdnLevyInfoVO levyInfoVO = new CrdnLevyInfoVO();
+ levyInfoVO.setCrdnYr(vo.getCrdnYr());
+ levyInfoVO.setCrdnNo(vo.getCrdnNo());
+ levyInfoVO.setImpltTaskSeCd(vo.getImpltTaskSeCd());
+ levyInfoVO.setImpltInfoId(vo.getImpltInfoId());
+ crdnLevyPrvntcMapper.updateImpltInfoId(levyInfoVO);
+
}else{
throw new MessageException("이행정보 코드가 없습니다.");
}
diff --git a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnLevyPrvntcMapper_maria.xml b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnLevyPrvntcMapper_maria.xml
index dc8ab83..533fc9b 100644
--- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnLevyPrvntcMapper_maria.xml
+++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnLevyPrvntcMapper_maria.xml
@@ -57,7 +57,13 @@
strct.DUP_ETBLDG_BDST_CMPTTN_RT, -- 복측증축건축물산정비율
null as BSCS_CSTRN_SE_CD, -- 기초공사구분코드
null as BSCS_CSTRN_RT, -- 기초공사율
- (select count(*) from tb_levy_info tli where tli.CRDN_YR = t1.CRDN_YR and tli.CRDN_NO = t1.CRDN_NO and tli.ACT_INFO_ID = t3.ACT_INFO_ID and tli.DEL_YN = 'N') as LEVY_CNT
+ (select count(*) from tb_levy_info tli
+ where tli.CRDN_YR = t1.CRDN_YR
+ and tli.CRDN_NO = t1.CRDN_NO
+ and tli.ACT_INFO_ID = t3.ACT_INFO_ID
+ and tli.DEL_YN = 'N'
+ and tli.IMPLT_TASK_SE_CD = #{impltTaskSeCd} /* 이행업무 구분코드 */
+ ) as LEVY_CNT
from tb_crdn t1
inner join tb_pstn_info t2 on t1.CRDN_YR = t2.CRDN_YR and t1.CRDN_NO = t2.CRDN_NO and t2.DEL_YN = 'N'
inner join tb_act_info t3 on t2.CRDN_YR = t3.CRDN_YR and t2.CRDN_NO = t3.CRDN_NO and t2.PSTN_INFO_ID = t3.PSTN_INFO_ID and t3.DEL_YN = 'N'
diff --git a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml
index 78560e7..5ee6a10 100644
--- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml
+++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml
@@ -323,6 +323,14 @@
LEVY_PRVNTC_BGNG_YMD = #{levyPrvntcBgngYmd},
LEVY_PRVNTC_END_YMD = #{levyPrvntcEndYmd},
+ /* 부과 */
+ LEVY_BGNG_YMD = #{levyBgngYmd},
+ LEVY_END_YMD = #{levyEndYmd},
+
+ /* 납부촉구 */
+ PAY_URG_BGNG_YMD = #{payUrgBgngYmd},
+ PAY_URG_END_YMD = #{payUrgEndYmd},
+
CRDN_PRCS_STTS_CD = #{crdnPrcsSttsCd},
CRDN_PRCS_YMD = (DATE_FORMAT(CURRENT_DATE(), '%Y%m%d'))
WHERE CRDN_YR = #{crdnYr}
@@ -350,6 +358,14 @@
LEVY_PRVNTC_BGNG_YMD = #{levyPrvntcBgngYmd},
LEVY_PRVNTC_END_YMD = #{levyPrvntcEndYmd}
+ /* 부과 */
+ LEVY_BGNG_YMD = #{levyBgngYmd},
+ LEVY_END_YMD = #{levyEndYmd}
+
+ /* 납부촉구 */
+ PAY_URG_BGNG_YMD = #{payUrgBgngYmd},
+ PAY_URG_END_YMD = #{payUrgEndYmd}
+
WHERE CRDN_YR = #{crdnYr}
AND CRDN_NO = #{crdnNo}
AND DEL_YN = 'N'
diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnImpltTask/impltTaskPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnImpltTask/impltTaskPopup.jsp
index bd03cec..334d586 100644
--- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnImpltTask/impltTaskPopup.jsp
+++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnImpltTask/impltTaskPopup.jsp
@@ -382,7 +382,7 @@
'&crdnYr=' + encodeURIComponent(ImpltTaskPopup.crdnYr) +
'&crdnNo=' + encodeURIComponent(ImpltTaskPopup.crdnNo) +
'&impltTaskSeCd=' + encodeURIComponent(ImpltTaskPopup.impltTaskSeCd);
- var newWindow = openPopupSafe(url, 1600, 1200, 'levyPrvntcPopup');
+ var newWindow = openPopup(url, 1600, 1200, 'levyPrvntcPopup');
if (newWindow) {
newWindow.opener = window.opener;
window.close();
@@ -442,11 +442,7 @@
success: function(response) {
if (response && response.success) {
alert(response.message || '이행정보가 성공적으로 저장되었습니다.');
- // 메인페이지의 refreshCrdnList 함수 호출 - opener 체인이 끊어진 경우 mainOpener 사용
- if (window.mainOpener && window.mainOpener.refreshCrdnList) {
- console.log('mainOpener로 refreshCrdnList 호출');
- window.mainOpener.refreshCrdnList();
- } else if (window.opener && window.opener.refreshCrdnList) {
+ if (window.opener && window.opener.refreshCrdnList) {
console.log('opener로 refreshCrdnList 호출');
window.opener.refreshCrdnList();
} else {
diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnLevyPrvntc/levyPrvntcPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnLevyPrvntc/levyPrvntcPopup.jsp
index 8397954..a6c3c24 100644
--- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnLevyPrvntc/levyPrvntcPopup.jsp
+++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnLevyPrvntc/levyPrvntcPopup.jsp
@@ -629,7 +629,12 @@
initialRequest: false, // 초기 데이터 요청 여부
serializer: function(params) {
var defaultParams = $.param(params);
- var extra = $.param({ "crdnYr": LevyPrvntcPopup.crdnYr, "crdnNo": LevyPrvntcPopup.crdnNo, "impltInfoId": $("#impltInfoId").val() });
+ var extra = $.param({
+ "crdnYr": LevyPrvntcPopup.crdnYr,
+ "crdnNo": LevyPrvntcPopup.crdnNo,
+ "impltTaskSeCd": LevyPrvntcPopup.impltTaskSeCd,
+ "impltInfoId": $("#impltInfoId").val()
+ });
return defaultParams + '&' + extra;
}
};
@@ -945,6 +950,18 @@
$('#btnDel').show();
console.log('기존 부과정보로 화면 복원 완료:', existingData);
+
+ // 모든 부과정보가 등록되었을때, 현재 시점이 해당 jsp 마지막 로직, 자동처리를 했더니, 매번 떠서 매우 불편함,
+ // 세션 or local storage 에 저장하지 않는 이상 매우 불편
+ // 적용은 생각해봐야함.
+ /*
+ if( LevyPrvntcPopup.isAllLevyInfoCompleted ){ // 페이지 로딩시 체크한 전체 등록완료 여부, 전역변수
+ if( confirm("위반행위에 대한한 부과계산이 모두 완료 되었습니다. 이행정보 탭으로 이동하시겠습니까?") ){
+ LevyPrvntcPopup.switchTab('implt');
+ }
+ }
+ */
+
};
/**
diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp
index ed272dd..3bc379c 100644
--- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp
+++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp
@@ -498,11 +498,11 @@
},
/**
- * 부과예고 관리 팝업을 엽니다.
+ * 부과예고, 부과, 납부촉구 관리 팝업을 엽니다.
*
* @param crdnYr 단속 연도
* @param crdnNo 단속 번호
- * @param impltTaskSeCd 이행업무구분코드 (4:부과예고)
+ * @param impltTaskSeCd 이행업무구분코드 (4:부과예고, 5:부과, 6:납부촉구)
*/
openLevyPrvntcPopup: function(crdnYr, crdnNo, impltTaskSeCd) {
// 기존 이행정보가 있는지 확인하여 모드 결정
@@ -709,16 +709,30 @@
return;
}
- // 시정촉구 팝업 열기
+ // 부과예고 팝업 열기
self.openLevyPrvntcPopup(self.selectedRow.crdnYr, self.selectedRow.crdnNo, '4'); // 3: 부과예고
});
$("#btnLevy").on('click', function() {
- self.updateStatus('60', '부과');
+ // 선택된 행 확인
+ if (!self.selectedRow) {
+ alert('부과를 관리할 단속 건을 선택해주세요.');
+ return;
+ }
+
+ // 부과예고 팝업 열기
+ self.openLevyPrvntcPopup(self.selectedRow.crdnYr, self.selectedRow.crdnNo, '5'); // 5: 부과
});
$("#btnPayUrg").on('click', function() {
- self.updateStatus('70', '납부촉구');
+ // 선택된 행 확인
+ if (!self.selectedRow) {
+ alert('납부촉구를 관리할 단속 건을 선택해주세요.');
+ return;
+ }
+
+ // 부과예고 팝업 열기
+ self.openLevyPrvntcPopup(self.selectedRow.crdnYr, self.selectedRow.crdnNo, '6'); // 6: 납부촉구
});
// 재부과 버튼 클릭 이벤트