Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -329,10 +329,10 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
     @Override
     public SyncCheckDTO getTaskCheck(String wxEnterpriseId) {
         String taskId = getTaskLock(wxEnterpriseId);
+        SyncCheckDTO syncCheckDTO = new SyncCheckDTO();
         if (null == taskId) {
-            return null;
+            return syncCheckDTO;
         }
-        SyncCheckDTO syncCheckDTO = new SyncCheckDTO();
         TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
         syncCheckDTO.setSyncStatus(syncTask.getStatusFlag());
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SyncDealContoller.java

@@ -112,5 +112,17 @@ public class SyncDealContoller extends WebBaseController {
 
     }
 
+    @RequestMapping("/close-sync")
+    @ResponseBody
+    public HaobanResponse closeReSync(String wxEnterpriseId) {
+        if (StringUtils.isBlank(wxEnterpriseId)) {
+            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            wxEnterpriseId = login.getWxEnterpriseId();
+        }
+        dealSyncOperationApiService.closeTask(wxEnterpriseId);
+        return resultResponse(HaoBanErrCode.ERR_1);
+
+    }
+
 
 }