생황치료센터 리스트 추가

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

@@ -18,6 +18,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.lemon.lifecenter.common.LifeCenterConfigVO;
 import com.lemon.lifecenter.common.LifeCenterController;
 import com.lemon.lifecenter.common.LifeCenterFunction;
+import com.lemon.lifecenter.common.LifeCenterPaging;
 import com.lemon.lifecenter.dto.CenterInfoDTO;
 import com.lemon.lifecenter.dto.LocationDTO;
 import com.lemon.lifecenter.dto.MemberDTO;
@@ -36,6 +37,7 @@ public class CenterController extends LifeCenterController {
     private MemberService memberService;
     @Autowired
     private LifeCenterConfigVO config;
+    private LifeCenterPaging paging;
     
     @RequestMapping("/new")
     public ModelAndView centerNew() {
@@ -48,7 +50,8 @@ public class CenterController extends LifeCenterController {
     
     @RequestMapping("/newProc")
     @Transactional(propagation=Propagation.REQUIRED)
-    public String centerNewProc(@ModelAttribute("dto") final CenterInfoDTO dto,
+    public String centerNewProc(
+            @ModelAttribute("dto") final CenterInfoDTO dto,
             @RequestParam(value="detailAddr", required=true) String detailAddr,
             @RequestParam(value="staffId", required=true) String staffId,
             @RequestParam(value="staffPw", required=true) String staffPw,
@@ -90,9 +93,39 @@ public class CenterController extends LifeCenterController {
     }
 
     @RequestMapping("/list")
-    public ModelAndView centerList() {
+    public ModelAndView centerList(
+            @ModelAttribute("dto") final CenterInfoDTO dto,
+            @RequestParam(value="page", required=false, defaultValue="1") int page,
+            @RequestParam(value="centerName", required=false, defaultValue="") String centerName,
+            @RequestParam(value="locationCode", required=false, defaultValue="") String locationCode,
+            @RequestParam(value="startDate", required=false, defaultValue="") String startDate,
+            @RequestParam(value="endDate", required=false, defaultValue="") String endDate) {
+        
+        dto.setLimit( ( Integer.valueOf( page ) - 1 ) * config.pageDataSize );
+        dto.setLimitMax( config.pageDataSize );
+        
+        List<LocationDTO> list = centerService.selectLocation();
+        
+        int total = centerService.selectCenterCount(dto);
+        List<CenterInfoDTO> result = new ArrayList<CenterInfoDTO>();
+        if (total > 0) {
+            result = centerService.selectCenterList(dto);
+        }
+        
+        String param = "centerName=" + dto.getCenterName() + "&locationCode=" + dto.getLocationCode() + "&startDate=" + dto.getStartDate() + "&endDate=" + dto.getEndDate();
+        paging = LifeCenterPaging.getInstance();
+        paging.paging(config, total, page, param);
+        
         ModelAndView mv = setMV("center/list");
-
+        mv.addObject("locationList", list);
+        mv.addObject("locationCode", locationCode);
+        mv.addObject("startDate", startDate);
+        mv.addObject("endDate", endDate);
+        mv.addObject("centerName", centerName);
+        mv.addObject("total", total);
+        mv.addObject("item", result);
+        mv.addObject("paging", paging);
+        
         return mv;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.lemon.lifecenter.dto;
 
 public class CenterInfoDTO {
+    private String num = "";
     private int centerCode = 0;
     private String centerName = "";
     private String locationCode = "";
@@ -17,6 +18,18 @@ public class CenterInfoDTO {
     private String staffName = "";
     private String staffPhoneNumber = "";
     
+    private String startDate = "";
+    private String endDate = "";
+    
+    private int limit = 0;
+    private int limitMax = 0;
+    
+    public String getNum() {
+        return num;
+    }
+    public void setNum(String num) {
+        this.num = num;
+    }
     public int getCenterCode() {
         return centerCode;
     }
@@ -101,4 +114,29 @@ public class CenterInfoDTO {
     public void setStaffPhoneNumber(String staffPhoneNumber) {
         this.staffPhoneNumber = staffPhoneNumber;
     }
+    public String getStartDate() {
+        return startDate;
+    }
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+    public String getEndDate() {
+        return endDate;
+    }
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+    public int getLimit() {
+        return limit;
+    }
+    public void setLimit(int limit) {
+        this.limit = limit;
+    }
+    public int getLimitMax() {
+        return limitMax;
+    }
+    public void setLimitMax(int limitMax) {
+        this.limitMax = limitMax;
+    }
+
 }

src/main/java/com/lemon/lifecenter/mapper/CenterMapper.java

@@ -15,4 +15,6 @@ public interface CenterMapper {
     public List<LocationDTO> selectLocation();
     public void insertCenter(CenterInfoDTO dto) throws Exception;
     public CenterInfoDTO selectCenterInfo(CenterInfoDTO dto);
+    public int selectCenterCount(CenterInfoDTO dto);
+    public List<CenterInfoDTO> selectCenterList(CenterInfoDTO dto);
 }

src/main/java/com/lemon/lifecenter/service/CenterService.java

@@ -27,4 +27,12 @@ public class CenterService {
     public CenterInfoDTO selectCenterInfo(CenterInfoDTO dto) {
         return mapper.selectCenterInfo(dto);
     }
+    
+    public int selectCenterCount(CenterInfoDTO dto) {
+        return mapper.selectCenterCount(dto);
+    }
+    
+    public List<CenterInfoDTO> selectCenterList(CenterInfoDTO dto) {
+        return mapper.selectCenterList(dto);
+    }
 }

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

@@ -48,4 +48,70 @@
              WHERE CI.CENTER_CODE = #{centerCode}
         ]]>
     </select>
+    
+    <select id="selectCenterCount" parameterType="CenterInfoDTO" resultType="int">
+        <![CDATA[
+            SELECT COUNT(*) AS total
+              FROM CENTER_INFO CI
+              LEFT OUTER JOIN MEMBER M
+                ON CI.CENTER_CODE = M.CENTER_CODE
+             WHERE 1 = 1
+        ]]>
+        <if test='locationCode != null and locationCode != ""'>
+            <![CDATA[
+                   AND CI.LOCATION_CODE = #{locationCode}
+            ]]>
+        </if>
+        <if test='centerName != null and centerName != ""'>
+            <![CDATA[
+                AND CI.CENTER_NAME LIKE CONCAT('%', #{centerName}, '%')
+            ]]>
+        </if>
+        <if test='startDate != null and startDate != "" and endDate != null and endDate != ""'>
+            <![CDATA[
+                AND DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+            ]]>
+        </if>
+    </select>
+    
+    <select id="selectCenterList" parameterType="CenterInfoDTO" resultType="CenterInfoDTO">
+        <![CDATA[
+            SELECT ROWNUM                                        AS num,
+                   CI.CENTER_CODE                                AS centerCode,
+                   CI.CENTER_NAME                                AS centerName,
+                   (SELECT LOCATION_NAME
+                      FROM LOCATION_INFO LI
+                     WHERE LI.LOCATION_CODE = CI.LOCATION_CODE)  AS locationName,
+                   M.NAME                                        AS staffName,
+                   M.PHONE_NUMBER                                AS staffPhoneNumber,
+                   CI.CENTER_NUMBER                              AS centerNumber,
+                   CI.TOTAL_PATIENT                              AS totalPatient,
+                   CI.TOTAL_CAPACITY                             AS totalCapacity,
+                   CI.TOTAL_STAFF                                AS totalStaff,
+                   DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d %H:%i') AS createDate
+              FROM CENTER_INFO CI
+              LEFT OUTER JOIN MEMBER M
+                ON CI.CENTER_CODE = M.CENTER_CODE
+             WHERE 1 = 1
+        ]]>
+        <if test='locationCode != null and locationCode != ""'>
+            <![CDATA[
+                   AND CI.LOCATION_CODE = #{locationCode}
+            ]]>
+        </if>
+        <if test='centerName != null and centerName != ""'>
+            <![CDATA[
+                AND CI.CENTER_NAME LIKE CONCAT('%', #{centerName}, '%')
+            ]]>
+        </if>
+        <if test='startDate != null and startDate != "" and endDate != null and endDate != ""'>
+            <![CDATA[
+                AND DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+            ]]>
+        </if>
+        <![CDATA[
+             ORDER BY num DESC
+             LIMIT ${limit}, ${limitMax}
+        ]]>
+    </select>
 </mapper>

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

@@ -125,7 +125,7 @@
                                     <div class="row mt-3">
                                         <div class="col-12">
                                             <div class="text-right">
-                                                <button class="btn btn-primary w100">확인</button>
+                                                <button class="btn btn-primary w100" onclick="location.href='./list';">확인</button>
                                             </div>
                                         </div>
                                     </div>

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

@@ -28,9 +28,21 @@
                 format: "M/DD hh:mm A"
             }
         });
-        $("input[name=\"datesingle\"]").daterangepicker({
+        $("input[name=\"startDate\"]").daterangepicker({
             singleDatePicker: true,
-            showDropdowns: true
+            showDropdowns: true,
+            locale : {
+                //format : "M/DD hh:mm A"
+                format : "YYYY-MM-DD"
+            }
+        });
+        $("input[name=\"endDate\"]").daterangepicker({
+            singleDatePicker: true,
+            showDropdowns: true,
+            locale : {
+                //format : "M/DD hh:mm A"
+                format : "YYYY-MM-DD"
+            }
         });
         // Datetimepicker
         $('#datetimepicker-minimum').datetimepicker();
@@ -137,55 +149,61 @@
                     <div class="row">
                         <div class="col-12">
                             <div class="card">
-                                <div class="card-body">
-                                    <table class="table mobile-table">
-                                        <colgroup>
-                                            <col style="width:10%">
-                                            <col style="width:40%">
-                                            <col style="width:10%">
-                                            <col style="width:40%">
-                                        </colgroup>
-                                        <tr>
-                                            <th>지역</th>
-                                            <td>
-                                                <select class="custom-select form-control" id="inputState" name="inputState">
-                                                    <option value="success" selected="">전체</option>
-                                                    <option value="info">서울특별시</option>
-                                                    <option value="warning">경기도</option>
-                                                </select>
-                                            </td>
-                                            <th>생활치료센터명</th>
-                                            <td>
-                                                <input type="text" class="form-control" id="inputPassword4" placeholder="환자명">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th>등록일</th>
-                                            <td colspan="3">
-                                                <div class="row">
-                                                    <div class="col-lg-4 col-sm-5">
-                                                        <div class="form-group calendar-bar mb-xl-0">
-                                                            <input class="form-control" type="text" name="datesingle">
-                                                            <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
+                                <form action="?" method="get">
+                                    <div class="card-body">
+                                        <table class="table mobile-table">
+                                            <colgroup>
+                                                <col style="width:10%">
+                                                <col style="width:40%">
+                                                <col style="width:10%">
+                                                <col style="width:40%">
+                                            </colgroup>
+                                            <tr>
+                                                <th>지역</th>
+                                                <td>
+                                                    <select class="custom-select form-control" name="locationCode">
+                                                        <option value="">전체</option>
+                                                        <c:forEach var="i" items="${locationList}">
+                                                            <option value="${i.locationCode}" <c:if test="${i.locationCode eq locationCode}"> selected="selected"</c:if>><c:out value="${i.locationName}"/></option>
+                                                            
+                                                        </c:forEach>
+    <!--                                                     <option value="info">서울특별시</option> -->
+    <!--                                                     <option value="warning">경기도</option> -->
+                                                    </select>
+                                                </td>
+                                                <th>생활치료센터명</th>
+                                                <td>
+                                                    <input type="text" class="form-control" name="centerName" placeholder="생활치료센터명" value="<c:out value="${centerName}" />">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>등록일</th>
+                                                <td colspan="3">
+                                                    <div class="row">
+                                                        <div class="col-lg-4 col-sm-5">
+                                                            <div class="form-group calendar-bar mb-xl-0">
+                                                                <input class="form-control" type="text" name="startDate">
+                                                                <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
+                                                            </div>
                                                         </div>
-                                                    </div>
-                                                    <div class="col-lg-2 col-sm-2 text-center">
-                                                        ~
-                                                    </div>
-                                                    <div class="col-lg-4 col-sm-5">
-                                                        <div class="form-group calendar-bar mb-xl-0">
-                                                            <input class="form-control" type="text" name="datesingle">
-                                                            <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
+                                                        <div class="col-lg-2 col-sm-2 text-center">
+                                                            ~
+                                                        </div>
+                                                        <div class="col-lg-4 col-sm-5">
+                                                            <div class="form-group calendar-bar mb-xl-0">
+                                                                <input class="form-control" type="text" name="endDate">
+                                                                <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>
-                                                    <div class="col-sm-12 col-lg-2">
-                                                        <button class="btn btn-primary">검색</button>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                </form>
                             </div>
                         </div>
                     </div>
@@ -194,11 +212,11 @@
                             <div class="card">
                                 <div class="card-body">
                                     <div class="row mb-3">
-                                        <div class="col-6">
-                                            전체 : 645
+                                        <div class="col-6">전체 : 
+                                            <fmt:formatNumber value="${total}" pattern="#,###" />
                                         </div>
                                         <div class="col-6 text-right">
-                                            <button class="btn btn-primary">생활치료센터 신규 등록</button>
+                                            <button class="btn btn-primary" onclick="location.href='./new';">생활치료센터 신규 등록</button>
                                         </div>
                                     </div>
                                     <div class="table-responsive">
@@ -228,136 +246,30 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>10</td>
-                                                    <td>
-                                                        <a href="javscript:;">레몬종합병원</a>
-                                                    </td>
-                                                    <td>서울특별시</td>
-                                                    <td>홍길동</td>
-                                                    <td>02-1234-1234</td>
-                                                    <td>100</td>
-                                                    <td>150</td>
-                                                    <td>50</td>
-                                                    <td>2020-10-10 14:23</td>
-                                                </tr>
+                                                <c:choose>
+                                                    <c:when test="${total > 0}">
+                                                        <c:forEach var="l" items="${item}">
+                                                            <tr>
+                                                                <td><c:out value="${l.num}" /></td>
+                                                                <td>
+                                                                    <a href="./info?centerCode=${l.centerCode}"><c:out value="${l.centerName}" /></a>
+                                                                </td>
+                                                                <td><c:out value="${l.locationName}" /></td>
+                                                                <td><c:out value="${l.staffName}" /></td>
+                                                                <td><c:out value="${l.staffPhoneNumber}"></c:out></td>
+                                                                <td><c:out value="${l.totalPatient}" /></td>
+                                                                <td><c:out value="${l.totalCapacity}" /></td>
+                                                                <td><c:out value="${l.totalStaff}" /></td>
+                                                                <td><c:out value="${l.createDate}" /></td>
+                                                            </tr>
+                                                        </c:forEach>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <tr>
+                                                            <td colspan="9">등록된 생활치료센터가 없습니다.</td>
+                                                        </tr>
+                                                    </c:otherwise>
+                                                </c:choose>
                                             </tbody>
                                         </table>
                                     </div>
@@ -365,17 +277,18 @@
                                         <div class="col-12 col-lg-6 mb-2">
                                         </div>
                                         <div class="col-12 col-lg-6 mb-2">
-                                            <nav aria-label="Page navigation">
-                                                <ul class="pagination pagination-mb">
-                                                    <li class="page-item"><a class="page-link" href="#"><i class="fas fa-angle-left"></i></a></li>
-                                                    <li class="page-item"><a class="page-link" href="#">1</a></li>
-                                                    <li class="page-item active"><a class="page-link" href="#">2</a></li>
-                                                    <li class="page-item"><a class="page-link" href="#">3</a></li>
-                                                    <li class="page-item"><a class="page-link" href="#">4</a></li>
-                                                    <li class="page-item"><a class="page-link" href="#">5</a></li>
-                                                    <li class="page-item"><a class="page-link" href="#"><i class="fas fa-angle-right"></i></a></li>
-                                                </ul>
-                                            </nav>
+                                            <jsp:include page="${data._INCLUDE}/paging.jsp" flush="true">
+                                                <jsp:param name="firstPageNo" value="${paging.firstPageNo}" />
+                                                <jsp:param name="prevPageNo"  value="${paging.prevPageNo}" />
+                                                <jsp:param name="startPageNo" value="${paging.startPageNo}" />
+                                                <jsp:param name="pageNo"      value="${paging.pageNo}" />
+                                                <jsp:param name="endPageNo"   value="${paging.endPageNo}" />
+                                                <jsp:param name="nextPageNo"  value="${paging.nextPageNo}" />
+                                                <jsp:param name="finalPageNo" value="${paging.finalPageNo}" />
+                                                <jsp:param name="preFix"      value="${paging.preFix}" />
+                                                <jsp:param name="url"         value="${paging.url}" />
+                                                <jsp:param name="total"       value="${paging.totalCount}" />
+                                            </jsp:include>
                                         </div>
                                     </div>
                                 </div>

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

@@ -142,7 +142,7 @@ $( function(){
                                                 <th><span class="fix">*</span>지역</th>
                                                 <td>
                                                     <select class="custom-select" name="locationCode">
-                                                        <option >지역</option>
+                                                        <option>지역</option>
                                                         <c:forEach var="i" items="${locationList}">
                                                             <option value="${i.locationCode}"><c:out value="${i.locationName}"/></option>
                                                         </c:forEach>

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

@@ -183,24 +183,16 @@
                                                 <td>
                                                     <div class="row">
                                                         <div class="col-5">
-                                                            <div
-                                                                class="form-group mb-xl-0">
-                                                                <input
-                                                                    class="form-control"
-                                                                    type="text"
-                                                                    name="startDate">
+                                                            <div class="form-group mb-xl-0">
+                                                                <input class="form-control" type="text" name="startDate" value="">
                                                             </div>
                                                         </div>
                                                         <div
                                                             class="col-2 text-center">
                                                             ~</div>
                                                         <div class="col-5">
-                                                            <div
-                                                                class="form-group mb-xl-0">
-                                                                <input
-                                                                    class="form-control"
-                                                                    type="text"
-                                                                    name="endDate">
+                                                            <div class="form-group mb-xl-0">
+                                                                <input class="form-control" type="text" name="endDate">
                                                             </div>
                                                         </div>
                                                     </div>
@@ -225,9 +217,7 @@
                                             <fmt:formatNumber value="${total}" pattern="#,###" />
                                         </div>
                                         <div class="col-6 text-right">
-                                            <button
-                                                class="btn btn-primary"
-                                                onclick="location.href='./new';">신규환자등록</button>
+                                            <button class="btn btn-primary" onclick="location.href='./new';">신규환자등록</button>
                                         </div>
                                     </div>
                                     <div class="table-responsive">