解决冲突

VisualInspection/js/config.js

@@ -15,8 +15,8 @@ function getserveraddr() {
     if (base_ui_url.indexOf("jsjtyxt.com") != -1) {
         return "http://server_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
-        return "http://10.112.0.199:7001/"
-            //  return "http://localhost:8089/"
+        // return "http://10.112.0.199:7001/"
+             return "http://localhost:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {

VisualInspection/js/mytask/check.js

@@ -741,7 +741,7 @@ function zTreeOnClick(event, treeId, treeNode) {
         'check_item_score': treeNode.score,
         'content': treeNode.value,
         'check_item_id': treeNode.id,
-        'checkman': treeNode.id,
+        'checkman': $.checkTask.checkman,
         'checked_person': $.checkTask.checked_person,
         'checked_dept': $.checkTask.checked_dept
     };

VisualInspection/js/statistics/assess_ranking.js

@@ -35,6 +35,9 @@ function queryEmpClick() {
     var startStr = start_date.replace(/-/g, '/');
     var endStr = end_date.replace(/-/g, '/');
     var start = new Date(startStr);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
     if (start > end) {
         tip("开始时间不能比结束时间大");
@@ -66,6 +69,10 @@ function initQueryEmp() {
     var start_date = start_time + " 23:00:00";
     var end_date = end_time + " 23:00:00";
 
+    var start = new Date(start_date);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var param = {
         "start_date": start_date,
         "end_date": end_date,
@@ -314,8 +321,9 @@ function exportExcel() {
         start_date += " 23:00:00";
         end_date += " 23:00:00";
     }
-    window.open(getserveraddr() + "/file/employee/order?dept_id=" + dept_id +
-        "&start_date=" + start_date + "&end_date=" + end_date + "&start_score=" + start_score + "&end_score=" + end_score);
+    if(!dept_id) dept_id="";
+    window.open( getserveraddr() + "/file/employee/order?dept_id="+dept_id+
+    "&start_date="+start_date+"&end_date="+end_date+"&start_score="+start_score+"&end_score="+end_score);
 }
 
 

VisualInspection/js/statistics/assess_situation.js

@@ -20,6 +20,9 @@ function querySituationClick(){
     var startStr = start_date.replace(/-/g, '/');
     var endStr = end_date.replace(/-/g, '/');
     var start = new Date(startStr);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
     if(start>end){
         tip("开始时间不能比结束时间大");
@@ -57,6 +60,10 @@ function initQuerySituation(){
     var start_date = start_time+" 23:00:00"; 
     var end_date = end_time+" 23:00:00"; 
     
+    var start = new Date(start_date);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var param = {
         "start_date": start_date,
         "end_date": end_date,
@@ -127,7 +134,7 @@ function gethtml(data,i){
                 strTbody +="<tr><td rowspan="+rowspan+">"+name+"</td>";
                 strTbody +="<td>"+ranking+"</td><td>"+data.name+"</td><td>"+filter(data.people_num,0)
                         +"</td><td>"+filter(data.checked_people_num,0)+"</td><td>"+filter(data.checked_num,0)
-                        +"</td><td>"+(data.people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
+                        +"</td><td>"+(data.checked_people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
                         +"</td><td>"+data.score_fifteen+"</td><td>"+data.score_fifty+"</td><td>"
                         +data.score_over_fifty+"</td><td>"+data.all_check_score+"</td><td>"
                         +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')+"</td><td>"
@@ -137,7 +144,7 @@ function gethtml(data,i){
                 strTbody +="<tr>"
                 strTbody +="<td>"+rank[i]+"</td><td>"+data.name+"</td><td>"+filter(data.people_num,'0')
                         +"</td><td>"+filter(data.checked_people_num,0)+"</td><td>"+filter(data.checked_num,'0')
-                        +"</td><td>"+(data.people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
+                        +"</td><td>"+(data.checked_people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
                         +"</td><td>"+data.score_fifteen+"</td><td>"+data.score_fifty+"</td><td>"
                         +data.score_over_fifty+"</td><td>"+data.all_check_score+"</td><td>"
                         +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')+"</td><td>"

VisualInspection/js/statistics/assess_type.js

@@ -24,6 +24,9 @@ function queryTypeClick(){
     var startStr = start_date.replace(/-/g, '/');
     var endStr = end_date.replace(/-/g, '/');
     var start = new Date(startStr);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
     if(start>end){
         tip("开始时间不能比结束时间大");
@@ -59,7 +62,10 @@ function initQueryType(){
     $("#end-time").val(end_time);
     var start_date = start_time+" 23:00:00"; 
     var end_date = end_time+" 23:00:00"; 
-    
+    var start = new Date(start_date);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var param = {
         "start_date": start_date,
         "end_date": end_date,

VisualInspection/js/statistics/check_workload_statistics.js

@@ -18,20 +18,7 @@ $(function(){
 
 	function initQueryParams() {
 		 // 仅选择日期
-        $(".div-start input").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $(".div-end input").datetimepicker(
+        $(".div-start input,.div-end input").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,

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

@@ -142,4 +142,23 @@ public class StatisticsBean {
 		}
     }
     
+    // 比较大小 1 小 ， -1 大 
+    // 方法2
+    public int compare2To(StatisticsBean o2){
+    	double a = 1000.0 ,b=1000.0 ;
+		if(this.getChecked_num()!=0 ){
+			a = this.getAll_check_score() / (this.getChecked_num()+0.00);
+		}
+		if(o2.getChecked_num()!=0){
+			b = o2.getAll_check_score()/(o2.getChecked_num()+0.00);
+		}
+		if (a > b ) {
+			return 1;
+		} else if (a < b) {
+			return -1;
+		} else {
+			return 0;
+		}	
+    }
+    
 }

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

@@ -4,7 +4,7 @@
     
     <select id="selectStatistics" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
     	SELECT  u.checked_person AS user_id , u.checked_dept AS dept_id ,u.parent_id AS item_id ,sum(u.score) AS score ,s.name  FROM (
-			SELECT t.checked_person , t.checked_dept,ci.parent_id, ci.score  FROM check_score t 
+			SELECT t.checked_person , t.checked_dept,ci.parent_id, t.check_item_score AS score FROM check_score t 
 			LEFT JOIN check_item ci ON t.check_item_id = ci.id 
 			LEFT JOIN check_task ct ON ct.id = t.task_id
 			WHERE 1=1 and ct.check_status!=22
@@ -22,7 +22,7 @@
     	SELECT COUNT(1) AS checked_num , t.checked_person AS user_id FROM check_task t 
     	WHERE 1=1 and t.check_status!=22
 			<if test="start_date!=null and end_date != null">
-		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date} 
+		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt; #{end_date} 
 			</if>
 			<if test="dept_id!=null">
 				AND t.checked_dept =#{dept_id}			
@@ -35,7 +35,7 @@
     	FROM check_task  t left join t_sys_users u on t.checked_person = u.id
     	WHERE 1=1 and t.check_status!=22
     		<if test="start_date!=null and end_date != null">
-		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date}
+		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt; #{end_date}
 			</if>
 			<if test="position_ids != null and position_ids.size() > 0">
         		AND u.positionid in 
@@ -48,26 +48,26 @@
     </select>
     
     <select id="selectFeeStationCheckedScore" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-    	SELECT sum(c.score) AS score ,t.checked_dept AS dept_id 
+    	SELECT sum(t.check_item_score) AS score ,t.checked_dept AS dept_id 
     		FROM check_score t 
     		LEFT JOIN check_item c ON t.check_item_id = c.id
     		LEFT JOIN check_task ct ON ct.id = t.task_id
     		WHERE 1=1 and ct.check_status!=22
     		<if test="start_date!=null and end_date != null">
-		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}
+		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt; #{end_date}
 			</if>
     		GROUP BY t.checked_dept,t.checked_person
     </select>
     
     <select id="selectFeeStationCheckedPersonScoreDetail" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
     	    SELECT  u.checked_dept AS dept_id ,u.parent_id AS item_id ,sum(u.score) AS score ,s.name,s.id  FROM (
-			SELECT  t.checked_dept,ci.parent_id, ci.score  FROM check_score t 
+			SELECT  t.checked_dept,ci.parent_id, t.check_item_score AS score  FROM check_score t 
 			LEFT JOIN check_item ci ON t.check_item_id = ci.id
 			LEFT JOIN check_task ct ON ct.id = t.task_id
 			LEFT JOIN t_sys_users uu on t.checked_person = uu.id
-			WHERE 1=1  and ct.check_status!=22 and ci.score is not null
+			WHERE 1=1  AND ct.check_status!=22 AND t.check_item_score is not null
 			<if test="start_date!=null and end_date != null">
-		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}
+		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt; #{end_date}
 			</if>
 			<if test="position_ids != null and position_ids.size() > 0">
         		AND uu.positionid in 

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

@@ -409,7 +409,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		List<StatisticsBean> list = getFeeStationCheckedScore(obj);
 		for (StatisticsBean st : list) {
 			st.setCheck_no_score(
-					st.getPeople_num() - st.getScore_fifteen() - st.getScore_fifty() - st.getScore_over_fifty());
+					st.getChecked_people_num() - st.getScore_fifteen() - st.getScore_fifty() - st.getScore_over_fifty());
 			st.setCheck_score_avg(
 					(st.getChecked_num() != 0) ? st.getAll_check_score() / (st.getChecked_num() + 0.0f) : 0.00f);
 			st.setScore_avg(String.format("%.2f", 1000.0 - st.getCheck_score_avg()));
@@ -877,25 +877,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		lists.sort(new Comparator<StatisticsBean>() {
 			@Override
 			public int compare(StatisticsBean o1, StatisticsBean o2) {
-				if(o1.getChecked_num()!=0 && o2.getChecked_num()!=0){
-					double a = o1.getAll_check_score() / (o1.getChecked_num()+0.00);
-					double b = o2.getAll_check_score() /(o2.getChecked_num()+0.00);
-					if (a > b ) {
-						return 1;
-					} else if (a < b) {
-						return -1;
-					} else {
-						return 0;
-					}	
-				}else{
-					if(o1.getChecked_num() == 0){
-						return -1 ;
-					}else if(o2.getChecked_num() ==0){
-						return 1;
-					}else{
-						return 0;
-					}
-				}
+				return o2.compare2To(o1);
 			}
 		});