xiug

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -109,6 +109,9 @@ public static String getWeekStart(){
                 sysOrg1 = remoteOrgService.selectOrgById(s.getParentId(), SecurityConstants.INNER);
             } else {
                 sysOrg1 = remoteOrgService.selectOrgById(remoteOrgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
+          if (-1==sysOrg1.getShortName().indexOf("地区行社")){
+              sysOrg1 = remoteOrgService.selectOrgById(remoteOrgService.selectOrgById(remoteOrgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
+          }
             }
             monitoringAccessVO.setCity(sysOrg1.getShortName().split("地区行社")[0]);
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/MonitorAccessReportMapper.xml

@@ -34,9 +34,7 @@
         SELECT COUNT(1) FROM sys_org WHERE path LIKE  concat( #{orgPath}, '%') AND type=4 AND deleted=0
     </select>
     <select id="selectAll" resultType="com.xunmei.core.reportForms.monitor.vo.MonitoringAccessVO">
-
         SELECT
-
         COUNT( a.id ) AS planAccessNumber,
         IFNULL(	SUM(
         IF
@@ -55,9 +53,9 @@
         <if test="cycle != null  and cycle != ''">
             AND a.cycle = #{cycle}
         </if>
-        <if test="startDate != null  and endDate != null">
-            AND a.start_time >= #{startDate} AND a.end_time &lt;= #{endDate}
-        </if>
 
+                <if test="startDate != null  and endDate != null">
+                    AND a.plan_start_time >= #{startDate} AND a.plan_end_time &lt;= #{endDate}
+                </if>
     </select>
 </mapper>