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

Merge branch 'JIWOO'

Browse Source
This commit is contained in:
JIWOO 2024-12-10 18:33:43 +09:00
commit a4862dc20e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,8 +317,9 @@ public class BaseController {
}
//사건 승인권한 조회
params.put("sql", pageFolder+".selectCaseAuth");
params.put("selectCaseAuthData", JSPUtil.fixNull(bservice.list(params)));
/*20241210 주석 - 운영소스에 없음*/
/*params.put("sql", pageFolder+".selectCaseAuth");
params.put("selectCaseAuthData", JSPUtil.fixNull(bservice.list(params)));*/
}

8
src/main/resources/egovframework/sqlmap/config/mappers/nanum/nanum_sql.xml
View File

@ -923,11 +923,11 @@
UPDATE C_MASTER SET
STATE_PRO = '0405000000'
, CASE_END_DT = TO_CHAR(SYSDATE, 'YYYYMMDD')
WHERE CASE_NO IN (SELECT CASE_NO FROM C_DLBRTMTR WHERE MEDIATION_BIG NOT IN ('0616010000', '0617010000', '0618010000')
AND MEDIATION_SMALL NOT IN ('0616000000', '0617000000', '0618000000') AND CFRNC_NO = #{cfrncNo}
WHERE CASE_NO IN (SELECT CASE_NO FROM C_DLBRTMTR WHERE MEDIATION_BIG NOT IN ('0616010000', '0617010000', '0618010000') <!-- 심의안건이 대분류가 심의가 아니고 -->
AND MEDIATION_SMALL NOT IN ('0616000000', '0617000000', '0618000000') AND CFRNC_NO = #{cfrncNo} <!-- 소분류가 심의안상정, 수락여부대기, 재심의가 아닌 경우 -->
UNION ALL
SELECT CASE_NO FROM C_ENDMTR WHERE MEDIATION_BIG NOT IN ('0616010000', '0617010000', '0618010000')
AND MEDIATION_SMALL NOT IN ('0616000000', '0617000000', '0618000000') AND CFRNC_NO = #{cfrncNo})
SELECT CASE_NO FROM C_ENDMTR WHERE MEDIATION_BIG NOT IN ('0616010000', '0617010000', '0618010000') <!-- 종료안건이 대분류가 심의가 아니고 -->
AND MEDIATION_SMALL NOT IN ('0616000000', '0617000000', '0618000000') AND CFRNC_NO = #{cfrncNo}) <!-- 소분류가 심의안상정, 수락여부대기, 재심의가 아닌 경우 -->
</update>
<!-- 협의회 종료후 사건처리 조정결과 수정-->