修改回访统计报表样式

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

@@ -568,14 +568,15 @@ public class MarketingActivityController extends BaseController {
                 List<CrmSourceEntity> sourceList = crmSourceService.getListByCategory(source);
                 if (sourceList != null && !sourceList.isEmpty()) {
                     for (CrmSourceEntity sourceEntity : sourceList) {
-                        //南京站新需求 过滤400来电562 和房博士im咨询99
-                        if ("nj".equals(cityCode)) {
-                            if (sourceEntity.getSourceId() != 99 && sourceEntity.getSourceId() != 562) {
-                                crmSourceSet.add(String.valueOf(sourceEntity.getSourceId()));
-                            }
-                        } else {
-                            crmSourceSet.add(String.valueOf(sourceEntity.getSourceId()));
-                        }
+                        crmSourceSet.add(String.valueOf(sourceEntity.getSourceId()));
+                        //南京站新需求 过滤400来电562 和房博士im咨询99 // crm已经限制，全链条不限制
+//                        if ("nj".equals(cityCode)) {
+//                            if (sourceEntity.getSourceId() != 99 && sourceEntity.getSourceId() != 562) {
+//                                crmSourceSet.add(String.valueOf(sourceEntity.getSourceId()));
+//                            }
+//                        } else {
+//                            crmSourceSet.add(String.valueOf(sourceEntity.getSourceId()));
+//                        }
                     }
                 }
             }

house365-hgs-web/src/main/webapp/WEB-INF/common/layouts/topbar.jsp

@@ -68,9 +68,9 @@
                                                 <li>
                                                     <a tabindex="-1" href="${ctx}/statistic/cloudCusReport/">云迹数据统计表</a>
                                                 </li>
-<%--                                                <li>--%>
-<%--                                                    <a tabindex="-1" href="${ctx}/statistic/callBackTraceStatistic/">回访跟进统计</a>--%>
-<%--                                                </li>--%>
+                                                <li>
+                                                    <a tabindex="-1" href="${ctx}/statistic/callBackTraceStatistic/">回访跟进统计</a>
+                                                </li>
                                             </ul>
                                         </li>
                                     </shiro:hasPermission>

house365-hgs-web/src/main/webapp/WEB-INF/views/statistic/pages/callBackTraceStatistic.jsp

@@ -25,13 +25,15 @@
               action="${ctx}/statistic/callBackTraceStatistic" method="get">
             <div style="margin-top:10px;">
                 &nbsp;&nbsp;数据日期：&nbsp;&nbsp;
-                <input type="text" name="startTime" id="startTime" class="m-wrap small mydate span2" placeholder="起始时间">到
-                <input type="text" name="endTime" id="endTime" class="m-wrap small mydate span2" placeholder="截止时间">
+                <input type="text" name="startTime" id="startTime" style="width: 120px;" class="m-wrap small mydate span2" placeholder="起始时间">到
+                <input type="text" name="endTime" id="endTime" style="width: 120px;" class="m-wrap small mydate span2" placeholder="截止时间">
                 &nbsp;&nbsp;
 <%--                <a class="btn " onclick="btnSubmit();">提交</a>--%>
                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                 <input type="text" placeholder="搜索置业顾问" name="search_LIKE_realName" value="${param['search_LIKE_realName']}">
-                <div class="inputSearch__btn" onclick="$('#filterForm').submit();"></div>
+                <div class="inputSearch__btn" onclick="$('#filterForm').submit();"
+                    style="display: inline-block; position: relative; top: 9px;left: 5px;"
+                ></div>
             </div>
 
             <input type="hidden" name="deptId" id="deptId" value="${deptId}">

house365-hgs-ws/src/main/java/com/house365/ws/service/impl/StaffDuty.java

@@ -1299,7 +1299,7 @@ public class StaffDuty implements IStaffDuty {
         for (String source : quickSource.split(",")) {
             List<CrmSourceEntity> sourceList = crmSourceService.getListByCategory(source);
             if (CollectionUtils.isNotEmpty(sourceList)) {
-                sourceList.removeIf(m -> m.getSourceId() == 99 || m.getSourceId() == 562);
+//                sourceList.removeIf(m -> m.getSourceId() == 99 || m.getSourceId() == 562);  //CRM已经限制，此处无需限制
                 sourceList.forEach(s -> crmSourceSet.add(String.valueOf(s.getSourceId())));
             }
         }