云迹拉取修改

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

@@ -465,11 +465,11 @@ public class CloudActivityController extends BaseController {
             logger.error("获取crm板块接口失败");
         }
         List<DutyStaffEntity> dutyList = iUser.getOndutyById(userEntity.getId());
-        model.addAttribute("limitDate", "1");
+        model.addAttribute("limitDate", "0");
         if (CollectionUtils.isNotEmpty(dutyList)) {
-            if ("1".equals(dutyList.get(0).getOnduty())) {
+            if ("0".equals(dutyList.get(0).getOnduty())) {
                 //名单内:值班不限制时间选择范围
-                model.addAttribute("limitDate", "0");
+                model.addAttribute("limitDate", "1");
             }
         }
         model.addAttribute("districts", districts);

house365-hgs-web/src/main/webapp/WEB-INF/views/cloudactivity/pages/addcloud.jsp

@@ -148,7 +148,6 @@
                                     清空
                                 </a>
                             </div>
-                            <div style="margin-left: 180px;">由于CRM限制，访问时间暂时仅限近30天</div>
                         </div>
                     </div>
 
@@ -416,9 +415,8 @@
                         var activeId = response.data.id;
                         $("#total").val(total);
                         $("#activeId").val(activeId);
-                        if (total > 3000) {
-                            alert("数据量超过3000条，请缩小范围");
-                            0
+                        if (total > 1000) {
+                            alert("数据量超过1000条，请缩小范围");
                             return false;
                         }
                         $("#confirmDialog").attr("title", "查询确认");

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

@@ -1330,7 +1330,6 @@ public class CustomerImpl implements ICustomer {
                         oldEntity.setIsHandover(1);
                         oldEntity.setManagerName(user.getRealName());
                         //转移判断旧的客户是否有回访记录，有则变更活跃状态，无则不变
-//                        Map<String, Object> searchMap = new HashMap<>(10);
                         paramMap.clear();
                         paramMap.put("phone", oldPhone);
                         paramMap.put("cityCode", customer.getCityCode());
@@ -1343,7 +1342,6 @@ public class CustomerImpl implements ICustomer {
                             for (CustomerEntity c : list) {
                                 idList.add(c.getId());
                             }
-//                            Map<String, Object> callBackMap = new HashMap<>(10);
                             paramMap.clear();
                             paramMap.put("idList", idList);
                             List<CustomerCallbackLogEntity> backList = callbackMapper.queryByConditions(paramMap);
@@ -1352,7 +1350,6 @@ public class CustomerImpl implements ICustomer {
                             }
                         }
                         //将客户标签一并合并给新的安家顾问名下该客户
-//                        Map<String, Object> labelMap = new HashMap<>(10);
                         paramMap.clear();
                         paramMap.put("oldManagerId", oldManagerId);
                         paramMap.put("customerId", customer.getId());
@@ -1389,7 +1386,6 @@ public class CustomerImpl implements ICustomer {
                         //添加客户操作日志
                         int paramType = 7;
                         //客户转移 (同时要更新转移客户日志中安家顾问id)
-//                        Map<String, Object> updateMap = new HashMap<>(10);
                         paramMap.clear();
                         paramMap.put("phone", customer.getPhone());
                         paramMap.put("oldManagerId", oldManagerId);
@@ -1415,7 +1411,6 @@ public class CustomerImpl implements ICustomer {
                         }
                         //如果当前客户是云迹客户，需要更新cloud_customer 派工时间和置业顾问
                         if (customer.getCustomerSourceType() == 7) {
-//                            Map<String, Object> queryMap = new HashMap<>(5);
                             paramMap.clear();
                             if ("cloud".equals(type)) {
                                 paramMap.put("customerId", Integer.valueOf(assignFrom));