생활치료센터 활성 비활성 문구 및 기능 수정

src/main/java/com/lemon/lifecenter/controller/CenterController.java

@@ -158,35 +158,21 @@ public class CenterController extends LifeCenterController {
             @RequestParam(value="staffName", required=true) String staffName,
             @RequestParam(value="staffPhoneNumber", required=true) String staffPhoneNumber,
             HttpServletRequest request, HttpServletResponse response ) throws Exception {
-        String sesGroupIdx  = LifeCenterSessionController.getSession( request, "sesGroupIdx" );
-        String referer      = request.getHeader( "Referer" );
         
-        if( !sesGroupIdx.equals( "1" ) ) {
-            LifeCenterFunction.scriptMessage( response, "alertBox({ txt : '권한이 없습니다.', callBack : function(){ location.href='" + referer + "'} });" );
-            return "/common/blank";
-        } else {
-            StaffDTO memberDTO = new StaffDTO();
-            LoginDTO loginDTO  = new LoginDTO();
-            loginDTO.setId( staffId );
-            
-            int memberTotal = loginService.selectMemberIdCount( loginDTO );
+        logger.error("expirationDate -- > " + dto.getExpirationDate());
+
+        StaffDTO memberDTO = new StaffDTO();
+        
+        String address = dto.getCenterAddress() + "|" + detailAddr;
+        dto.setCenterAddress( address );
+        int result = centerService.updateCenterInfo( dto );
+        
+        if (result > 0) {
+            memberDTO.setId( staffId );
+            memberDTO.setName( staffName );
+            memberDTO.setPhoneNumber(staffPhoneNumber);
             
-            if( memberTotal == 1 ) {
-                String address = dto.getCenterAddress() + "|" + detailAddr;
-                dto.setCenterAddress( address );
-                int result = centerService.updateCenterInfo( dto );
-                
-                if (result > 0) {
-                    memberDTO.setId( staffId );
-                    memberDTO.setName( staffName );
-                    memberDTO.setPhoneNumber(staffPhoneNumber);
-                    
-                    memberService.updateMember( memberDTO );
-                }
-            } else {
-                LifeCenterFunction.scriptMessage( response, "alertBox({ txt : '비밀번호가 일치하지않습니다.', callBack : function(){ location.href='../edit?centerCode="+dto.getCenterCode()+"'} });" );
-                return "/common/blank";
-            }
+            memberService.updateMember( memberDTO );
         }
         
         return "redirect:/center/info?centerCode=" + dto.getCenterCode();

src/main/java/com/lemon/lifecenter/controller/LoginController.java

@@ -115,7 +115,7 @@ public class LoginController extends LifeCenterController {
                 logger.info( "[LOGIN FAILED] RemoteIP : " + remoteIp + " ID : " + dto.getId() );
                 
                 resultCode = "03";
-                message    = "사용이 중지된 생활치료센터입니다. 관리자에게 문의하세요.";
+                message    = "운영이 종료된 생활치료센터 입니다. 시스템관리자(02-6263-8377)에게 문의하세요";
                 
                 accessMap.put( "successYn", "N" );
                 accessMap.put( "logMessage" , message );

src/main/java/com/lemon/lifecenter/dto/CenterInfoDTO.java

@@ -15,6 +15,7 @@ public class CenterInfoDTO {
     private int totalStaff = 0;
     private String createDate = "";
     private String updateDate = "";
+    private String expirationDate = "";
     private String centerAddress = "";
     
     private String locationName = "";
@@ -143,6 +144,12 @@ public class CenterInfoDTO {
     public void setUpdateDate(String updateDate) {
         this.updateDate = updateDate;
     }
+    public String getExpirationDate() {
+        return expirationDate;
+    }
+    public void setExpirationDate(String expirationDate) {
+        this.expirationDate = expirationDate;
+    }
     public String getCenterAddress() {
         return centerAddress;
     }

src/main/resources/mybatis/mapper/center/center.xml

@@ -57,12 +57,13 @@
                    CI.CENTER_NUMBER                                   AS centerNumber,
                    CI.TOTAL_CAPACITY                                  AS totalCapacity,
                    CI.TOTAL_STAFF                                     AS totalStaff,
-                   DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d %H:%i')      AS createDate,
+                   DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d')      AS createDate,
                    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,
-                   CI.USE_YN                                          AS useYn
+                   CI.USE_YN                                          AS useYn,
+                   DATE_FORMAT(CI.EXPIRATION_DATE, '%Y-%m-%d')  AS expirationDate
               FROM CENTER_INFO CI
               LEFT OUTER JOIN MEMBER M
                 ON CI.CENTER_CODE = M.CENTER_CODE
@@ -125,10 +126,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') AS createDate,
+                   IFNULL(DATE_FORMAT(CI.EXPIRATION_DATE, '%Y-%m-%d'), '') AS expirationDate,
                    CASE
-                     WHEN CI.USE_YN = 'Y' THEN '활성'
-                     WHEN CI.USE_YN = 'N' THEN '비활성'
+                     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
@@ -174,6 +176,18 @@
                    JURISDICTION     = #{jurisdiction},
                    CENTER_NAME      = #{centerName},
                    USE_YN           = #{useYn}
+        ]]>
+        <if test='useYn == "N"'>
+            <![CDATA[
+                , EXPIRATION_DATE = #{expirationDate}
+            ]]>
+        </if>
+        <if test='useYn == "Y"'>
+            <![CDATA[
+                , EXPIRATION_DATE = null
+            ]]>
+        </if>
+        <![CDATA[
              WHERE CENTER_CODE      = ${centerCode}
         ]]>
     </update>

src/main/webapp/WEB-INF/jsp/center/edit.jsp

@@ -39,6 +39,42 @@ $( function(){
             form.submit();
         }
     });
+
+    $( "input.date-no-req" ).daterangepicker({
+        singleDatePicker : true,
+        showDropdowns : true,
+        locale : {
+            format : "YYYY-MM-DD"
+        },
+        autoUpdateInput: false,
+        maxDate : new Date(),
+        minDate : "1900-01-01"
+    }).on( "apply.daterangepicker", function( ev, picker ) {
+        $(this).val(picker.startDate.format('YYYY-MM-DD'));
+    });
+
+    if ($("input[name=useYn]:checked").val() == "Y") {
+        $("#expirationDate").prop("disabled", true);
+    } else {
+        $("#expirationDate").prop("disabled", false);
+    }
+
+    $("input[name=useYn]").click(function() {
+        console.log("aaa --> " + $("input[name=useYn]:checked").val());
+        var useYn = $("input[name=useYn]:checked").val();
+        var nowDate = moment().format("YYYY-MM-DD");
+        if (useYn == "Y") {
+            $("#expirationDate").val("");
+            $("#expirationDate").prop("disabled", true);
+        } else {
+            $("#expirationDate").val(nowDate);
+            $("#expirationDate").prop("disabled", false);
+        }
+    });
+
+//     $("input[name=useYn]").on("change", function(){
+//         console.log("aaa --> " + $("input[name=useYn]:checked").val());
+//     });
 })
 </script>
 </head>
