기준 자료 > 위치지수, 위반법규 : 조회조건 사용여부 추가(사용,미사용) > 등록,수정 시 사용여부 선택 가능, 삭제 버튼 주석처리

3 months ago · 75958c5060
parent e821dca4b9
commit 75958c5060
8 changed files with 91 additions and 17 deletions
--- a/src/main/java/go/kr/project/baseData/pstnIdx/model/PstnIdxVO.java
+++ b/src/main/java/go/kr/project/baseData/pstnIdx/model/PstnIdxVO.java
@ -63,4 +63,8 @@ public class PstnIdxVO extends PagingVO {

    /** 검색 입력 텍스트  */
    private String schTypeTxt;
+
+    /** 조회조건 : 사용여부  */
+    private String schDelYn; // N:사용 Y:미사용
+
 }
--- a/src/main/java/go/kr/project/baseData/vltnLwrg/model/VltnLwrgVO.java
+++ b/src/main/java/go/kr/project/baseData/vltnLwrg/model/VltnLwrgVO.java
@ -63,4 +63,7 @@ public class VltnLwrgVO extends PagingVO {

    /** 검색 입력 텍스트  */
    private String schTypeTxt;
+
+    /** 조회조건 : 사용여부  */
+    private String schDelYn; // N:사용 Y:미사용
 }
--- a/src/main/resources/mybatis/mapper/baseData/pstnIdx/PstnIdxMapper_maria.xml
+++ b/src/main/resources/mybatis/mapper/baseData/pstnIdx/PstnIdxMapper_maria.xml
@ -19,10 +19,13 @@
            DEL_DT,
            DLTR
        FROM tb_pstn_idx
