Browse Source

인력관리 동적 주소 추가변경

databank102 4 years ago
parent
commit
327ecdbdc3

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

@@ -147,7 +147,7 @@ public class StaffMediManagerController extends LifeCenterController {
                     cal.setTime(day1);
                     int extotal = 0;
                     StaffManagerDTO tmpdto = new StaffManagerDTO();
-                    for (int i=1; i < calDateDays; i++) {
+                    for (int i=0; i < calDateDays; i++) {
                         cal.add(Calendar.DATE, 1);
                         dto.setStatusFlag("U");
                         

+ 66 - 47
src/main/java/com/lemon/lifecenter/controller/StaffGovManagerController.java

@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -60,8 +61,7 @@ import com.lemon.lifecenter.service.FileDownloadService;
 import com.lemon.lifecenter.service.StaffManagerService;
 
 @Controller
-@RequestMapping("/staffGovManager")
-public class StaffGovManagerController extends LifeCenterController {
+public class StaffTotalManagerController extends LifeCenterController {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
@@ -77,18 +77,21 @@ public class StaffGovManagerController extends LifeCenterController {
     
     @Autowired
     private FileDownloadService fileDownloadService;
-    
-    @RequestMapping("/info")
+    //의료인력현황 /meditotal
+    //행정인력현황 /govtotal
+    @RequestMapping("/{addr}/info")
     public ModelAndView staffManagerInfo(
+            @PathVariable("addr") String inputaddr,
             @ModelAttribute("dto") StaffManagerDTO dto,
-            @RequestParam(value="gubun", required=false, defaultValue="G") String inputgubun,
             HttpServletRequest request,HttpServletResponse response) {
         
+        String inputgubun = inputaddr.equals("meditotal") ? "m" : "g";
+        
         String sesCenterCode  = LifeCenterSessionController.getSession( request, "sesCenterCode" );
         dto.setCenterCode(Integer.valueOf(sesCenterCode));
         dto.setGubun(inputgubun);
         
-        ModelAndView mv = setMV("staff/manager/info");
+        ModelAndView mv = setMV("staffTotal/info");
         
         int total = service.selectStaffManagerCount(dto);
         
@@ -105,17 +108,20 @@ public class StaffGovManagerController extends LifeCenterController {
         
         return mv;
     }
-    
-    @RequestMapping("/daylist")
+    //의료인력현황 /meditotal
+    //행정인력현황 /govtotal
+    @RequestMapping("/{addr}/list")
     public ModelAndView staffManagerDayList(
             @ModelAttribute("dto") StaffManagerDTO dto,
-            @RequestParam(value="gubun", required=false, defaultValue="G") String inputgubun,
+            @PathVariable("addr") String inputaddr,
             @RequestParam(value="startDate", required=false, defaultValue="") String inputStartDate,
             @RequestParam(value="endDate", required=false, defaultValue="") String inputEndDate,
             @RequestParam(value="page", required=false, defaultValue="1") int page,
             
             HttpServletRequest request,HttpServletResponse response) {
         
+        String inputgubun = inputaddr.equals("meditotal") ? "m" : "g";
+        
         SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
        
         String sesCenterCode  = LifeCenterSessionController.getSession( request, "sesCenterCode" );
@@ -147,7 +153,7 @@ public class StaffGovManagerController extends LifeCenterController {
                     cal.setTime(day1);
                     int extotal = 0;
                     StaffManagerDTO tmpdto = new StaffManagerDTO();
-                    for (int i=1; i < calDateDays; i++) {
+                    for (int i=0; i < calDateDays; i++) {
                         cal.add(Calendar.DATE, 1);
                         dto.setStatusFlag("U");
                         
@@ -201,7 +207,7 @@ public class StaffGovManagerController extends LifeCenterController {
         paging = LifeCenterPaging.getInstance();
         paging.paging(config, total, page, param);
             
-        ModelAndView mv = setMV("staff/manager/daylist");
+        ModelAndView mv = setMV("staffTotal/daylist");
         
         mv.addObject("total", total);
         
@@ -217,14 +223,17 @@ public class StaffGovManagerController extends LifeCenterController {
         
         return mv;
     }
-    
-      @RequestMapping("/edit")
+    //의료인력현황 /meditotal
+    //행정인력현황 /govtotal
+    @RequestMapping("/{addr}/edit")
       public ModelAndView staffManagerEdit(
               @ModelAttribute("dto") StaffManagerDTO dto,
-              @RequestParam(value="gubun", required=false, defaultValue="G") String inputgubun,
+              @PathVariable("addr") String inputaddr,
               @RequestParam(value="statusFlag", required=false, defaultValue="I") String inputStatusFlag,
               HttpServletRequest request,HttpServletResponse response) {
           String sesCenterCode  = LifeCenterSessionController.getSession( request, "sesCenterCode" );
+          String inputgubun = inputaddr.equals("meditotal") ? "m" : "g";
+          
           dto.setCenterCode(Integer.valueOf(sesCenterCode));
           dto.setGubun(inputgubun);
           dto.setStatusFlag(inputStatusFlag);
@@ -238,21 +247,25 @@ public class StaffGovManagerController extends LifeCenterController {
               ndto.setGubun(inputgubun);
           }
           
-          ModelAndView mv = setMV("staff/manager/edit");
+          ModelAndView mv = setMV("staffTotal/edit");
           
           mv.addObject("list", ndto);
           
           return mv;
       }
-      
-      @RequestMapping( value = "/staffupdate", method = RequestMethod.POST)
+    //의료인력현황 /meditotal
+    //행정인력현황 /govtotal
+      @RequestMapping( value = "{addr}/staffupdate", method = RequestMethod.POST)
       public String staffManagerUpdate(
+              @PathVariable("addr") String inputaddr,
               @ModelAttribute("dto") final StaffManagerDTO dto,
               HttpServletRequest request,HttpServletResponse response) {
           String sesId  = LifeCenterSessionController.getSession( request, "sesId" );
           String sesCenterCode  = LifeCenterSessionController.getSession( request, "sesCenterCode" );
           String sesCenterName  = LifeCenterSessionController.getSession( request, "sesCenterName" );
           
+          String inputgubun = inputaddr.equals("meditotal") ? "m" : "g";
+          
           dto.setCenterCode(Integer.valueOf(sesCenterCode));
           dto.setStatusFlag("U");
           
@@ -277,15 +290,16 @@ public class StaffGovManagerController extends LifeCenterController {
               service.insertStaffManager(dto);
           }
           
-          LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '저장을 완료하였습니다.', callBack : function(){ location.href='/staff"+(dto.getGubun().equals("M") ? "Medi" : "Gov")+"Manager/daylist'; } });" );
+          LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '저장을 완료하였습니다.', callBack : function(){ location.href='/"+(inputaddr)+"/list'; } });" );
           return "/common/blank";
           
       }    
-      
-      @RequestMapping("/list")
+      //의료인력관리 /medi/managerlist
+      //행정인력현황 /gov/managerlist
+      @RequestMapping("/{addr}/managerlist")
       public ModelAndView staffManagerList(
               @ModelAttribute("dto") StaffManagerDTO dto,
-              @RequestParam(value="gubun", required=false, defaultValue="G") String inputgubun,
+              @PathVariable("addr") String inputaddr,
               @RequestParam(value="locationCode", required=false, defaultValue="") String inputlocationCode,
               @RequestParam(value="centerName", required=false, defaultValue="") String inputCenterName,
               @RequestParam(value="registDay", required=false, defaultValue="") String inputRegistDay,
@@ -293,6 +307,7 @@ public class StaffGovManagerController extends LifeCenterController {
               
               HttpServletRequest request,HttpServletResponse response) {
           String sesCenterCode  = LifeCenterSessionController.getSession( request, "sesCenterCode" );
+          String inputgubun = inputaddr.equals("medi") ? "m" : "g";
           
           List<LocationDTO> locationCodeList = centerService.selectLocation();
           
@@ -317,7 +332,7 @@ public class StaffGovManagerController extends LifeCenterController {
           paging = LifeCenterPaging.getInstance();
           paging.paging(config, total, page, param);
               
-          ModelAndView mv = setMV("staff/manager/list");
+          ModelAndView mv = setMV("staffTotal/list");
           
           mv.addObject("total", total);
           
@@ -336,13 +351,17 @@ public class StaffGovManagerController extends LifeCenterController {
           return mv;
       }
       
-      @RequestMapping( value="/excel", method=RequestMethod.POST )
+      //의료인력관리 /medi/managerlist
+      //행정인력현황 /gov/managerlist
+      @RequestMapping( value="{addr}/excel", method=RequestMethod.POST )
       public void staffManagerExcelList(
               @RequestParam(value="downMemo", required=false, defaultValue="") String downMemo,
               @RequestParam(value="locationCode", required=false, defaultValue="") String inputlocationCode,
               @RequestParam(value="centerlName", required=false, defaultValue="") String inputcenterlName,
-              @RequestParam(value="gubun", required=false, defaultValue="G") String inputgubun,
+              @PathVariable("addr") String inputaddr,
               HttpServletRequest request,HttpServletResponse response ) {
+          
+          String inputgubun = inputaddr.equals("medi") ? "m" : "g";
           String userId = LifeCenterSessionController.getSession(request, "sesId");
 
           //excel 다운로드 로그 남기기
@@ -447,7 +466,7 @@ public class StaffGovManagerController extends LifeCenterController {
           cell14.setCellStyle(styleOfBoardFillFontBlackBold16);
           cell15.setCellStyle(styleOfBoardFillFontBlackBold16);
           
-          if(inputgubun.equals("M")) {
+          if(inputgubun.equals("m")) {
               cell16.setCellStyle(styleOfBoardFillFontBlackBold16);
               cell17.setCellStyle(styleOfBoardFillFontBlackBold16);
               cell18.setCellStyle(styleOfBoardFillFontBlackBold16);
@@ -464,10 +483,10 @@ public class StaffGovManagerController extends LifeCenterController {
           cell4.setCellValue("인력총계(단위:명)");
           sheet1.addMergedRegion(new CellRangeAddress(0,1,3,3));
           
-          cell5.setCellValue((inputgubun.equals("M") ? "협력병원" : "행정") + " 인력 현황 (단위 :명)");
-          sheet1.addMergedRegion(new CellRangeAddress(0,0,4,inputgubun.equals("M") ? 9 : 8));
+          cell5.setCellValue((inputgubun.equals("m") ? "협력병원" : "행정") + " 인력 현황 (단위 :명)");
+          sheet1.addMergedRegion(new CellRangeAddress(0,0,4,inputgubun.equals("m") ? 9 : 8));
           
-          if (inputgubun.equals("M")) {
+          if (inputgubun.equals("m")) {
               cell11.setCellValue("공공 인력 현황 (단위 :명)");
               sheet1.addMergedRegion(new CellRangeAddress(0,0,10,12));
               cell14.setCellValue("민간 인력 현황 (단위 :명)");
@@ -518,7 +537,7 @@ public class StaffGovManagerController extends LifeCenterController {
           cell14.setCellStyle(styleOfBoardFillFontBlackBold16);
           cell15.setCellStyle(styleOfBoardFillFontBlackBold16);
           
-          if(inputgubun.equals("M")) {
+          if(inputgubun.equals("m")) {
               cell16.setCellStyle(styleOfBoardFillFontBlackBold16);
               cell17.setCellStyle(styleOfBoardFillFontBlackBold16);
               cell18.setCellStyle(styleOfBoardFillFontBlackBold16);
@@ -541,7 +560,7 @@ public class StaffGovManagerController extends LifeCenterController {
           sheet1.setColumnWidth( 13, 4000); //민가모집의사, 청소
           sheet1.setColumnWidth( 14, 4000); //민간모집간호사, 기타
           
-          if(inputgubun.equals("M")) {
+          if(inputgubun.equals("m")) {
               sheet1.setColumnWidth( 15, 6000); //민간모집간호조무사
               sheet1.setColumnWidth( 16, 6000); //민간모잡방사선사
               sheet1.setColumnWidth( 17, 6000); //민간모집임상병리사
@@ -552,19 +571,19 @@ public class StaffGovManagerController extends LifeCenterController {
           //cell2.setCellValue("지역");
           //cell3.setCellValue("협력병원명");
           //cell4.setCellValue("인력총계(단위:명)");
-          cell5.setCellValue(inputgubun.equals("M") ? "의사" : "복지부");
-          cell6.setCellValue(inputgubun.equals("M") ?"간호사" : "지자체");
-          cell7.setCellValue(inputgubun.equals("M") ?"간호조무사" : "환경부");
-          cell8.setCellValue(inputgubun.equals("M") ?"임상병리사" : "소방청");
-          cell9.setCellValue(inputgubun.equals("M") ?"방사선사" : "기타");
-          cell10.setCellValue(inputgubun.equals("M") ?"행정인력" : "국방부");
-          cell11.setCellValue(inputgubun.equals("M") ?"공보의" : "경찰청");
-          cell12.setCellValue(inputgubun.equals("M") ?"군의관" : "기타");
-          cell13.setCellValue(inputgubun.equals("M") ?"간호사관생도" : "방역");
-          cell14.setCellValue(inputgubun.equals("M") ?"민가모집의사" : "청소");
-          cell15.setCellValue(inputgubun.equals("M") ?"민간모집간호사" : "기타");
-          
-          if(inputgubun.equals("M")) {
+          cell5.setCellValue(inputgubun.equals("m") ? "의사" : "복지부");
+          cell6.setCellValue(inputgubun.equals("m") ?"간호사" : "지자체");
+          cell7.setCellValue(inputgubun.equals("m") ?"간호조무사" : "환경부");
+          cell8.setCellValue(inputgubun.equals("m") ?"임상병리사" : "소방청");
+          cell9.setCellValue(inputgubun.equals("m") ?"방사선사" : "기타");
+          cell10.setCellValue(inputgubun.equals("m") ?"행정인력" : "국방부");
+          cell11.setCellValue(inputgubun.equals("m") ?"공보의" : "경찰청");
+          cell12.setCellValue(inputgubun.equals("m") ?"군의관" : "기타");
+          cell13.setCellValue(inputgubun.equals("m") ?"간호사관생도" : "방역");
+          cell14.setCellValue(inputgubun.equals("m") ?"민가모집의사" : "청소");
+          cell15.setCellValue(inputgubun.equals("m") ?"민간모집간호사" : "기타");
+          
+          if(inputgubun.equals("m")) {
               cell16.setCellValue("민간모집간호조무사");
               cell17.setCellValue("민간모잡방사선사");
               cell18.setCellValue("민간모집임상병리사");
@@ -591,7 +610,7 @@ public class StaffGovManagerController extends LifeCenterController {
               cell14 = row.createCell(13);
               cell15 = row.createCell(14);
               
-              if(gubun.equals("M")) {
+              if(gubun.equals("m")) {
                   cell16 = row.createCell(15);
                   cell17 = row.createCell(16);
                   cell18 = row.createCell(17);
@@ -635,7 +654,7 @@ public class StaffGovManagerController extends LifeCenterController {
               cell14.setCellValue(staff10);
               cell15.setCellValue(staff11);
              
-              if(gubun.equals("M")) {
+              if(gubun.equals("m")) {
                   cell16.setCellValue(staff12);
                   cell17.setCellValue(staff13);
                   cell18.setCellValue(staff14);
@@ -662,7 +681,7 @@ public class StaffGovManagerController extends LifeCenterController {
           cell14 = row.createCell(15);
           cell15 = row.createCell(16);
           
-          if(inputgubun.equals("M")) {
+          if(inputgubun.equals("m")) {
               cell16 = row.createCell(17);
               cell17 = row.createCell(18);
               cell18 = row.createCell(19);
@@ -675,7 +694,7 @@ public class StaffGovManagerController extends LifeCenterController {
             
             // JBOSS에서 구동시 /home1/jboss/jboss-eap-7.3/domain/test/excel-temp 경로에 저장이됨
             String tempPath = "../excel-temp/testExcel.xlsx";
-            String downName = LifeCenterFunction.getNow() + "_" + (inputgubun.equals("M") ? "의료" : "행정") +"인력 현황리스트.xlsx";
+            String downName = LifeCenterFunction.getNow() + "_" + (inputgubun.equals("m") ? "의료" : "행정") +"인력 현황리스트.xlsx";
             File xlsFile = new File(tempPath);
 //            FileOutputStream fileOut = new FileOutputStream(tempPath);
 //            workbook.write(fileOut);

+ 11 - 11
src/main/webapp/WEB-INF/jsp/staff/manager/daylist.jsp

@@ -114,13 +114,13 @@ $(function() {
                 <div class="container-fluid p-0">
                     <div class="row">
                         <div class="col-12 col-lg-6">
-                            <h1 class="h3 mb-3">생활치료센터  <c:if test="${gubun eq 'M'}">의료</c:if><c:if test="${gubun eq 'G'}">행정</c:if>인력 현황</h1>
+                            <h1 class="h3 mb-3">생활치료센터  <c:if test="${gubun eq 'm'}">의료</c:if><c:if test="${gubun eq 'g'}">행정</c:if>인력 현황</h1>
                         </div>
                         <div class="col-12 col-lg-6  text-right">
                             <nav aria-label="breadcrumb">
                                 <ol class="breadcrumb">
                                     <li class="breadcrumb-item"><a href="javscript:;">Home</a></li>
-                                    <li class="breadcrumb-item"><c:if test="${gubun eq 'M'}">의료</c:if><c:if test="${gubun eq 'G'}">행정</c:if>인력 현황</li>
+                                    <li class="breadcrumb-item"><c:if test="${gubun eq 'm'}">의료</c:if><c:if test="${gubun eq 'g'}">행정</c:if>인력 현황</li>
                                 </ol>
                             </nav>
                         </div>
@@ -178,7 +178,7 @@ $(function() {
                                         <table class="table table-striped text-center">
                                             <colgroup>
                                             <c:choose>     
-                                                <c:when test="${gubun eq 'M'}">
+                                                <c:when test="${gubun eq 'm'}">
                                                 <col style=" width: 4%; ">
                                                 <col style=" width: 6%; ">
                                                 <col style=" width: 4%; ">
@@ -200,7 +200,7 @@ $(function() {
                                                 </c:when>
                                             </c:choose>
                                             <c:choose>     
-                                                <c:when test="${gubun eq 'G'}">
+                                                <c:when test="${gubun eq 'g'}">
                                                 <col style=" width: 4%; ">
                                                 <col style=" width: 6%; ">
                                                 <col style=" width: 4%; ">
@@ -222,7 +222,7 @@ $(function() {
                                             <thead>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${gubun eq 'M'}">
+                                                    <c:when test="${gubun eq 'm'}">
                                                     <th rowspan="2">번호</th>
                                                     <th rowspan="2">작성일</th>
                                                     <th rowspan="2">인력총계<br>(단위:명)</th>
@@ -232,7 +232,7 @@ $(function() {
                                                     </c:when>
                                                 </c:choose>
                                                 <c:choose>     
-                                                    <c:when test="${gubun eq 'G'}">
+                                                    <c:when test="${gubun eq 'g'}">
                                                     <th rowspan="2">번호</th>
                                                     <th rowspan="2">작성일</th>
                                                     <th rowspan="2">인력총계<br>(단위:명)</th>
@@ -245,7 +245,7 @@ $(function() {
                                                 </tr>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${gubun eq 'M'}">
+                                                    <c:when test="${gubun eq 'm'}">
                                                     <th>의사</th>
                                                     <th>간호사</th>
                                                     <th>간호조무사</th>
@@ -264,7 +264,7 @@ $(function() {
                                                     </c:when>
                                                 </c:choose>
                                                 <c:choose>     
-                                                    <c:when test="${gubun eq 'G'}">
+                                                    <c:when test="${gubun eq 'g'}">
                                                     <th>복지부</th>
                                                     <th>지자체</th>
                                                     <th>환경부</th>
@@ -286,9 +286,9 @@ $(function() {
                                                     <c:when test="${total > 0}">
                                                         <c:forEach var="l" items="${list}" varStatus="lStatus">
                                                         
-                                                            <c:set var="pageNum" value="${ lStatus.index + ( (page - 1) * pageSize ) }" />
+                                                            <c:set var="pageNum" value="${ ( total - lStatus.index ) - ( (page - 1) * pageSize ) }" />
                                                             <tr>
-                                                                <td>${pageNum + 1}</td>
+                                                                <td>${pageNum}</td>
                                                                 <td><c:out value="${l.registDay}" /></td>
                                                                 <td><c:out value="${l.staffTotal}" /></td>
                                                                 <td><fmt:formatNumber value="${l.staff1}" pattern="#,###" /></td>
@@ -302,7 +302,7 @@ $(function() {
                                                                 <td><fmt:formatNumber value="${l.staff9}" pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value="${l.staff10}" pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value="${l.staff11}" pattern="#,###" /></td>  
-                                                                <c:if test="${gubun eq 'M'}"> 
+                                                                <c:if test="${gubun eq 'm'}"> 
                                                                     <td><fmt:formatNumber value="${l.staff12}" pattern="#,###" /></td>
                                                                     <td><fmt:formatNumber value="${l.staff13}" pattern="#,###" /></td>
                                                                     <td><fmt:formatNumber value="${l.staff14}" pattern="#,###" /></td>

+ 20 - 20
src/main/webapp/WEB-INF/jsp/staff/manager/edit.jsp

@@ -53,7 +53,7 @@ $( function(){
                 digits:true
             }
             <c:choose>     
-            <c:when test="${list.gubun eq 'M'}">
+            <c:when test="${list.gubun eq 'm'}">
             ,staff12: {
                 number:true,
                 digits:true
@@ -100,13 +100,13 @@ $( function(){
                 <div class="container-fluid p-0">
                     <div class="row">
                         <div class="col-12 col-lg-6">
-                            <h1 class="h3 mb-3">생활치료센터  <c:if test="${list.gubun eq 'M'}">의료</c:if><c:if test="${list.gubun eq 'G'}">행정</c:if>인력 관리</h1>
+                            <h1 class="h3 mb-3">생활치료센터  <c:if test="${list.gubun eq 'm'}">의료</c:if><c:if test="${list.gubun eq 'g'}">행정</c:if>인력 관리</h1>
                         </div>
                         <div class="col-12 col-lg-6  text-right">
                             <nav aria-label="breadcrumb">
                                 <ol class="breadcrumb">
                                     <li class="breadcrumb-item"><a href="javscript:;">Home</a></li>
-                                    <li class="breadcrumb-item"><c:if test="${list.gubun eq 'M'}">의료</c:if><c:if test="${list.gubun eq 'G'}">행정</c:if>인력 관리</li>
+                                    <li class="breadcrumb-item"><c:if test="${list.gubun eq 'm'}">의료</c:if><c:if test="${list.gubun eq 'g'}">행정</c:if>인력 관리</li>
                                 </ol>
                             </nav>
                         </div>
@@ -115,12 +115,12 @@ $( function(){
                         <div class="col-12">
                             <div class="card">
                                 <div class="card-body">
-                                    <h5 class="text-info mb-3"><c:if test="${list.gubun eq 'M'}">협력병원</c:if><c:if test="${list.gubun eq 'G'}">행정</c:if> 인력 현황</h5>
+                                    <h5 class="text-info mb-3"><c:if test="${list.gubun eq 'm'}">협력병원</c:if><c:if test="${list.gubun eq 'g'}">행정</c:if> 인력 현황</h5>
                                     <div class="table-responsive">
                                         <table class="table table-striped text-center">
                                             <colgroup>
                                             <c:choose>     
-                                                <c:when test="${list.gubun eq 'M'}">
+                                                <c:when test="${list.gubun eq 'm'}">
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
@@ -129,7 +129,7 @@ $( function(){
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
                                                 </c:when>
-                                                <c:when test="${list.gubun eq 'G'}">
+                                                <c:when test="${list.gubun eq 'g'}">
                                                 <col style=" width: 16%; ">
                                                 <col style=" width: 16%; ">
                                                 <col style=" width: 16%; ">
@@ -142,7 +142,7 @@ $( function(){
                                             <thead>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">    
+                                                    <c:when test="${list.gubun eq 'm'}">    
                                                     <th>구분</th>
                                                     <th>의사</th>
                                                     <th>간호사</th>
@@ -151,7 +151,7 @@ $( function(){
                                                     <th>방사선사</th>
                                                     <th>행정인력</th>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">    
+                                                    <c:when test="${list.gubun eq 'g'}">    
                                                     <th>구분</th>
                                                     <th>복지부</th>
                                                     <th>지자체</th>
@@ -165,7 +165,7 @@ $( function(){
                                             <tbody>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <td>인원</td>
                                                     <td><input type="text" name="staff1" class="form-control text-center" value="<c:out value="${list.staff1}" />"></td>
                                                     <td><input type="text" name="staff2" class="form-control text-center" value="<c:out value="${list.staff2}" />"></td>
@@ -174,7 +174,7 @@ $( function(){
                                                     <td><input type="text" name="staff5" class="form-control text-center" value="<c:out value="${list.staff5}" />"></td>
                                                     <td><input type="text" name="staff6" class="form-control text-center" value="<c:out value="${list.staff6}" />"></td>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <td>인원</td>
                                                     <td><input type="text" name="staff1" class="form-control text-center" value="<c:out value="${list.staff1}" />"></td>
                                                     <td><input type="text" name="staff2" class="form-control text-center" value="<c:out value="${list.staff2}" />"></td>
@@ -207,13 +207,13 @@ $( function(){
                                             <thead>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <th>구분</th>
                                                     <th>공보의</th>
                                                     <th>군의관</th>
                                                     <th>간호사관생도</th>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <th>구분</th>
                                                     <th>국방부</th>
                                                     <th>경찰청</th>
@@ -225,13 +225,13 @@ $( function(){
                                             <tbody>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <td>인원</td>
                                                     <td><input type="text" name="staff7" class="form-control text-center" value="<c:out value="${list.staff7}" />"></td>
                                                     <td><input type="text" name="staff8" class="form-control text-center" value="<c:out value="${list.staff8}" />"></td>
                                                     <td><input type="text" name="staff9" class="form-control text-center" value="<c:out value="${list.staff9}" />"></td>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <td>인원</td>
                                                     <td><input type="text" name="staff6" class="form-control text-center" value="<c:out value="${list.staff6}" />"></td>
                                                     <td><input type="text" name="staff7" class="form-control text-center" value="<c:out value="${list.staff7}" />"></td>
@@ -255,7 +255,7 @@ $( function(){
                                         <table class="table table-striped text-center">
                                             <colgroup>
                                             <c:choose>     
-                                                <c:when test="${list.gubun eq 'M'}">
+                                                <c:when test="${list.gubun eq 'm'}">
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
@@ -264,7 +264,7 @@ $( function(){
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
                                                 </c:when>
-                                                <c:when test="${list.gubun eq 'G'}">
+                                                <c:when test="${list.gubun eq 'g'}">
                                                 <col style=" width: 25%; ">
                                                 <col style=" width: 25%; ">
                                                 <col style=" width: 25%; ">
@@ -275,7 +275,7 @@ $( function(){
                                             <thead>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <th>구분</th>
                                                     <th>민간모집의사</th>
                                                     <th>민간모집간호사</th>
@@ -284,7 +284,7 @@ $( function(){
                                                     <th>민간모집방사선사</th>
                                                     <th>민간모집기타인력</th>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <th>구분</th>
                                                     <th>방역</th>
                                                     <th>청소</th>
@@ -296,7 +296,7 @@ $( function(){
                                             <tbody>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <td>인원</td>
                                                     <td><input type="text" name="staff10" class="form-control text-center" value="<c:out value="${list.staff10}" />"></td>
                                                     <td><input type="text" name="staff11" class="form-control text-center" value="<c:out value="${list.staff11}" />"></td>
@@ -305,7 +305,7 @@ $( function(){
                                                     <td><input type="text" name="staff14" class="form-control text-center" value="<c:out value="${list.staff14}" />"></td>
                                                     <td><input type="text" name="staff15" class="form-control text-center" value="<c:out value="${list.staff15}" />"></td>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <td>인원</td>
                                                     <td><input type="text" name="staff9" class="form-control text-center" value="<c:out value="${list.staff9}" />"></td>
                                                     <td><input type="text" name="staff10" class="form-control text-center" value="<c:out value="${list.staff10}" />"></td>

+ 21 - 21
src/main/webapp/WEB-INF/jsp/staff/manager/info.jsp

@@ -20,13 +20,13 @@
                 <div class="container-fluid p-0">
                     <div class="row">
                         <div class="col-12 col-lg-6">
-                           <h1 class="h3 mb-3">생활치료센터  <c:if test="${list.gubun eq 'M'}">의료</c:if><c:if test="${list.gubun eq 'G'}">행정</c:if>인력 관리</h1>
+                           <h1 class="h3 mb-3">생활치료센터  <c:if test="${list.gubun eq 'm'}">의료</c:if><c:if test="${list.gubun eq 'g'}">행정</c:if>인력 관리</h1>
                         </div>
                         <div class="col-12 col-lg-6  text-right">
                             <nav aria-label="breadcrumb">
                                 <ol class="breadcrumb">
                                     <li class="breadcrumb-item"><a href="javscript:;">Home</a></li>
-                                    <li class="breadcrumb-item"><c:if test="${list.gubun eq 'M'}">의료</c:if><c:if test="${list.gubun eq 'G'}">행정</c:if>인력 관리</li>
+                                    <li class="breadcrumb-item"><c:if test="${list.gubun eq 'm'}">의료</c:if><c:if test="${list.gubun eq 'g'}">행정</c:if>인력 관리</li>
                                 </ol>
                             </nav>
                         </div>
@@ -35,12 +35,12 @@
                         <div class="col-12">
                             <div class="card">
                                 <div class="card-body">
-                                    <h5 class="text-info mb-3"><c:if test="${list.gubun eq 'M'}">협력병원</c:if><c:if test="${list.gubun eq 'G'}">행정</c:if> 인력 현황</h5>
+                                    <h5 class="text-info mb-3"><c:if test="${list.gubun eq 'm'}">협력병원</c:if><c:if test="${list.gubun eq 'g'}">행정</c:if> 인력 현황</h5>
                                     <div class="table-responsive">
                                         <table class="table table-striped text-center">
                                             <colgroup>
                                             <c:choose>     
-                                                <c:when test="${list.gubun eq 'M'}">
+                                                <c:when test="${list.gubun eq 'm'}">
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
@@ -49,7 +49,7 @@
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
                                                 </c:when>
-                                                <c:when test="${list.gubun eq 'G'}">
+                                                <c:when test="${list.gubun eq 'g'}">
                                                 <col style=" width: 16%; ">
                                                 <col style=" width: 16%; ">
                                                 <col style=" width: 16%; ">
@@ -62,7 +62,7 @@
                                             <thead>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">    
+                                                    <c:when test="${list.gubun eq 'm'}">    
                                                     <th>구분</th>
                                                     <th>의사</th>
                                                     <th>간호사</th>
@@ -71,7 +71,7 @@
                                                     <th>방사선사</th>
                                                     <th>행정인력</th>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">    
+                                                    <c:when test="${list.gubun eq 'g'}">    
                                                     <th>구분</th>
                                                     <th>복지부</th>
                                                     <th>지자체</th>
@@ -85,7 +85,7 @@
                                             <tbody>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <td>인원</td>
                                                     <td><fmt:formatNumber value="${list.staff1}" pattern="#,###"/></td>
                                                     <td><fmt:formatNumber value="${list.staff2}" pattern="#,###"/></td>
@@ -94,7 +94,7 @@
                                                     <td><fmt:formatNumber value="${list.staff5}" pattern="#,###"/></td>
                                                     <td><fmt:formatNumber value="${list.staff6}" pattern="#,###"/></td>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <td>인원</td>
                                                     <td><fmt:formatNumber value="${list.staff1}" pattern="#,###"/></td>
                                                     <td><fmt:formatNumber value="${list.staff2}" pattern="#,###"/></td>
@@ -115,7 +115,7 @@
                         <div class="col-12">
                             <div class="card">
                                 <div class="card-body">
-                                    <h5 class="text-info mb-3"><c:if test="${list.gubun eq 'M'}">공공</c:if><c:if test="${list.gubun eq 'G'}">서비스</c:if> 인력 현황</h5>
+                                    <h5 class="text-info mb-3"><c:if test="${list.gubun eq 'm'}">공공</c:if><c:if test="${list.gubun eq 'g'}">서비스</c:if> 인력 현황</h5>
                                     <div class="table-responsive">
                                         <table class="table table-striped text-center">
                                             <colgroup>
@@ -127,13 +127,13 @@
                                             <thead>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <th>구분</th>
                                                     <th>공보의</th>
                                                     <th>군의관</th>
                                                     <th>간호사관생도</th>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <th>구분</th>
                                                     <th>국방부</th>
                                                     <th>경찰청</th>
@@ -145,13 +145,13 @@
                                             <tbody>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <td>인원</td>
                                                     <td><fmt:formatNumber value="${list.staff7}" pattern="#,###"/></td>
                                                     <td><fmt:formatNumber value="${list.staff8}" pattern="#,###"/></td>
                                                     <td><fmt:formatNumber value="${list.staff9}" pattern="#,###"/></td>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <td>인원</td>
                                                     <td><fmt:formatNumber value="${list.staff6}" pattern="#,###"/></td>
                                                     <td><fmt:formatNumber value="${list.staff7}" pattern="#,###"/></td>
@@ -170,12 +170,12 @@
                         <div class="col-12">
                             <div class="card">
                                 <div class="card-body">
-                                    <h5 class="text-info mb-3"><c:if test="${list.gubun eq 'M'}">민간</c:if><c:if test="${list.gubun eq 'G'}">사설업체</c:if> 인력 현황</h5>
+                                    <h5 class="text-info mb-3"><c:if test="${list.gubun eq 'm'}">민간</c:if><c:if test="${list.gubun eq 'g'}">사설업체</c:if> 인력 현황</h5>
                                     <div class="table-responsive">
                                         <table class="table table-striped text-center">
                                             <colgroup>
                                             <c:choose>     
-                                                <c:when test="${list.gubun eq 'M'}">
+                                                <c:when test="${list.gubun eq 'm'}">
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
@@ -184,7 +184,7 @@
                                                 <col style=" width: 14%; ">
                                                 <col style=" width: 14%; ">
                                                 </c:when>
-                                                <c:when test="${list.gubun eq 'G'}">
+                                                <c:when test="${list.gubun eq 'g'}">
                                                 <col style=" width: 25%; ">
                                                 <col style=" width: 25%; ">
                                                 <col style=" width: 25%; ">
@@ -195,7 +195,7 @@
                                             <thead>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <th>구분</th>
                                                     <th>민간모집의사</th>
                                                     <th>민간모집간호사</th>
@@ -204,7 +204,7 @@
                                                     <th>민간모집방사선사</th>
                                                     <th>민간모집기타인력</th>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <th>구분</th>
                                                     <th>방역</th>
                                                     <th>청소</th>
@@ -216,7 +216,7 @@
                                             <tbody>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${list.gubun eq 'M'}">
+                                                    <c:when test="${list.gubun eq 'm'}">
                                                     <td>인원</td>
                                                     <td><fmt:formatNumber value="${list.staff10}" pattern="#,###"/></td>
                                                     <td><fmt:formatNumber value="${list.staff11}" pattern="#,###"/></td>
@@ -225,7 +225,7 @@
                                                     <td><fmt:formatNumber value="${list.staff14}" pattern="#,###"/></td>
                                                     <td><fmt:formatNumber value="${list.staff15}" pattern="#,###"/></td>
                                                     </c:when>
-                                                    <c:when test="${list.gubun eq 'G'}">
+                                                    <c:when test="${list.gubun eq 'g'}">
                                                     <td>인원</td>
                                                     <td><fmt:formatNumber value="${list.staff9}" pattern="#,###"/></td>
                                                     <td><fmt:formatNumber value="${list.staff10}" pattern="#,###"/></td>

+ 10 - 10
src/main/webapp/WEB-INF/jsp/staff/manager/list.jsp

@@ -77,7 +77,7 @@ function getExcel(){
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">생활치료센터 <c:if test="${gubun eq 'M'}">의료</c:if><c:if test="${gubun eq 'G'}">행정</c:if>인력 현황 리스트 Excel 다운로드</h5>
+                    <h5 class="modal-title">생활치료센터 <c:if test="${gubun eq 'm'}">의료</c:if><c:if test="${gubun eq 'g'}">행정</c:if>인력 현황 리스트 Excel 다운로드</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                             aria-hidden="true">&times;</span> </button>
                 </div>
@@ -115,13 +115,13 @@ function getExcel(){
                 <div class="container-fluid p-0">
                     <div class="row">
                         <div class="col-12 col-lg-6">
-                            <h1 class="h3 mb-3">생활치료센터  <c:if test="${gubun eq 'M'}">의료</c:if><c:if test="${gubun eq 'G'}">행정</c:if>인력 현황</h1>
+                            <h1 class="h3 mb-3">생활치료센터  <c:if test="${gubun eq 'm'}">의료</c:if><c:if test="${gubun eq 'g'}">행정</c:if>인력 현황</h1>
                         </div>
                         <div class="col-12 col-lg-6  text-right">
                             <nav aria-label="breadcrumb">
                                 <ol class="breadcrumb">
                                     <li class="breadcrumb-item"><a href="javscript:;">Home</a></li>
-                                    <li class="breadcrumb-item"><c:if test="${gubun eq 'M'}">의료</c:if><c:if test="${gubun eq 'G'}">행정</c:if>인력 현황</li>
+                                    <li class="breadcrumb-item"><c:if test="${gubun eq 'm'}">의료</c:if><c:if test="${gubun eq 'g'}">행정</c:if>인력 현황</li>
                                 </ol>
                             </nav>
                         </div>
@@ -190,7 +190,7 @@ function getExcel(){
                                         <table class="table table-striped text-center">
                                             <colgroup>
                                             <c:choose>     
-                                                <c:when test="${gubun eq 'M'}">
+                                                <c:when test="${gubun eq 'm'}">
                                                 <col style=" width: 4%; ">
                                                 <col style=" width: 8%; ">
                                                 <col style=" width: 5%; ">
@@ -214,7 +214,7 @@ function getExcel(){
                                                 </c:when>
                                             </c:choose>
                                             <c:choose>     
-                                                <c:when test="${gubun eq 'G'}">
+                                                <c:when test="${gubun eq 'g'}">
                                                 <col style=" width: 4%; ">
                                                 <col style=" width: 8%; ">
                                                 <col style=" width: 5%; ">
@@ -237,7 +237,7 @@ function getExcel(){
                                             <thead>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${gubun eq 'M'}">
+                                                    <c:when test="${gubun eq 'm'}">
                                                     <th rowspan="2">번호</th>
                                                     <th rowspan="2">생활치료센터명</th>
                                                     <th rowspan="2">지역</th>
@@ -249,7 +249,7 @@ function getExcel(){
                                                     </c:when>
                                                 </c:choose>
                                                 <c:choose>     
-                                                    <c:when test="${gubun eq 'G'}">
+                                                    <c:when test="${gubun eq 'g'}">
                                                     <th rowspan="2">번호</th>
                                                     <th rowspan="2">생활치료센터명</th>
                                                     <th rowspan="2">지역</th>
@@ -263,7 +263,7 @@ function getExcel(){
                                                 </tr>
                                                 <tr>
                                                 <c:choose>     
-                                                    <c:when test="${gubun eq 'M'}">
+                                                    <c:when test="${gubun eq 'm'}">
                                                     <th>의사</th>
                                                     <th>간호사</th>
                                                     <th>간호조무사</th>
@@ -282,7 +282,7 @@ function getExcel(){
                                                     </c:when>
                                                 </c:choose>
                                                 <c:choose>     
-                                                    <c:when test="${gubun eq 'G'}">
+                                                    <c:when test="${gubun eq 'g'}">
                                                     <th>복지부</th>
                                                     <th>지자체</th>
                                                     <th>환경부</th>
@@ -324,7 +324,7 @@ function getExcel(){
                                                                 <td><fmt:formatNumber value="${l.staff9}" pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value="${l.staff10}" pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value="${l.staff11}" pattern="#,###" /></td>  
-                                                                <c:if test="${gubun eq 'M'}"> 
+                                                                <c:if test="${gubun eq 'm'}"> 
                                                                     <td><fmt:formatNumber value="${l.staff12}" pattern="#,###" /></td>
                                                                     <td><fmt:formatNumber value="${l.staff13}" pattern="#,###" /></td>
                                                                     <td><fmt:formatNumber value="${l.staff14}" pattern="#,###" /></td>