营销活动拉取修改

house365-hgs-web/src/main/java/com/house365/web/controller/BaseTreeController.java

@@ -294,7 +294,7 @@ public class BaseTreeController extends BaseController {
     ) {
         List<BaseTreeEntity> models = null;
         BaseTreeListRequest listReq = new BaseTreeListRequest();
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(10);
         BaseTreeEntity deptEntity = baseTree.getRootBySourceType(show);
         map.put("REGEXP_urlPath", "^" + deptEntity.getUrlPath() + "$|^" + deptEntity.getUrlPath() + "/");
         Page page = new Page(1, Integer.MAX_VALUE);

house365-hgs-web/src/main/java/com/house365/web/controller/CloudActivityController.java

@@ -132,6 +132,16 @@ public class CloudActivityController extends BaseController {
         return "----------updateStatus success---------";
     }
 
+    @RequestMapping(value = "/updateDutyStaff")
+    @ResponseBody
+    public String updateDutyStaff() {
+        activityInterface.updateDutyStaff();
+        System.out.println("----------updateDutyStaff成功---------");
+        return "----------updateDutyStaff success---------";
+    }
+
+
+
     /**
      * 云迹报表详情列表
      *

house365-hgs-web/src/main/java/com/house365/web/controller/CrmSourceController.java

@@ -15,9 +15,11 @@
 package com.house365.web.controller;
 
 import com.house365.beans.entity.CrmSourceEntity;
+import com.house365.beans.entity.DepartmentEntity;
 import com.house365.beans.system.Page;
 import com.house365.beans.vo.CrmSourceVo;
 import com.house365.web.system.controller.BaseController;
+import com.house365.web.util.SessionConstants;
 import com.house365.web.util.StringUtils;
 import com.house365.ws.beans.request.CrmSourceListRequest;
 import com.house365.ws.beans.request.CrmSourceRequest;
@@ -26,6 +28,7 @@ import com.house365.ws.beans.response.CrmSourceResponse;
 import com.house365.ws.interfaces.server.ICrmSource;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
@@ -71,8 +74,8 @@ public class CrmSourceController extends BaseController {
     /**
      * 新增CrmSource
      *
-     * @param vo CrmSource页面表单对象
-     * @param result    表单验证数据
+     * @param vo     CrmSource页面表单对象
+     * @param result 表单验证数据
      * @return 结果视图
      */
     @RequestMapping(value = "", method = {RequestMethod.POST})
@@ -105,7 +108,7 @@ public class CrmSourceController extends BaseController {
     /**
      * 删除CrmSource
      *
-     * @param id      CrmSource页面表单对象唯一标识
+     * @param id CrmSource页面表单对象唯一标识
      * @return 结果视图
      */
     @RequestMapping(value = "/{id}", method = {RequestMethod.DELETE})
@@ -126,7 +129,7 @@ public class CrmSourceController extends BaseController {
     /**
      * 去查看CrmSource
      *
-     * @param id      CrmSource页面表单对象唯一标识
+     * @param id CrmSource页面表单对象唯一标识
      * @return 结果视图
      */
     @RequestMapping(value = "/{id}", method = {RequestMethod.GET})
@@ -139,7 +142,7 @@ public class CrmSourceController extends BaseController {
     /**
      * 去修改CrmSource
      *
-     * @param id      CrmSource页面表单对象唯一标识
+     * @param id CrmSource页面表单对象唯一标识
      * @return 结果视图
      */
     @RequestMapping(value = "/{id}", method = {RequestMethod.GET}, params = "action=edit")
@@ -153,8 +156,8 @@ public class CrmSourceController extends BaseController {
     /**
      * 修改CrmSource
      *
-     * @param vo CrmSource页面表单对象
-     * @param result    表单验证数据
+     * @param vo     CrmSource页面表单对象
+     * @param result 表单验证数据
      * @return 结果视图
      */
     @RequestMapping(value = "/{id}", method = {RequestMethod.POST})
@@ -188,7 +191,7 @@ public class CrmSourceController extends BaseController {
     /**
      * 查询CrmSource
      *
-     * @param request   请求对象
+     * @param request 请求对象
      * @return 结果视图
      */
     @RequestMapping(value = "", method = RequestMethod.GET)
@@ -229,14 +232,16 @@ public class CrmSourceController extends BaseController {
 
     @RequestMapping(value = "ajax/load", produces = "application/json;charset=utf-8")
     @ResponseBody
-    public Object load(HttpServletRequest request,
-                       @RequestParam(value = "id", required = false) String categoryId, String choseIds) {
+    public Object load(HttpServletRequest request, @RequestParam(value = "id", required = false) String categoryId, String choseIds) {
+        DepartmentEntity departmentEntity = (DepartmentEntity) request.getSession().getAttribute(SessionConstants.SESSION_CURRNET_DEPT_KEY);
+        String city = departmentEntity.getDescripition();
+
         List<CrmSourceEntity> models;
         Page page = new Page();
         page.setPageSize(Integer.MAX_VALUE);
         CrmSourceListRequest req = new CrmSourceListRequest();
         req.setPaging(page);
-        Map<String, Object> parameter = new HashMap<>();
+        Map<String, Object> parameter = new HashMap<>(10);
 
         parameter.put("EQ_categoryId", categoryId);
 
@@ -246,6 +251,10 @@ public class CrmSourceController extends BaseController {
         String[] choseIdArray = choseIds.split(",");
         Set choseIdsSet = new HashSet();
         Collections.addAll(choseIdsSet, choseIdArray);
+        //南京站新需求 过滤400来电562 和房博士im咨询99
+        if (CollectionUtils.isNotEmpty(models) && "nj".equals(city)) {
+            models.removeIf(m -> m.getSourceId() == 99 || m.getSourceId() == 562);
+        }
         JSONArray sources = new JSONArray();
         for (CrmSourceEntity model : models) {
             JSONObject source = new JSONObject();

house365-hgs-ws-interfaces/src/main/java/com/house365/ws/interfaces/server/ICloudActivityInterface.java

@@ -32,4 +32,6 @@ public interface ICloudActivityInterface {
     void addCloudActivityNew();
 
     void updateStatus();
+
+    void updateDutyStaff();
 }

house365-hgs-ws/src/main/java/com/house365/ws/interfaces/impl/CloudActivityImpl.java

@@ -372,6 +372,11 @@ public class CloudActivityImpl implements ICloudActivityInterface {
         staffDuty.updateJgStatus();
     }
 
+    @Override
+    public void updateDutyStaff() {
+        staffDuty.updateDutyStaff();
+    }
+
     private String dealRate(int count1, int count2) {
         String rate = "";
         if (count1 > 0 && count2 > 0) {