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

Merge branch 'master' of

Browse Source 
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Conflicts:
	src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml
This commit is contained in:
myname 2025-01-08 12:26:09 +09:00
commit bda22bbaef
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/seed/com/gtm/base/GwBaseController.java
View File

@ -552,7 +552,7 @@ public class GwBaseController {
params.put("sql", "nanumCfrncmanageSel1"); //사건 정보 - 성립수 params.put("sql", "nanumCfrncmanageSel1"); //사건 정보 - 성립수
params.put("data1", JSPUtil.fixNull(bservice.select(params))); params.put("data1", JSPUtil.fixNull(bservice.select(params)));
params.put("sql", "trublcfrncmngCfrncmanageSelForGw"); //사건 정보 - 이름수 params.put("sql", "trublcfrncmngCfrncmanageSel"); //사건 정보 - 이름수
params.put("dataA", JSPUtil.fixNull(bservice.select(params))); params.put("dataA", JSPUtil.fixNull(bservice.select(params)));
params.put("sql", "trublcfrncmngCfrncatndncSel"); //참여 위원 정보 - 참석자 정보 params.put("sql", "trublcfrncmngCfrncatndncSel"); //참여 위원 정보 - 참석자 정보

10
src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml
View File

@ -439,7 +439,7 @@
#{conferenceGubun}, #{conferenceGubun},
'0501000000', '0501000000',
#{lunchCheck}, #{lunchCheck},
#{fixDay}, REPLACE(#{fixDay}, 'null', '00'),
#{conferencePlace}, #{conferencePlace},
SYSDATE, SYSDATE,
#{memberId}, #{memberId},
@ -731,7 +731,8 @@
, LUNCH_CHECK = #{lunchCheck} , LUNCH_CHECK = #{lunchCheck}
</if> </if>
<if test='fixDay neq "" and fixDay neq null'> <if test='fixDay neq "" and fixDay neq null'>
, FIX_DAY = #{fixDay} <!-- , FIX_DAY = #{fixDay} -->
, FIX_DAY = REPLACE(#{fixDay}, 'null', '00')
</if> </if>
<if test='conferencePlace neq "" and conferencePlace neq null'> <if test='conferencePlace neq "" and conferencePlace neq null'>
, CONFERENCE_PLACE = #{conferencePlace} , CONFERENCE_PLACE = #{conferencePlace}
@ -772,7 +773,6 @@
</select> </select>
<!-- 기안을 위하여 casegubun 조건 추가 --> <!-- 기안을 위하여 casegubun 조건 추가 -->
<select id="trublcfrncmngCfrncmanageSelForGw" parameterType="egovMap" resultType="egovMap"> <select id="trublcfrncmngCfrncmanageSelForGw" parameterType="egovMap" resultType="egovMap">
SELECT SELECT
@ -1715,7 +1715,7 @@
END AS MEMBER_NAME, END AS MEMBER_NAME,
(SELECT COUNT(*) FROM C_DLBRTMTR WHERE CASE_GUBUN = A.CASE_GUBUN AND CFRNC_NO = A.CFRNC_NO) AS DLBRTMTR_CNT, (SELECT COUNT(*) FROM C_DLBRTMTR WHERE CASE_GUBUN = A.CASE_GUBUN AND CFRNC_NO = A.CFRNC_NO) AS DLBRTMTR_CNT,
(SELECT COUNT(*) FROM C_ENDMTR WHERE CASE_GUBUN = A.CASE_GUBUN AND CFRNC_NO = A.CFRNC_NO) AS ENDMTR_CNT, (SELECT COUNT(*) FROM C_ENDMTR WHERE CASE_GUBUN = A.CASE_GUBUN AND CFRNC_NO = A.CFRNC_NO) AS ENDMTR_CNT,
FIX_DAY, REPLACE(FIX_DAY, 'null', '00') AS FIX_DAY,
CONFERENCE_PLACE, CONFERENCE_PLACE,
CASE_GUBUN, CASE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN) AS CASE_GUBUN_NM, (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN) AS CASE_GUBUN_NM,
@ -1765,7 +1765,7 @@
</if> </if>
</if> </if>
AND DEL_YN = 'N' AND DEL_YN = 'N'
AND TO_DATE(FIX_DAY, 'YYYY-MM-DD HH24:MI') > SYSDATE AND TO_DATE(REPLACE(FIX_DAY, 'null', '00'), 'YYYY-MM-DD HH24:MI') > SYSDATE
</where> </where>
ORDER BY FIX_DAY ASC ORDER BY FIX_DAY ASC
<include refid="bottom2"/> <include refid="bottom2"/>

2
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp
View File

@ -549,7 +549,7 @@ function fn_checkList() {
<div class="form-inline"> <div class="form-inline">
<div class="form-group" style="vertical-align: middle;"> <div class="form-group" style="vertical-align: middle;">
<div class="calendar"> <div class="calendar">
<input type="text" class="form-element" style="width:160px !important;" id="fixDay" name="fixDay"/> <input type="text" class="form-element" style="width:160px !important;" id="fixDay" name="fixDay" readonly/>
</div> </div>
<!-- <input type="text" class="form-element" style="width:140px;" placeholder="시간(ex: 11:00)"/> --> <!-- <input type="text" class="form-element" style="width:140px;" placeholder="시간(ex: 11:00)"/> -->
</div> </div>