Explorar el Código

2021-02-09 운영배포적용

huiwon.seo hace 4 años
padre
commit
906b6923cb

+ 21 - 0
src/main/java/com/lemon/lifecenter/controller/CenterController.java

@@ -370,6 +370,9 @@ public class CenterController extends LifeCenterController {
         Cell cell12 = row.createCell(11);
         Cell cell13 = row.createCell(12);
         Cell cell14 = row.createCell(13);
+        Cell cell15 = row.createCell(14);
+        Cell cell16 = row.createCell(15);
+        Cell cell17 = row.createCell(16);
         
         cell1.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell2.setCellStyle(styleOfBoardFillFontBlackBold16);
@@ -385,6 +388,9 @@ public class CenterController extends LifeCenterController {
         cell12.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell13.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell14.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell15.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell16.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell17.setCellStyle(styleOfBoardFillFontBlackBold16);
         
         sheet1.setColumnWidth( 0, 10000); //생활치료센터명
         sheet1.setColumnWidth( 1, 5000); //지역
@@ -400,6 +406,9 @@ public class CenterController extends LifeCenterController {
         sheet1.setColumnWidth( 11, 2500); //퇴소자수
         sheet1.setColumnWidth( 12, 2500); //지정병원이송
         sheet1.setColumnWidth( 13, 2500); //기타
+        sheet1.setColumnWidth( 14, 3500); // 등록일
+        sheet1.setColumnWidth( 15, 3500); // 종료일
+        sheet1.setColumnWidth( 16, 3500); // 상태
         
         cell1.setCellValue("생활치료센터명");
         cell2.setCellValue("지역");
@@ -415,6 +424,9 @@ public class CenterController extends LifeCenterController {
         cell12.setCellValue("퇴소자수");
         cell13.setCellValue("지정병원이송");
         cell14.setCellValue("기타");
+        cell15.setCellValue("등록일");
+        cell16.setCellValue("종료일");
+        cell17.setCellValue("상태");
         
         for (CenterInfoDTO dto : data) {
             row = sheet1.createRow(i);
@@ -432,6 +444,9 @@ public class CenterController extends LifeCenterController {
             cell12 = row.createCell(11);
             cell13 = row.createCell(12);
             cell14 = row.createCell(13);
+            cell15 = row.createCell(14);
+            cell16 = row.createCell(15);
+            cell17 = row.createCell(16);
             
             String centerName = dto.getCenterName();
             String locationName = dto.getLocationName();
@@ -462,6 +477,9 @@ public class CenterController extends LifeCenterController {
             cell12.setCellValue(patientTotalD);
             cell13.setCellValue(patientTotalT);
             cell14.setCellValue(patientTotalE);
+            cell15.setCellValue(dto.getCreateDate());
+            cell16.setCellValue(dto.getExpirationDate());
+            cell17.setCellValue(dto.getUseYn());
             
             i++;
         }
@@ -481,6 +499,9 @@ public class CenterController extends LifeCenterController {
         cell12 = row.createCell(13);
         cell13 = row.createCell(14);
         cell14 = row.createCell(15);
+        cell15 = row.createCell(16);
+        cell16 = row.createCell(17);
+        cell17 = row.createCell(18);
         
         try {
 //          File file = new File(".");

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

@@ -127,7 +127,7 @@ function pwReset() {
                                             </td>
                                         </tr>
                                         <tr>
-                                            <th>등록일</th>
+                                            <th>등록일</th>
                                             <td>
                                                 <c:out value="${centerInfo.createDate}" />
                                             </td>

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

@@ -225,7 +225,7 @@ function getExcel(){
                                                     <th rowspan="2">담당자(ID)</th>
                                                     <th rowspan="2">응급전화번호</th>
                                                     <th colspan="5">인원 수 (단위 : 명)</th>
-                                                    <th rowspan="2">등록일</th>
+                                                    <th rowspan="2">등록일</th>
                                                     <th rowspan="2">종료일</th>
                                                     <th rowspan="2">상태</th>
                                                 </tr>

+ 52 - 52
src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -5,56 +5,56 @@
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript">
 
-$( function(){
-    token( "getToken" );
-    var redirectUrl = "<c:out value='${redirectUrl}' />" ;
-    if (redirectUrl != "") {
-        location.href = "./" + redirectUrl;
-    }
-});
+// $( function(){
+//     token( "getToken" );
+//     var redirectUrl = "<c:out value='${redirectUrl}' />" ;
+//     if (redirectUrl != "") {
+//         location.href = "./" + redirectUrl;
+//     }
+// });
 
-function getToken(token, deviceType, macAddress) {
-    var jsonMsg = {
-        patientIdx : "<c:out value='${patientIdx}' />",
-        deviceType : deviceType,
-        deviceToken : token,
-        macAddress : macAddress
-    };
+// function getToken(token, deviceType, macAddress) {
+//     var jsonMsg = {
+//         patientIdx : "<c:out value='${patientIdx}' />",
+//         deviceType : deviceType,
+//         deviceToken : token,
+//         macAddress : macAddress
+//     };
     
-    $.ajax({
-        url      : "/mobile/insertDeviceInfo",
-        data     : JSON.stringify(jsonMsg),
-        method   : "POST",
-        contentType: 'application/json',
-        success  : function( data ){
-            console.log(JSON.stringify(data));
-          if( typeof success == "function" ){
-            //success( data );
-          };
-        },
-        error : function(jqXHR, exception){
-          if( typeof error == "function" ) {
-            //error(jqXHR, exception);
-          };
-        }
-    }).done( function(){
-        if( typeof done == "function" ){
-          //done();
-        };
-    });
-}
+//     $.ajax({
+//         url      : "/mobile/insertDeviceInfo",
+//         data     : JSON.stringify(jsonMsg),
+//         method   : "POST",
+//         contentType: 'application/json',
+//         success  : function( data ){
+//             console.log(JSON.stringify(data));
+//           if( typeof success == "function" ){
+//             //success( data );
+//           };
+//         },
+//         error : function(jqXHR, exception){
+//           if( typeof error == "function" ) {
+//             //error(jqXHR, exception);
+//           };
+//         }
+//     }).done( function(){
+//         if( typeof done == "function" ){
+//           //done();
+//         };
+//     });
+// }
 
-function token(callback) {
-    console.log(callback);
-    var jsonMsg = {
-        "type":"command",
-        "functionType":"token",
-        "value" : {
-            "callbackFn" : callback
-        }
-    }
-    toNative(jsonMsg);
-}
+// function token(callback) {
+//     console.log(callback);
+//     var jsonMsg = {
+//         "type":"command",
+//         "functionType":"token",
+//         "value" : {
+//             "callbackFn" : callback
+//         }
+//     }
+//     toNative(jsonMsg);
+// }
 </script>
 </head>
 <body>
@@ -99,9 +99,9 @@ function token(callback) {
                             <li>
                                 <a href="./nonface">비대면 진료(Untact Treatment)</a>
                             </li>
-                            <li>
-                                <a href="./push/list">메시지 수신함(Message received)</a>
-                            </li>
+<!--                             <li> -->
+<!--                                 <a href="./push/list">메시지 수신함(Message received)</a> -->
+<!--                             </li> -->
                             <!-- li>
                                 <a href="javascript:;">생활치료센터 이용 안내</a>
                             </li -->
@@ -141,7 +141,7 @@ function token(callback) {
                         <div style="display:inline-block;width:80%;">
                          오늘의 건강정보를<br/>기록해주세요.
                         </div>
-                        <div onclick='systemBrowsing( "https://life-center-dev.lemonhc.com/mobile/call?c=<c:out value="${centerCode}"/>");'
+                        <div onclick='systemBrowsing( "https://life-center.lemonhc.com/mobile/call?c=<c:out value="${centerCode}"/>");'
                             style="position:absolute;right:-25px;top:-25px;display:inline-block;width:114px;height:106px;font-size:0;">
                                 <img src="/resources/images/mobile/emergency_call.png" style="width:114px;height:106px;"/>
                         </div>
@@ -197,7 +197,7 @@ function token(callback) {
                 </ul>
             </div>
             <div class="user_guide">
-                <a href="tel:1661-7551">
+                <a href="#">
                     <span class="icon">
 <!--                         <img src="/resources/images/mobile/guide_icon.png" /> -->
                     </span>