c s

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.bean.StatisticsBean;
+import com.xintong.visualinspection.bean.User;
 
 /**
  * 文件名：UserInfoDao
@@ -22,5 +23,5 @@ public interface DepartmentDao  {
     public List<FeeStation> getAllFS();
     public FeeStation getFsBydeptId(Integer id);
     
-    public List<StatisticsBean> selectFeeStationGroup(StatisticsBean obj);
+    public List<StatisticsBean> selectFeeStationGroup(User obj);
 }

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

@@ -93,7 +93,15 @@
 	<select id="selectFeeStationGroup" 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 t.POSITIONID in (1,6) AND s.ORGAN_ID IS NOT NULL GROUP BY s.ORGAN_ID 
+			WHERE 1=1 
+			<if test="position_ids != null and position_ids.size() > 0">AND
+        		AND t.positionid in 
+        		<foreach collection="position_ids" item="position_id" index="index"
+		            open="(" close=")" separator=",">
+		            #{position_id}
+		        </foreach>
+        	</if>
+			AND s.ORGAN_ID IS NOT NULL GROUP BY s.ORGAN_ID 
 	</select>
     
 </mapper>

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

@@ -142,7 +142,17 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 	@Override
 	public List<StatisticsBean> getFeeStationCheckedScore(StatisticsBean obj) {
 		// 获取收费站信息收费站人数
-		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(obj);
+		Constant t =  CodeUtil.getCodeByFlagAndValue("feestation_check_jobs", "1");
+		String[] postions = t.getCode_name().split(",");
+		User user = new User();
+		List<Integer> positionList = new ArrayList<Integer>();
+		for(int i =0 ;i<postions.length;i++){
+			positionList.add(Integer.parseInt(postions[i]));
+		}
+		user.setPosition_ids(positionList);
+		
+		
+		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
 		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
 		int i = 0;
 		for (StatisticsBean sta : lists) {
@@ -219,7 +229,15 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 	public List<StatisticsBean> getFeeStationCheckItemScore(StatisticsBean obj) {
 
 		// 获取收费站信息收费站人数
-		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(obj);
+		Constant t =  CodeUtil.getCodeByFlagAndValue("feestation_check_jobs", "1");
+		String[] postions = t.getCode_name().split(",");
+		User user = new User();
+		List<Integer> positionList = new ArrayList<Integer>();
+		for(int i =0 ;i<postions.length;i++){
+			positionList.add(Integer.parseInt(postions[i]));
+		}
+		user.setPosition_ids(positionList);
+		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
 		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
 		int i = 0;
 		for (StatisticsBean sta : lists) {
@@ -577,7 +595,16 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			}
 		}
 		
-		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(obj);
+		Constant t =  CodeUtil.getCodeByFlagAndValue("feestation_check_jobs", "1");
+		String[] postions = t.getCode_name().split(",");
+		User user = new User();
+		List<Integer> positionList = new ArrayList<Integer>();
+		for(int i =0 ;i<postions.length;i++){
+			positionList.add(Integer.parseInt(postions[i]));
+		}
+		user.setPosition_ids(positionList);
+		
+		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
 		int i = 0;
 		for (StatisticsBean sta : lists) {
 			if (i < 7) {