Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/custom/panacim/PanaApiController.java

@@ -590,11 +590,27 @@ public class PanaApiController extends BaseSmfApiListener {
 
 
     @Override
     @Override
     public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
     public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
-        if(task.isFinished()){
-            if(task.isPutInTask()){
+        if (task.isPutInTask()) {
+            if (task.isFinished()) {
                 checkInNotification(task);
                 checkInNotification(task);
-            }else{
+            }
+        } else if (task.isCheckOutTask()) {
+            if (task.isOutBox()) {
                 deliverNotification(task);
                 deliverNotification(task);
+                task.updateAppendData("notify",true);
+                dataLogDao.save(task);
+                taskService.moveTaskToFinished(task);
+            } else if (task.isFinished()){
+                Boolean notify = task.getAppendData("notify");
+                if (notify == null){
+                    notify = false;
+                }
+                if (!notify) {
+                    deliverNotification(task);
+                    task.updateAppendData("notify", true);
+                    dataLogDao.save(task);
+                    taskService.moveTaskToFinished(task);
+                }
             }
             }
         }
         }
     }
     }