修改统计人数

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -98,7 +98,15 @@
 	<select id="selectFeeStationGroup" parameterType="com.xintong.visualinspection.bean.User" resultType="com.xintong.visualinspection.bean.StatisticsBean"  >
 		SELECT COUNT(1) AS people_num,s.ORGAN_ID AS dept_id, s.name from t_sys_users t 
 			       LEFT JOIN t_br_layer_fee_station s ON t.ORGANID = s.ORGAN_ID
-			WHERE 1=1 
+			WHERE 1=1
+
+        <if test="invalidtime != null">
+            AND  t.id not in ( select t_s_y.id from t_sys_users t_s_y
+            LEFT join (select starttime,endtime from check_task_period ) t_p on DELETE_TIME &gt;= starttime and DELETE_TIME &lt; endtime
+            WHERE STATUS =-1 and DELETE_TIME &gt;= t_p.starttime and DELETE_TIME &lt; t_p.endtime and date_sub(t_p.starttime,interval 1 hour) &lt;= #{invalidtime} )
+        </if>
+
+
 			<if test="position_ids != null and position_ids.size() > 0">
         		AND t.positionid in 
         		<foreach collection="position_ids" item="position_id" index="index"

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -298,6 +298,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		}
 		user.setPosition_ids(positionList);
 
+        user.setInvalidtime(obj.getStart_date());
 		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
 		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
 		int i = 0;
@@ -403,6 +404,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			positionList.add(Integer.parseInt(postions[i]));
 		}
 		user.setPosition_ids(positionList);
+		user.setInvalidtime(obj.getStart_date());
 		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
 		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
 		int i = 0;