Browse Source

생활치료센터 활성 비활성 기능 추가

junekeunsong 4 years ago
parent
commit
1a3677f0ad

+ 2 - 1
src/main/java/com/lemon/lifecenter/controller/CenterController.java

@@ -243,7 +243,7 @@ public class CenterController extends LifeCenterController {
             }
         }
         
-        String param = "centerName=" + dto.getCenterName() + "&locationCode=" + dto.getLocationCode() + "&startDate=" + dto.getStartDate() + "&endDate=" + dto.getEndDate();
+        String param = "centerName=" + dto.getCenterName() + "&locationCode=" + dto.getLocationCode() + "&startDate=" + dto.getStartDate() + "&endDate=" + dto.getEndDate() + "&useYn=" + dto.getUseYn();
         paging = LifeCenterPaging.getInstance();
         paging.paging(config, total, page, param);
         
@@ -256,6 +256,7 @@ public class CenterController extends LifeCenterController {
         mv.addObject("locationCode", locationCode);
         mv.addObject("startDate", startDate);
         mv.addObject("endDate", endDate);
+        mv.addObject("useYn", dto.getUseYn());
         mv.addObject("centerName", centerName);
         mv.addObject("total", total);
         mv.addObject("item", result);

+ 8 - 0
src/main/java/com/lemon/lifecenter/dto/CenterInfoDTO.java

@@ -25,6 +25,8 @@ public class CenterInfoDTO {
     private String startDate = "";
     private String endDate = "";
     
+    private String useYn = "";
+    
     private int totalPatientH=0;
     private int totalPatientD=0;
     private int totalPatientT=0;
@@ -195,5 +197,11 @@ public class CenterInfoDTO {
     public void setLimitMax(int limitMax) {
         this.limitMax = limitMax;
     }
+    public String getUseYn() {
+        return useYn;
+    }
+    public void setUseYn(String useYn) {
+        this.useYn = useYn;
+    }
     
 }

+ 23 - 6
src/main/resources/mybatis/mapper/center/center.xml

@@ -21,9 +21,9 @@
         <![CDATA[
             INSERT INTO CENTER_INFO
                         (CENTER_NAME,     LOCATION_CODE,    COOPERATIVE_CODE,     JURISDICTION,    CENTER_ADDRESS,
-                         CENTER_NUMBER,   TOTAL_CAPACITY,   TOTAL_STAFF,          CREATE_DATE)
+                         CENTER_NUMBER,   TOTAL_CAPACITY,   TOTAL_STAFF,          CREATE_DATE,     USE_YN)
                  VALUES (#{centerName},   #{locationCode},  #{cooperativeCode},  #{jurisdiction}, #{centerAddress},
-                         #{centerNumber}, #{totalCapacity}, #{totalStaff}, NOW())
+                         #{centerNumber}, #{totalCapacity}, #{totalStaff}, NOW(), 'Y')
         ]]>
     </insert>
     
@@ -61,7 +61,8 @@
                    DATE_FORMAT(CI.UPDATE_DATE, '%Y-%m-%d %H:%i')      AS updateDate,
                    M.ID                                               AS staffId,
                    M.NAME                                             AS staffName,
-                   M.PHONE_NUMBER                                     AS staffPhoneNumber
+                   M.PHONE_NUMBER                                     AS staffPhoneNumber,
+                   CI.USE_YN                                          AS useYn
               FROM CENTER_INFO CI
               LEFT OUTER JOIN MEMBER M
                 ON CI.CENTER_CODE = M.CENTER_CODE
@@ -94,6 +95,11 @@
                 AND DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
             ]]>
         </if>
+        <if test='useYn != null and useYn != ""'>
+            <![CDATA[
+                AND CI.USE_YN = #{useYn}
+            ]]>
+        </if>
     </select>
     
     <select id="selectCenterList" parameterType="CenterInfoDTO" resultType="CenterInfoDTO">
@@ -119,7 +125,11 @@
                    ( SELECT COUNT(*) FROM patient_care WHERE center_code = CI.center_code AND state = 'D' ) AS totalPatientD,
                    ( SELECT COUNT(*) FROM patient_care WHERE center_code = CI.center_code AND state = 'T' ) AS totalPatientT,
                    ( SELECT COUNT(*) FROM patient_care WHERE center_code = CI.center_code AND state = 'E' ) AS totalPatientE,
