修改排名

VisualInspection/js/statistics/assess_ranking.js

@@ -94,6 +94,7 @@ function getEmployeeInfosClick(url, param, start_score, end_score,start_num,end_
 
         var strTbody = '';
         var count = 0;
+
         for (var i = 0; i < data.length; i++) {
             var score = 1000 - filterByZeroHandle(average(data[i]).toFixed(2), '0');
             var check_number = filter(data[i].checked_num, '0');
@@ -111,8 +112,8 @@ function getEmployeeInfosClick(url, param, start_score, end_score,start_num,end_
                     + "<td width='4%;'>" + getItemScore(data[i], '动作') + "</td><td width='4%;'>" + getItemScore(data[i], '文明用语') + "</td>"
                     + "<td width='4%;'>" + getItemScore(data[i], '工作纪律') + "</td><td width='4%'>" + getItemScore(data[i], '便民服务') + "</td><td width='4%;'>"
                     + getItemScore(data[i], '安全管理') + "</td><td width='4%;'>" + data[i].check_all_score + "</td>"
-                    + "<td width='6%;'>" + filter(data[i].checked_num, '0') + (data[i].checked_num < 6 ? html : "") + "</td><td width='4%;'>" + filterSlash(filterByZeroHandle(average(data[i]).toFixed(2), '0'), filter(data[i].checked_num, '0')) + "</td>"
-                    + "<td width='4%;'>" + filterSlash(score, filter(data[i].checked_num, '0')) + "</td><td width='4%;'>" + "</td><td width='4%;'>" + "</td></tr>";
+                    + "<td width='6%;'>" + filter(data[i].checked_num, '0') + (data[i].checked_num < 6 ? html : "") + "</td><td width='4%;'>" + filterSlash(filterByZeroHandle(average(data[i]).toFixed(2), '0'), filter(data[i].checked_num+data[i].checked_m_num, '0')) + "</td>"
+                    + "<td width='4%;'>" + filterSlash(score, filter(data[i].checked_num+data[i].checked_m_num, '0')) + "</td><td width='4%;'>" + "</td><td width='4%;'>" + "</td></tr>";
                 count++;
             }
         }
@@ -546,10 +547,10 @@ function judgeParamFilter(data, i, score, start_score, end_score,check_number,st
 }
 
 function average(obj) {
-    if (filter(obj.checked_num, '0') == 0) {
+    if (filter(obj.checked_num+obj.checked_m_num, '0') == 0) {
         return 0;
     } else {
-        return obj.check_all_score / filter(obj.checked_num, '1')
+        return (obj.check_all_score+obj.check_all_m_score) / filter(obj.checked_num+obj.checked_m_num, '1')
     }
 }
 

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

@@ -16,6 +16,10 @@ public class StatisticsBo {
  
     private int checked_num = 0 ;
     
+    private int checked_m_num = 0 ;
+    
+    private int check_all_m_score =0 ; 
+    
     private int check_all_score =0 ; 
     
     private List<String> checked_socre_name = new ArrayList<>() ;
@@ -41,11 +45,11 @@ public class StatisticsBo {
     // 比较大小 1 小 ， -1 大
     public int compareTo(StatisticsBo o2){
     	double a = 1000.0 ,b=1000.0 ;
-		if(this.getChecked_num()!=0 ){
-			a = this.getCheck_all_score() / (this.getChecked_num()+0.00);
+		if((this.getChecked_num()+this.getChecked_m_num())!=0 ){
+			a = (this.getCheck_all_score()+this.getCheck_all_m_score()) / (this.getChecked_num()+this.getChecked_m_num()+0.00);
 		}
-		if(o2.getChecked_num()!=0){
-			b = o2.getCheck_all_score()/(o2.getChecked_num()+0.00);
+		if((o2.getChecked_num()+o2.getChecked_m_num())!=0){
+			b = (o2.getCheck_all_score()+o2.getCheck_all_m_score()) /(o2.getChecked_num()+o2.getChecked_m_num()+0.00);
 		}
 		if (a > b ) {
 			return 1;

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

@@ -43,6 +43,7 @@ public class StatisticsController extends BaseController {
     	return super.returnSuccessResult(lists);
     }
     
+
     /**
      * 温馨服务检查千分考核扣分情况汇总表
      * @param obj

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/StatisticsDao.java

@@ -8,6 +8,7 @@ import com.xintong.visualinspection.bean.CheckAppealStatistic;
 import com.xintong.visualinspection.bean.CheckmanStatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsFsWork;
+import com.xintong.visualinspection.pojo.TaskAndScore;
 
 /**
  * 文件名：StatisticsDao
@@ -56,4 +57,6 @@ public interface StatisticsDao  {
 	public List<StatisticsFsWork> selectFsUnregularWorkGatherGroupByWorkType(StatisticsFsWork obj);
 	
 	public List<CheckAppealStatistic> selectCheckAppealNum(CheckAppealStatistic obj);
+	
+	public List<TaskAndScore> selectMList(TaskAndScore obj);
 }

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

@@ -17,6 +17,18 @@
 			 ) 
 			u LEFT JOIN check_item s ON u.parent_id = s.id GROUP  BY checked_person,id
     </select>
+         
+    <select id="selectMList"  parameterType="com.xintong.visualinspection.pojo.TaskAndScore" resultType="com.xintong.visualinspection.pojo.TaskAndScore">
+   
+    SELECT * from check_task a LEFT JOIN check_score b on a.id=b.task_id where
+       <!--   a.monitor_user_id != -1 and a.monitor_user_id != 0 and -->
+       a.start_time &gt;= #{start_time} and a.end_time &lt;= #{end_time} and a.check_status !=22
+    
+    
+    </select>
+    
+    
+    
 
     <select id="selectCheckedTimes" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
     	SELECT COUNT(1) AS checked_num , t.checked_person AS user_id FROM check_task t 

VisualInspection_server/src/main/java/com/xintong/visualinspection/pojo/TaskAndScore.java

@@ -0,0 +1,54 @@
+package com.xintong.visualinspection.pojo;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xintong.visualinspection.bean.Task;
+
+import lombok.Data;
+
+@Data
+public class TaskAndScore extends Task {
+	  //编号
+    private Long id1;
+    //任务id
+    private Long task_id;
+    //更新时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date update_time1;
+    //图片数组
+    private String pics;
+    //视频数组
+    private String videos;
+    //考核项id
+    private Long check_item_id1;
+    
+    private String check_item_name;
+    
+    private Integer check_item_score;
+    //扣分内容
+    private String content;
+    //考核人员ids
+    private String checkman1;
+    //被考核人员id
+    private Long checked_person1;
+    //被考核人员名称
+    private String checked_person_name1;
+    //被考核部门
+    private Long checked_dept1;
+    //备注
+    private String remark1;
+    
+    //查询开始时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date start_time;
+    //查询结束时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date end_time;
+	
+}

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

@@ -11,6 +11,7 @@ import com.xintong.visualinspection.bean.CheckmanStatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBo;
 import com.xintong.visualinspection.bean.StatisticsFsWork;
+import com.xintong.visualinspection.pojo.TaskAndScore;
 
 /**
  * 
@@ -92,4 +93,5 @@ public interface StatisticsService {
 	
 	// 稽查人员工作量统计
 	public void getCheckInfo(StatisticsBean obj,HttpServletRequest req,HttpServletResponse resp);
+
 }

VisualInspection_server/src/main/resources/application.properties

@@ -57,10 +57,10 @@ spring.redis.database=0
 #spring.redis.host=10.112.0.199
 spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-spring.redis.port=6380
+#spring.redis.port=7003
 
 #spring.redis.port=7003
-#spring.redis.port=6379 
+spring.redis.port=6380 
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
 # \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09