@@ -135,15 +171,24 @@ $( function(){
                                                     <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>
+                                                    <label>
+                                                        <c:set var="now" value="<%=new java.util.Date()%>" />
+                                                        <c:set var="sysYmd"><fmt:formatDate value="${now}" pattern="yyyy-MM-dd" /></c:set>
+                                                            
+                                                        <div class="form-group calendar-bar mb-xl-0">
+                                                            <input class="form-control date-no-req" type="text" value="${centerInfo.expirationDate}" onKeyup="inputYMDNumber(this);" name="expirationDate" id="expirationDate" autocomplete="off">
+                                                            <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
+                                                        </div>
+                                                     </label>
                                                 </td>
                                             </tr>
                                             <tr>

src/main/webapp/WEB-INF/jsp/center/info.jsp

@@ -139,8 +139,8 @@ function pwReset() {
                                         <tr>
                                             <th>상태</th>
                                             <td colspan="3">
-                                                <c:if test="${centerInfo.useYn eq 'Y'}">활성</c:if>
-                                                <c:if test="${centerInfo.useYn ne 'Y'}">비활성</c:if>
+                                                <c:if test="${centerInfo.useYn eq 'Y'}">운영중</c:if>
+                                                <c:if test="${centerInfo.useYn ne 'Y'}">운영종료 (<c:out value="${centerInfo.expirationDate}" />)</c:if>
                                             </td>
                                         </tr>
                                     </table>

src/main/webapp/WEB-INF/jsp/center/list.jsp

@@ -213,6 +213,7 @@ function getExcel(){
                                                 <col style=" width: 5%; ">
                                                 <col style=" width: 6%; ">
                                                 <col style=" width: 8%; ">
+                                                <col style=" width: 8%; ">
                                                 <col style=" width: 5%; ">
                                             </colgroup>
                                             <thead>
@@ -225,6 +226,7 @@ function getExcel(){
                                                     <th rowspan="2">전화번호</th>
                                                     <th colspan="5">인원 수 (단위 : 명)</th>
                                                     <th rowspan="2">등록일시</th>
+                                                    <th rowspan="2">종료일</th>
                                                     <th rowspan="2">상태</th>
                                                 </tr>
                                                 <tr>
@@ -257,6 +259,15 @@ 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:if test="${l.expirationDate eq ''}">
+                                                                        -
+                                                                    </c:if>
+                                                                    <c:if test="${l.expirationDate ne ''}">
+                                                                        <c:out value="${l.expirationDate}" />
+                                                                    </c:if>
+                                                                    
+                                                                </td>
                                                                 <td><c:out value="${l.useYn}" /></td>
                                                             </tr>
                                                         </c:forEach>