chenrj-PC\chenrj 8 éve
szülő
commit
19a5cf7372

+ 41 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckmanStatisticsBean.java

@@ -0,0 +1,41 @@
+package com.xintong.visualinspection.bean;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ *
+ * 版本信息:日期:2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Data
+public class CheckmanStatisticsBean {
+    //编号
+    private Integer id;
+    //
+    private Integer checkman_id;
+    
+    private Integer all_checkman;
+    
+    private Integer all_task_num;
+    
+    private Integer all_check_minute;
+    
+    private Integer all_checked_score ;
+    
+    private Integer all_checked_num;
+    
+    //开始日期
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date start_date ;
+    
+    //结束日期
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date end_date ;
+}

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.CheckmanStatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBo;
 import com.xintong.visualinspection.bean.Team;
@@ -170,4 +171,13 @@ public class StatisticsController extends BaseController {
     	return super.returnSuccessResult(new PageInfo(returnList));
     }
     
+    
+    /**
+     * 获取考核列表情况
+     */
+    @RequestMapping(value = "/checkman/info")
+    public String getCheckmanInfo(@RequestBody CheckmanStatisticsBean obj){
+    	CheckmanStatisticsBean returnObj=  statisticsService.getCheckmanStatisticInfo(obj);
+    	return super.returnSuccessResult(returnObj);
+    }
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
 
+import com.xintong.visualinspection.bean.CheckmanStatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBean;
 
 /**
@@ -36,4 +37,6 @@ public interface StatisticsDao  {
 	public List<StatisticsBean> selectOneCheckedItemInfo(StatisticsBean obj);
 	
 	public List<StatisticsBean> selectOneCheckedDetailInfo(StatisticsBean obj);
+	
+	public CheckmanStatisticsBean selectCheckManInfo(CheckmanStatisticsBean obj);
 }

+ 2 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -104,4 +104,6 @@
 			AND s.ORGAN_ID IS NOT NULL GROUP BY s.ORGAN_ID 
 	</select>
     
+   
+    
 </mapper>

+ 24 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -286,4 +286,28 @@
 			</if>
      </select>
      
+      <select id="selectCheckManInfo" parameterType="com.xintong.visualinspection.bean.CheckmanStatisticsBean" resultType="com.xintong.visualinspection.bean.CheckmanStatisticsBean">
+    	SELECT
+			COUNT(1) AS all_checkman,
+			COUNT(1) AS all_task_num,
+			sum(
+				TIMESTAMPDIFF(MINUTE, t.start_time,t.end_time)
+			) AS all_check_minute,
+				COUNT(DISTINCT(t.checked_person)) AS all_checked_num,
+				SUM(cs.check_item_score) AS all_checked_score
+			FROM
+					check_task t
+				LEFT JOIN check_score cs ON t.id = cs.task_id
+				WHERE
+				t.check_status != 22 AND
+				t.checkman = #{checkman_id}
+				<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>

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

@@ -6,6 +6,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.xintong.visualinspection.bean.CheckmanStatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBo;
 
@@ -66,4 +67,6 @@ public interface StatisticsService {
 	
 	// 个人扣分情况 / 个人稽查情况
 	public List<StatisticsBean> getOneCheckedDetailInfo(StatisticsBean obj);
+	
+	public CheckmanStatisticsBean getCheckmanStatisticInfo(CheckmanStatisticsBean obj);
 }

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

@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.xintong.visualinspection.bean.CheckmanStatisticsBean;
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Organ;
@@ -950,5 +951,10 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		}
 		return list;
 	}
+
+	@Override
+	public CheckmanStatisticsBean getCheckmanStatisticInfo(CheckmanStatisticsBean obj) {
+		return statisticsDao.selectCheckManInfo(obj);
+	}
 	
 }