-        WHERE DEL_YN = 'N'
+        WHERE 1=1
        <if test='schType == "1" and schTypeTxt != null and schTypeTxt != ""'>
            AND PSTN_IDX_NO LIKE CONCAT('%', #{schTypeTxt}, '%')
        </if>
+        <if test="schDelYn != null and schDelYn != ''">
+            AND DEL_YN = #{schDelYn}
+        </if>
        ORDER BY CAST(PSTN_IDX_NO AS UNSIGNED) asc
        <if test='pagingYn != null and pagingYn == "Y"'>
            limit #{startIndex}, #{perPage}    /* 서버사이드 페이징 처리 */
@ -34,10 +37,13 @@
        /* PstnIdxMapper.selectListTotalCount : 위치지수 목록 총 개수 조회 */
        SELECT COUNT(*)
        FROM tb_pstn_idx
-        WHERE DEL_YN = 'N'
+        WHERE 1=1
        <if test='schType == "1" and schTypeTxt != null and schTypeTxt != ""'>
            AND PSTN_IDX_NO LIKE CONCAT('%', #{schTypeTxt}, '%')
        </if>
+        <if test="schDelYn != null and schDelYn != ''">
+            AND DEL_YN = #{schDelYn}
+        </if>
    </select>

    <!-- 위치지수 단건 조회 -->
@ -56,8 +62,7 @@
            DEL_DT,
            DLTR
        FROM tb_pstn_idx
-        WHERE DEL_YN = 'N'
-        AND PSTN_IDX_NO= #{pstnIdxNo}
+        WHERE PSTN_IDX_NO= #{pstnIdxNo}
    </select>

    <!--
@ -89,7 +94,7 @@
            #{pstnIdx},
            NOW(),
            #{rgtr},
-            'N'
+            #{delYn}
         )
    </insert>

@ -101,9 +106,9 @@
            BLDG_ANX_LAND_END_PRC = #{bldgAnxLandEndPrc},
            PSTN_IDX = #{pstnIdx},
            MDFCN_DT = NOW(),
-            MDFR = #{mdfr}
+            MDFR = #{mdfr},
+            DEL_YN = #{delYn}
        WHERE PSTN_IDX_NO = #{pstnIdxNo}
-          AND DEL_YN = 'N'
    </update>

    <!-- 위치지수 삭제 -->
--- a/src/main/resources/mybatis/mapper/baseData/vltnLwrg/VltnLwrgMapper_maria.xml
+++ b/src/main/resources/mybatis/mapper/baseData/vltnLwrg/VltnLwrgMapper_maria.xml
@ -19,10 +19,13 @@
            DEL_DT,
            DLTR
        FROM tb_vltn_lwrg
-        WHERE DEL_YN = 'N'
+        WHERE 1=1
        <if test='schType == "1" and schTypeTxt != null and schTypeTxt != ""'>
            AND VLTN_LAW LIKE CONCAT('%', #{schTypeTxt}, '%')
        </if>
+        <if test="schDelYn != null and schDelYn != ''">
+            AND DEL_YN = #{schDelYn}
+        </if>
        ORDER BY CAST(VLTN_LWRG_CD AS UNSIGNED) asc
        <if test='pagingYn != null and pagingYn == "Y"'>
            limit #{startIndex}, #{perPage}    /* 서버사이드 페이징 처리 */
@ -34,10 +37,13 @@
        /* VltnLwrgMapper.selectListTotalCount : 위반법규 목록 총 개수 조회 */
        SELECT COUNT(*)
        FROM tb_vltn_lwrg
-        WHERE DEL_YN = 'N'
+        WHERE 1=1
        <if test='schType == "1" and schTypeTxt != null and schTypeTxt != ""'>
            AND VLTN_LWRG_CD LIKE CONCAT('%', #{schTypeTxt}, '%')
        </if>
+        <if test="schDelYn != null and schDelYn != ''">
+            AND DEL_YN = #{schDelYn}
+        </if>
    </select>

    <!-- 위반법규 단건 조회 -->
@ -56,8 +62,7 @@
            DEL_DT,
            DLTR
        FROM tb_vltn_lwrg
-        WHERE DEL_YN = 'N'
-        AND VLTN_LWRG_CD= #{vltnLwrgCd}
+        WHERE VLTN_LWRG_CD= #{vltnLwrgCd}
    </select>

    <!--
@ -89,7 +94,7 @@
            #{impltLaw},
            NOW(),
            #{rgtr},
-            'N'
+            #{delYn}
         )
    </insert>

@ -101,9 +106,9 @@
            CRC_LAW = #{crcLaw},
            IMPLT_LAW = #{impltLaw},
            MDFCN_DT = NOW(),
-            MDFR = #{mdfr}
+            MDFR = #{mdfr},
+            DEL_YN = #{delYn}
        WHERE VLTN_LWRG_CD = #{vltnLwrgCd}
-          AND DEL_YN = 'N'
    </update>

    <!-- 위반법규 삭제 -->
--- a/src/main/webapp/WEB-INF/views/baseData/pstnIdx/list.jsp
+++ b/src/main/webapp/WEB-INF/views/baseData/pstnIdx/list.jsp
@ -28,6 +28,13 @@
                <li>
                    <input type="text" id="schTypeTxt" name="schTypeTxt" maxlength="13" class="input" style="width: 120px;" autocomplete="off"/>
                </li>
+                <li class="th">사용 여부</li>
+                <li>
+                    <select id="schDelYn" name="schDelYn" class="input">
+                        <option value="N">사용</option>
+                        <option value="Y">미사용</option>
+                    </select>
+                </li>
            </ul>
            <ul class="rig2">
                <li><button type="button" id="search_btn" class="newbtnss bg1">검색</button></li>
@ -83,9 +90,11 @@
        var setSearchCond = function() {
            var schType = $.trim(nvl($("#schType").val(), ""));
            var schTypeTxt = $.trim(nvl($("#schTypeTxt").val(), ""));
+            var schDelYn = $.trim(nvl($("#schDelYn").val(), ""));

            SEARCH_COND.schType = schType;
            SEARCH_COND.schTypeTxt = schTypeTxt;
+            SEARCH_COND.schDelYn = schDelYn;
        };


@ -224,6 +233,15 @@
                            name: 'mdfcnDt',
                            align: 'center',
                            width: 150
+                        },
+                        {
+                            header: '사용여부',
+                            name: 'delYn',
+                            align: 'center',
+                            width: 150,
+                            formatter: function(e) {
+                                return e.value === 'Y' ? '미사용' : '사용';
+                            }
                        }
                    ];
                },
