chenrj-PC\chenrj преди 8 години
родител
ревизия
af2c4be731

+ 13 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/StatisticsController.java

@@ -4,12 +4,16 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.xintong.visualinspection.bean.StatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBo;
+import com.xintong.visualinspection.bean.Team;
 import com.xintong.visualinspection.service.StatisticsService;
 
 /**
@@ -156,4 +160,13 @@ public class StatisticsController extends BaseController {
     	return super.returnSuccessResult(returnList);
     }
     
+    /**
+     * 获取收费站具体某个人的扣分详情
+     */
+    @RequestMapping(value = "/one/checkedItem/detail/info/{page}/{size}")
+    public String getFsOnePersonCheckedItemDetailInfo(@RequestBody StatisticsBean obj,@PathVariable Integer page,@PathVariable Integer size){
+    	PageHelper.offsetPage(page, size);
+    	List<StatisticsBean> returnList=  statisticsService.getOneCheckedDetailInfo(obj);
+    	return super.returnSuccessResult(new PageInfo(returnList));
+    }    
 }

+ 2 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/StatisticsDao.java

@@ -34,4 +34,6 @@ public interface StatisticsDao  {
 	public List<StatisticsBean> selectOneCheckedInfo(StatisticsBean obj);
 	
 	public List<StatisticsBean> selectOneCheckedItemInfo(StatisticsBean obj);
+	
+	public List<StatisticsBean> selectOneCheckedDetailInfo(StatisticsBean obj);
 }

+ 7 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -246,7 +246,6 @@
      </select>
      
      <select id="selectOneCheckedItemInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-     	
      	SELECT count(m.check_item_score) AS checked_num , sum(m.check_item_score) AS all_check_score , m.parent_id,m.check_item_name AS name FROM check_task t INNER JOIN
 		(
 			select ci.name AS check_item_name , t.* FROM
@@ -267,4 +266,11 @@
      
      </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 
+     		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}
+     </select>
+     
 </mapper>

+ 3 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/StatisticsService.java

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

+ 8 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -878,6 +878,14 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		return  statisticsDao.selectOneCheckedInfo(obj);
 	}
 
+	
+
+	@Override
+	public List<StatisticsBean> getOneCheckedDetailInfo(StatisticsBean obj) {
+		
+		return statisticsDao.selectOneCheckedDetailInfo(obj);
+	}
+
 	@Override
 	public List<StatisticsBean> getOneCheckedItemInfo(StatisticsBean obj) {