Merge branch 'master' of http://wcollector.idatabank.com:5230/dbs289/LifeCenterScheduler.git

src/main/java/com/lemon/lifecenter/scheduler/common/HomeController.java

@@ -104,11 +104,11 @@ public class HomeController {
         pushController.everyDayPushSend();
     }
     
-    @Scheduled(cron = "31 * * * * *", zone = "Asia/Seoul")
-    public void sendTask2() {
-        pushController.selectSendPushList();
-        pushController.everyDayPushSend();
-    }
+    // @Scheduled(cron = "31 * * * * *", zone = "Asia/Seoul")
+    // public void sendTask2() {
+    //     pushController.selectSendPushList();
+    //     pushController.everyDayPushSend();
+    // }
     
 //    
 //    @Scheduled(cron = "16 * * * * *", zone = "Asia/Seoul")

src/main/java/com/lemon/lifecenter/scheduler/controller/PushController.java

@@ -295,7 +295,7 @@ public class PushController {
                         "    INDEX [i_push_result_" + ym + "_push_idx] ([push_idx]),\r\n" + 
                         "    INDEX [i_push_result_" + ym + "_success_yn] ([success_yn]),\r\n" + 
                         "    INDEX [i_push_result_" + ym + "_state] ([state]),\r\n" + 
-                        "    INDEX [i_push_result_" + ym + "_update_date] ([update_date]),\r\n" + 
+                        "    INDEX [i_push_result_" + ym + "_update_date] ([update_date])\r\n" + 
 //                        "    CONSTRAINT [fk_push_result_" + ym + "_push_idx] FOREIGN KEY([push_idx]) REFERENCES [patient_care] ([patient_idx]) ON DELETE NO ACTION ON UPDATE NO ACTION\r\n" + 
                         ")\r\n" + 
                         "REUSE_OID,\r\n" + 
@@ -334,7 +334,7 @@ public class PushController {
                         "    INDEX [i_push_result_" + ym + "_push_idx] ([push_idx]),\r\n" + 
                         "    INDEX [i_push_result_" + ym + "_success_yn] ([success_yn]),\r\n" + 
                         "    INDEX [i_push_result_" + ym + "_state] ([state]),\r\n" + 
-                        "    INDEX [i_push_result_" + ym + "_update_date] ([update_date]),\r\n" +
+                        "    INDEX [i_push_result_" + ym + "_update_date] ([update_date])\r\n" +
 //                        "    CONSTRAINT  [fk_push_result_" + ym + "_push_idx] FOREIGN KEY([push_idx]) REFERENCES [patient_care] ([patient_idx]) ON DELETE NO ACTION ON UPDATE NO ACTION\r\n" + 
                         ")\r\n" + 
                         "REUSE_OID,\r\n" + 

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

@@ -261,6 +261,7 @@
                SET END_DATE = NOW(),
                    SEND_STATE = 'C'
              WHERE PUSH_IDX = #{pushIdx}
+               AND IDX = #{idx}
         ]]>
         <if test='sendType != null and sendType != ""'>
             <if test='sendType != "E"'>