@ -371,6 +389,8 @@
                $("#reset_btn").on('click', function() {
                    // 모든 검색 조건 초기화
                    $("#schTypeTxt").val("");
+                    // 라디오 버튼 초기화 (N값 선택)
+                    $("#schDelYn").val("N");
                    
                    // 그리드 데이터 새로고침
                    self.grid.instance.readData(1);
--- a/src/main/webapp/WEB-INF/views/baseData/pstnIdx/pstnIdxRegistPopup.jsp
+++ b/src/main/webapp/WEB-INF/views/baseData/pstnIdx/pstnIdxRegistPopup.jsp
@ -50,6 +50,15 @@
                                       value="${data.pstnIdx}" validation-check="required" maxlength="100"/>
                            </td>
                        </tr>
+                        <tr>
+                            <th class="th"><span class="required">*</span> 사용 여부</th>
+                            <td colspan="3">
+                                <select id="delYn" name="delYn" class="input" validation-check="required">
+                                    <option value="N" <c:if test="${data.delYn eq 'N'}">selected</c:if>>사용</option>
+                                    <option value="Y" <c:if test="${data.delYn eq 'Y'}">selected</c:if>>미사용</option>
+                                </select>
+                            </td>
+                        </tr>
                    </table>
                </form>
            </div>
@ -57,7 +66,7 @@
        <div class="popup_foot">
            <c:choose>
                <c:when test="${param.mode eq 'V'}">
-                    <a href="#" id="btnDelete" class="newbtns bg6">삭제</a>
+                    <%--<a href="#" id="btnDelete" class="newbtns bg6">삭제</a>--%>
                    <a href="#" id="btnSave" class="newbtns bg4">수정</a>
                </c:when>
                <c:otherwise>
--- a/src/main/webapp/WEB-INF/views/baseData/vltnLwrg/list.jsp
+++ b/src/main/webapp/WEB-INF/views/baseData/vltnLwrg/list.jsp
@ -28,6 +28,13 @@
                <li>
                    <input type="text" id="schTypeTxt" name="schTypeTxt" maxlength="13" class="input" style="width: 120px;" autocomplete="off"/>
                </li>
+                <li class="th">사용 여부</li>
+                <li>
+                    <select id="schDelYn" name="schDelYn" class="input">
+                        <option value="N">사용</option>
+                        <option value="Y">미사용</option>
+                    </select>
+                </li>
            </ul>
            <ul class="rig2">
                <li><button type="button" id="search_btn" class="newbtnss bg1">검색</button></li>
@ -83,9 +90,11 @@
        var setSearchCond = function() {
            var schType = $.trim(nvl($("#schType").val(), ""));
            var schTypeTxt = $.trim(nvl($("#schTypeTxt").val(), ""));
+            var schDelYn = $.trim(nvl($("#schDelYn").val(), ""));

            SEARCH_COND.schType = schType;
            SEARCH_COND.schTypeTxt = schTypeTxt;
+            SEARCH_COND.schDelYn = schDelYn;
        };


@ -216,6 +225,15 @@
                            name: 'mdfcnDt',
                            align: 'center',
                            width: 150
+                        },
+                        {
+                            header: '사용여부',
+                            name: 'delYn',
+                            align: 'center',
+                            width: 150,
+                            formatter: function(e) {
+                                return e.value === 'Y' ? '미사용' : '사용';
+                            }
                        }
                    ];
                },
@ -363,7 +381,8 @@
                $("#reset_btn").on('click', function() {
                    // 모든 검색 조건 초기화
                    $("#schTypeTxt").val("");
-                    
+                    $("#schDelYn").val("N");
+
                    // 그리드 데이터 새로고침
                    self.grid.instance.readData(1);
                });
--- a/src/main/webapp/WEB-INF/views/baseData/vltnLwrg/vltnLwrgRegistPopup.jsp
+++ b/src/main/webapp/WEB-INF/views/baseData/vltnLwrg/vltnLwrgRegistPopup.jsp
@ -50,6 +50,15 @@
                                       value="${data.impltLaw}" validation-check="required" maxlength="100" />
                            </td>
                        </tr>
+                        <tr>
+                            <th class="th"><span class="required">*</span> 사용 여부</th>
+                            <td colspan="3">
+                                <select id="delYn" name="delYn" class="input" validation-check="required">
+                                    <option value="N" <c:if test="${data.delYn eq 'N'}">selected</c:if>>사용</option>
+                                    <option value="Y" <c:if test="${data.delYn eq 'Y'}">selected</c:if>>미사용</option>
+                                </select>
+                            </td>
+                        </tr>
                    </table>
                </form>
            </div>
@ -57,7 +66,7 @@
        <div class="popup_foot">
            <c:choose>
                <c:when test="${param.mode eq 'V'}">
-                    <a href="#" id="btnDelete" class="newbtns bg6">삭제</a>
+                    <%--<a href="#" id="btnDelete" class="newbtns bg6">삭제</a>--%>
                    <a href="#" id="btnSave" class="newbtns bg4">수정</a>
                </c:when>
                <c:otherwise>