c s

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/StatisticsBean.java

@@ -97,4 +97,16 @@ public class StatisticsBean {
     
     // 排名变化
     private Integer ranking_change;
+    
+    // 照片
+    private String pics ;
+    
+    // 稽查人员id
+    private Integer checkman_id ;
+    
+    private String checkman_name ;
+    
+    // 被考核人的姓名
+    private String checked_name ;
+    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/StatisticsController.java

@@ -168,5 +168,6 @@ public class StatisticsController extends BaseController {
     	PageHelper.offsetPage(page, size);
     	List<StatisticsBean> returnList=  statisticsService.getOneCheckedDetailInfo(obj);
     	return super.returnSuccessResult(new PageInfo(returnList));
-    }    
+    }
+    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -267,10 +267,23 @@
      </select>
      
      <select id="selectOneCheckedDetailInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-     	SELECT t.start_time AS start_date , t.end_time AS end_date,cs.check_item_score AS score , ci.name AS name  FROM check_task t 
+     	SELECT t.start_time AS start_date , t.end_time AS end_date,cs.check_item_score AS score , ci.name AS name, cs.pics ,t.checkman AS checkman_id,
+     	t.checked_person AS user_id ,t.checked_dept AS dept_id FROM check_task t 
      		INNER JOIN check_score cs ON t.id = cs.task_id 
      		LEFT JOIN check_item ci ON ci.id = cs.check_item_id  
-     		where t.checked_person = #{user_id}
+     		where   t.check_status !=22
+     		<if test="queryType!=null and queryType==0">
+     			AND   t.checked_person = #{user_id}
+     		</if>
+     		<if test="queryType!=null and queryType==1">
+     			AND  t.checkman = #{user_id}
+     		</if>
+     		<if test="start_date !=null">
+				AND  t.start_time >= #{start_date}
+			</if>
+			<if test="end_date !=null">
+				AND t.end_time &lt;= #{end_date}
+			</if>
      </select>
      
 </mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/StatisticsService.java

@@ -64,6 +64,6 @@ public interface StatisticsService {
 	// 个人各项扣分情况
 	public List<StatisticsBean> getOneCheckedItemInfo(StatisticsBean obj);
 	
-	// 个人扣分情况
+	// 个人扣分情况 / 个人稽查情况
 	public List<StatisticsBean> getOneCheckedDetailInfo(StatisticsBean obj);
 }

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

@@ -878,18 +878,24 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		return  statisticsDao.selectOneCheckedInfo(obj);
 	}
 
-	
-
 	@Override
-	public List<StatisticsBean> getOneCheckedDetailInfo(StatisticsBean obj) {
+	public List<StatisticsBean> getOneCheckedItemInfo(StatisticsBean obj) {
 		
-		return statisticsDao.selectOneCheckedDetailInfo(obj);
+		return statisticsDao.selectOneCheckedItemInfo(obj);
 	}
+	
 
 	@Override
-	public List<StatisticsBean> getOneCheckedItemInfo(StatisticsBean obj) {
-		
-		return statisticsDao.selectOneCheckedItemInfo(obj);
+	public List<StatisticsBean> getOneCheckedDetailInfo(StatisticsBean obj) {
+		List<StatisticsBean> list = statisticsDao.selectOneCheckedDetailInfo(obj);		
+		if(obj.getQueryType() == 1){
+			for(StatisticsBean sta : list){
+				sta.setCheckman_name( CacheUtil.getUserFromMap(sta.getCheckman_id()+0L).getTruename()  ); 
+				sta.setChecked_name( CacheUtil.getUserFromMap(sta.getUser_id()+0L).getTruename());
+				sta.setFeeStationName( CacheUtil.getOrganFromMap(sta.getDept_id()).getOrganname() );
+			}
+		}
+		return list;
 	}
 	
 }