통지 메뉴 행위가 여러 개일 경우 행위자가 여러 명일 수 있어서 이행 조회 시 행위 기준으로 조회되도록 변경

dev
kjh 2 months ago
parent 73016f1244
commit aa28a1a66b

@ -94,6 +94,11 @@ public class NotiImpltInfoVO extends PagingVO {
private String lotnoMno; // 지번본번
private String lotnoSno; // 지번부번
/** 행위 정보 (조인용) */
private String actNo; // 행위번호
private String actTypeCd; // 행위유형코드
private String usgIdxCd; // 용도지수코드
// ==================== 조인 컬럼 (코드명) ====================
/** 이행업무구분코드명 */
@ -110,7 +115,13 @@ public class NotiImpltInfoVO extends PagingVO {
/** 표준읍면동코드명 */
private String stdgEmdCdNm;
/** 행위 유형 코드명 */
private String actTypeCdNm;
/** 용도 지수 코드명 */
private String usgIdxCdNm;
private String rgtrNm;
private String mdrfNm;

@ -57,7 +57,10 @@ public class NotiImpltTrprInfoVO extends PagingVO {
private String ownrActrInfoId;
/** 행위 번호 */
private String actNo;
private String actNo;
/** 행위 유형 코드 */
private String actTypeCd;
/** 등록 일시 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ -108,7 +111,10 @@ public class NotiImpltTrprInfoVO extends PagingVO {
// ==================== 검색 조건 ====================
/** 검색 조건 - 이행 정보 ID */
private String schImpltInfoId;
private String schImpltInfoId;
/** 검색 조건 - 행위 번호 */
private String schActNo;
// ==================== TUI 그리드용 속성 ====================
/**

@ -31,9 +31,15 @@
p.LOTNO_ADDR,
p.LOTNO_MNO,
p.LOTNO_SNO,
p.LOTNO_WHOL_ADDR,
impltTaskSe.CD_NM as IMPLT_TASK_SE_CD_NM,
ru.USER_NM AS RGTR_NM, /* 등록자 명 */
mu.USER_NM AS MDFR_NM /* 수정자 명 */
mu.USER_NM AS MDFR_NM, /* 수정자 명 */
a.ACT_NO,
a.ACT_TYPE_CD,
act.VLTN_BDST AS ACT_TYPE_CD_NM,
a.USG_IDX_CD,
usg.USG_NM AS USG_IDX_CD_NM
FROM TB_IMPLT_INFO ii
INNER JOIN tb_crdn c ON ii.CRDN_YR = c.CRDN_YR AND ii.CRDN_NO = c.CRDN_NO AND c.DEL_YN = 'N'
LEFT JOIN tb_pstn_info p ON p.CRDN_YR = c.CRDN_YR AND p.CRDN_NO = c.CRDN_NO AND p.DEL_YN = 'N'
@ -42,14 +48,23 @@
LEFT JOIN tb_cd_detail stdgEmdCd ON stdgEmdCd.CD_GROUP_ID = 'STDG_EMD_CD' AND stdgEmdCd.CD_ID = p.STDG_EMD_CD
LEFT JOIN tb_cd_detail rgnSeCd ON rgnSeCd.CD_GROUP_ID = 'RGN_SE_CD' AND rgnSeCd.CD_ID = c.RGN_SE_CD
LEFT JOIN tb_user ru ON ii.RGTR = ru.USER_ID
LEFT JOIN tb_user mu ON ii.MDFR = mu.USER_ID
LEFT JOIN tb_user mu ON ii.MDFR = mu.USER_ID
LEFT JOIN tb_act_info a ON a.CRDN_YR = c.CRDN_YR and a.CRDN_NO = c.CRDN_NO AND a.DEL_YN = 'N'
LEFT JOIN tb_act_type act ON act.ACT_TYPE_CD = a.ACT_TYPE_CD
LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = a.USG_IDX_CD AND usg.DEL_YN = 'N'
WHERE ii.CRDN_YR = #{schCrdnYr}
AND ii.DEL_YN = 'N'
AND ii.IMPLT_BGNG_YMD BETWEEN #{schImpltBgngYmd1} AND #{schImpltBgngYmd2}
<if test='schImpltTaskSeCd != null and schImpltTaskSeCd != ""'>
AND ii.IMPLT_TASK_SE_CD = #{schImpltTaskSeCd}
</if>
ORDER BY CRDN_NO ASC
<if test='schImpltTaskSeCd == null or schImpltTaskSeCd == ""'>
AND ii.IMPLT_TASK_SE_CD IN ('1', '2', '3')
</if>
ORDER BY ii.CRDN_NO, a.ACT_NO ASC
<if test='pagingYn != null and pagingYn == "Y"'>
LIMIT #{startIndex}, #{perPage}
</if>
</select>
<!-- 이행정보 조회 -->
@ -58,12 +73,16 @@
FROM TB_IMPLT_INFO ii
INNER JOIN tb_crdn c ON ii.CRDN_YR = c.CRDN_YR AND ii.CRDN_NO = c.CRDN_NO AND c.DEL_YN = 'N'
LEFT JOIN tb_pstn_info p ON p.CRDN_YR = c.CRDN_YR AND p.CRDN_NO = c.CRDN_NO AND p.DEL_YN = 'N'
LEFT JOIN tb_act_info a ON a.CRDN_YR = c.CRDN_YR and a.CRDN_NO = c.CRDN_NO AND a.DEL_YN = 'N'
WHERE ii.CRDN_YR = #{schCrdnYr}
AND ii.DEL_YN = 'N'
AND ii.IMPLT_BGNG_YMD BETWEEN #{schImpltBgngYmd1} AND #{schImpltBgngYmd2}
<if test='schImpltTaskSeCd != null and schImpltTaskSeCd != ""'>
AND ii.IMPLT_TASK_SE_CD = #{schImpltTaskSeCd}
</if>
<if test='schImpltTaskSeCd == null or schImpltTaskSeCd == ""'>
AND ii.IMPLT_TASK_SE_CD IN ('1', '2', '3')
</if>
</select>
@ -92,14 +111,18 @@
iti.ACT_NO,
-- 코드성 데이터 조인 (코드명)
impltTrprSe.CD_NM as IMPLT_TRPR_SE_CD_NM,
actTypeCd.CD_NM AS ACT_TYPE_CD_NM,
sggCd.CD_NM as SGG_CD_NM
sggCd.CD_NM as SGG_CD_NM,
a.ACT_TYPE_CD,
act.VLTN_BDST AS ACT_TYPE_CD_NM
FROM TB_IMPLT_TRPR_INFO iti
JOIN TB_IMPLT_INFO ii ON iti.IMPLT_INFO_ID = ii.IMPLT_INFO_ID AND ii.DEL_YN = 'N'
-- 코드성 데이터 조인
LEFT JOIN tb_cd_detail impltTrprSe ON impltTrprSe.CD_GROUP_ID = 'IMPLT_TRPR_SE_CD' AND impltTrprSe.CD_ID = iti.IMPLT_TRPR_SE_CD
LEFT JOIN tb_cd_detail actTypeCd ON actTypeCd.CD_GROUP_ID = 'ACT_TYPE_CD' AND actTypeCd.CD_ID = iti.ACT_NO
LEFT JOIN tb_cd_detail sggCd ON sggCd.CD_GROUP_ID = 'SGG_CD' AND sggCd.CD_ID = iti.SGG_CD
LEFT JOIN tb_act_info a ON a.CRDN_YR = ii.CRDN_YR and a.CRDN_NO = ii.CRDN_NO AND a.ACT_NO = iti.ACT_NO AND a.DEL_YN = 'N'
LEFT JOIN tb_act_type act ON act.ACT_TYPE_CD = a.ACT_TYPE_CD
WHERE iti.IMPLT_INFO_ID = #{schImpltInfoId}
AND iti.ACT_NO = #{schActNo}
AND iti.DEL_YN = 'N'
ORDER BY iti.IMPLT_TRPR_SE_CD, iti.IMPLT_TRPR_FLNM
</select>

@ -25,11 +25,9 @@
<li>
<select id="schImpltTaskSeCd" name="schImpltTaskSeCd" class="input" style="width: 120px;">
<option value="">전체</option>
<c:forEach var="code" items="${impltTaskSeCdList}">
<option value="${code.cdId}" <c:if test="${param.schImpltTaskSeCd eq code.cdId}">selected</c:if>>
${code.cdNm}
</option>
</c:forEach>
<option value="1">처분사전</option>
<option value="2">시정명령</option>
<option value="3">시정촉구</option>
</select>
</li>
<li class="th">행정처분시작일</li>
@ -61,8 +59,8 @@
<li class="rig">
<span id="totalCount" class="total-count" style="padding-left: 25px;padding-right: 25px;">총 0건</span>
<select id="perPageSelect" class="input" style="width: 112px; ">
<option value="15">페이지당 10</option>
<option value="50">페이지당 20</option>
<option value="10">페이지당 10</option>
<option value="20">페이지당 20</option>
</select>
<span class="page_number"><span id="currentPage"></span><span class="bar">/</span><span id="totalPages"></span> Pages</span>
</li>
@ -202,6 +200,12 @@
width: 100,
sortable: true
},
{
header: '행위번호',
name: 'actNo',
align: 'center',
width: 60
},
{
header: '진행단계',
name: 'impltTaskSeCdNm',
@ -209,7 +213,7 @@
width: 100
},
{
header: '구분',
header: '지역구분',
name: 'rgnSeCdNm',
align: 'center',
width: 100
@ -238,6 +242,30 @@
return e.value ? moment(e.value).format('YYYY-MM-DD') : '';
}
},
{
header: '위치',
name: 'lotnoWholAddr',
align: 'left',
minWidth: 300,
formatter: function(e) {
return e.value;
}
},
{
header: '용도',
name: 'usgIdxCdNm',
align: 'left',
width: 130,
formatter: function(e) {
return e.value;
}
},
{
header : '행위유형',
name : 'actTypeCdNm',
align : 'center',
width : 140
},
{
header: '등록일시',
name: 'regDt',
@ -313,12 +341,9 @@
GRID_PAGINATION_INFO.perPage = responseObj.data.pagination.perPage;
//하단 그리드 초기화
NotiList.selectCdGroupId = '';
NotiList.schImpltInfoId = '';
NotiList.detailGrid.instance.readData(1);
}
// 선택된 행 초기화
NotiList.selectedRow = null;
});
this.instance.on('focusChange', function(ev) {
@ -329,6 +354,7 @@
NotiList.selectedRow = self.instance.getRow(ev.rowKey);
NotiList.schImpltInfoId = rowData.impltInfoId;
NotiList.schActNo = rowData.actNo;
NotiList.detailGrid.instance.readData(1);
});
@ -430,7 +456,7 @@
width : 60
},
{
header : '행위구분',
header : '행위유형',
name : 'actTypeCdNm',
align : 'center',
width : 140
@ -486,7 +512,7 @@
serializer : function(params) {
// 검색 폼 데이터
//setDetailSearchCond();
var searchParams = $.param({schImpltInfoId: NotiList.schImpltInfoId});
var searchParams = $.param({schImpltInfoId: NotiList.schImpltInfoId, schActNo: NotiList.schActNo });
//console.log(searchParams);
return searchParams;
}
@ -566,10 +592,6 @@
$('#perPageSelect').on('change', function() {
var perPage = parseInt($(this).val(), 10);
self.masterGrid.instance.setPerPage(perPage);
// 선택된 행 초기화
self.selectedRow = null;
});
},

Loading…
Cancel
Save