-                   DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d %H:%i') AS createDate
+                   DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d %H:%i') AS createDate,
+                   CASE
+                     WHEN CI.USE_YN = 'Y' THEN '활성'
+                     WHEN CI.USE_YN = 'N' THEN '비활성'
+                   ELSE '' END AS useYn
               FROM CENTER_INFO CI
               LEFT OUTER JOIN MEMBER M
                 ON CI.CENTER_CODE = M.CENTER_CODE
@@ -141,6 +151,11 @@
                 AND DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
             ]]>
         </if>
+        <if test='useYn != null and useYn != ""'>
+            <![CDATA[
+                AND CI.USE_YN = #{useYn}
+            ]]>
+        </if>
         <![CDATA[
              ORDER BY CI.CENTER_NAME ASC
              LIMIT ${limit}, ${limitMax}
@@ -157,7 +172,8 @@
                    TOTAL_STAFF      = #{totalStaff},
                    COOPERATIVE_CODE = #{cooperativeCode},
                    JURISDICTION     = #{jurisdiction},
-                   CENTER_NAME      = #{centerName}
+                   CENTER_NAME      = #{centerName},
+                   USE_YN           = #{useYn}
              WHERE CENTER_CODE      = ${centerCode}
         ]]>
     </update>
@@ -177,7 +193,8 @@
         <![CDATA[
             SELECT CI.CENTER_CODE                                AS centerCode,
                    CI.CENTER_NAME                                AS centerName,
-                   M.ID                                          AS staffId
+                   M.ID                                          AS staffId,
+                   CI.USE_YN                                     AS useYn
               FROM CENTER_INFO CI
               LEFT OUTER JOIN MEMBER M
                 ON CI.CENTER_CODE = M.CENTER_CODE

+ 9 - 6
src/main/resources/mybatis/mapper/mobile/login.xml

@@ -4,13 +4,16 @@
 <mapper namespace="com.lemon.lifecenter.mapper.MobilePatientMapper">
     <select id="selectMPatientCount" parameterType="PatientDTO" resultType="int">
         <![CDATA[
-            SELECT COUNT(*) total
-              FROM PATIENT_CARE
+            SELECT COUNT(*) AS total
+              FROM PATIENT_CARE PC
+              LEFT JOIN CENTER_INFO CI
+                ON PC.CENTER_CODE = CI.CENTER_CODE
              WHERE 1 = 1
-               AND ID = #{id}
-               AND PW = #{pw}
-               AND CENTER_CODE = #{centerCode}
-               AND STATE = 'H'
+               AND PC.ID = #{id}
+               AND PC.PW = #{pw}
+               AND PC.CENTER_CODE = #{centerCode}
+               AND PC.STATE = 'H'
+               AND CI.USE_YN = 'Y'
         ]]>
     </select>
     

+ 16 - 1
src/main/webapp/WEB-INF/jsp/center/edit.jsp

@@ -127,9 +127,24 @@ $( function(){
                                             </tr>
                                             <tr>
                                                 <th><span class="fix">*</span>전화번호</th>
-                                                <td colspan="3">
+                                                <td>
                                                     <input type="text" class="form-control" name="centerNumber" value="${centerInfo.centerNumber}" required onkeypress="onlyNumber();">
                                                 </td>
+                                                <th><span class="fix">*</span>상태</th>
+                                                <td>
+                                                    <label class="form-check form-check-inline">
+                                                        <input class="form-check-input" type="radio" name="useYn" value="Y" <c:if test="${centerInfo.useYn eq 'Y'}">checked="checked"</c:if>>
+                                                        <span class="form-check-label">
+                                                          활성화
+                                                        </span>
+                                                    </label>
+                                                    <label class="form-check form-check-inline">
+                                                        <input class="form-check-input" type="radio" name="useYn" value="N" <c:if test="${centerInfo.useYn eq 'N'}">checked="checked"</c:if>>
+                                                        <span class="form-check-label">
+                                                          비활성
+                                                        </span>
+                                                    </label>
+                                                </td>
                                             </tr>
                                             <tr>
                                                 <th><span class="fix">*</span>수용인원(명)</th>

+ 7 - 0
src/main/webapp/WEB-INF/jsp/center/info.jsp

@@ -134,6 +134,13 @@ function pwReset() {
                                                 <c:out value="${centerInfo.updateDate}" />
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <th>상태</th>
+                                            <td colspan="3">
+                                                <c:if test="${centerInfo.useYn eq 'Y'}">활성</c:if>
+                                                <c:if test="${centerInfo.useYn ne 'Y'}">비활성</c:if>
+                                            </td>
+                                        </tr>
                                     </table>
                                     <div class="row mt-3">
                                         <div class="col-12">

+ 22 - 4
src/main/webapp/WEB-INF/jsp/center/list.jsp

@@ -142,9 +142,9 @@ function getExcel(){
                                             </tr>
                                             <tr>
                                                 <th>등록일</th>
-                                                <td colspan="3">
+                                                <td>
                                                     <div class="row">
-                                                        <div class="col-lg-4 col-sm-5">
+                                                        <div class="col-lg-5 col-sm-5">
                                                             <div class="form-group calendar-bar mb-xl-0">
                                                                 <input class="form-control" type="text" name="startDate" placeholder="검색 시작일자" autocomplete="off">
                                                                 <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
@@ -153,12 +153,27 @@ function getExcel(){
                                                         <div class="col-lg-2 col-sm-2 text-center">
                                                             ~
                                                         </div>
-                                                        <div class="col-lg-4 col-sm-5">
+                                                        <div class="col-lg-5 col-sm-5">
                                                             <div class="form-group calendar-bar mb-xl-0">
                                                                 <input class="form-control" type="text" name="endDate" placeholder="검색 종료일자" autocomplete="off">
                                                                 <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
                                                             </div>
                                                         </div>
+<!--                                                         <div class="col-sm-12 col-lg-2"> -->
+<!--                                                             <button class="btn btn-primary">검색</button> -->
+<!--                                                         </div> -->
+                                                    </div>
+                                                </td>
+                                                <th>상태</th>
+                                                <td>
+                                                    <div class="row">
+                                                        <div class="col-lg-5 col-sm-5">
+                                                            <select class="custom-select form-control" name="useYn">
+                                                                <option value="">전체</option>
+                                                                <option value="Y" <c:if test="${useYn eq 'Y'}">selected="selected"</c:if>>활성</option>
+                                                                <option value="N" <c:if test="${useYn eq 'N'}">selected="selected"</c:if>>비활성</option>
+                                                            </select>
+                                                        </div>
                                                         <div class="col-sm-12 col-lg-2">
                                                             <button class="btn btn-primary">검색</button>
                                                         </div>
@@ -199,6 +214,7 @@ function getExcel(){
                                                 <col style=" width: 5%; ">
                                                 <col style=" width: 6%; ">
                                                 <col style=" width: 8%; ">
+                                                <col style=" width: 5%; ">
                                             </colgroup>
                                             <thead>
                                                 <tr>
@@ -210,6 +226,7 @@ function getExcel(){
                                                     <th rowspan="2">전화번호</th>
                                                     <th colspan="5">인원 수 (단위 : 명)</th>
                                                     <th rowspan="2">등록일시</th>
+                                                    <th rowspan="2">상태</th>
                                                 </tr>
                                                 <tr>
                                                     <th>의료진</th>
@@ -241,12 +258,13 @@ function getExcel(){
                                                                 <td><c:out value="${l.totalPatientD}" /></td>
                                                                 <td><c:out value="${l.totalPatientT}" /></td>
                                                                 <td><c:out value="${l.createDate}" /></td>
+                                                                <td><c:out value="${l.useYn}" /></td>
                                                             </tr>
                                                         </c:forEach>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <tr>
-                                                            <td colspan="9">등록된 생활치료센터가 없습니다.</td>
+                                                            <td colspan="13">등록된 생활치료센터가 없습니다.</td>
                                                         </tr>
                                                     </c:otherwise>
                                                 </c:choose>