Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

VisualInspection/js/other_check/other_check.js

@@ -118,7 +118,9 @@ var al_data = [];
         }
         var file_ids = (file_src.substring(file_src.length-1)==',')?file_src.substring(0,file_src.length-1):file_src;
 
-        var check_time_name = timeStamp2String(new Date(),"yyyy/MM");
+        // var check_time_name = timeStamp2String(new Date(),"yyyy/MM");
+        var check_time_name=timeStamp2String(new Date((check_time+":00").replace("-g-/", "")  ),"yyyy/MM");
+
         if(dept_id == null || dept_id == undefined ||dept_id == ""){
             layer.msg('请选择部门');
             return;

VisualInspection/js/statistics/assess_ranking.js

@@ -157,7 +157,7 @@ function initQueryEmp(parent_dept_id, dept_id) {
     var endD = new Date();
     var startD = new Date();
     // var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth() > 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
+    var start_time = startD.getFullYear() + "-" + (startD.getMonth() >= 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
     var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1 >= 10 ? endD.getMonth() + 1 : "0" + (endD.getMonth() + 1)) + "-25";
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();

VisualInspection/js/statistics/business_promotion_feedback.js

@@ -119,7 +119,7 @@ function initQueryEmp(parent_dept_id, dept_id) {
     var endD = new Date();
     var startD = new Date();
     // var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth() > 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
+    var start_time = startD.getFullYear() + "-" + (startD.getMonth() >= 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
     var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1 >= 10 ? endD.getMonth() + 1 : "0" + (endD.getMonth() + 1)) + "-25";
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();

VisualInspection/js/statistics/wrecker_person.js

@@ -62,7 +62,7 @@ function initQueryEmp() {
     var endD = new Date();
     var startD = new Date();
 
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth() > 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
+    var start_time = startD.getFullYear() + "-" + (startD.getMonth() >= 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
     var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1 >= 10 ? endD.getMonth() + 1 : "0" + (endD.getMonth() + 1)) + "-25";
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();

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

@@ -48,6 +48,7 @@
         <if test="check_score != null">,check_score = #{check_score}</if>
         <if test="file_ids != null">,file_ids = #{file_ids}</if>
         <if test="check_time != null">,check_time = #{check_time}</if>
+        <if test="check_time_name !=  null">,check_time_name= #{check_time_name} </if>
         <if test="check_num != null">,check_num = #{check_num}</if>
         <if test="wrecker_check_type != null">,wrecker_check_type = #{wrecker_check_type}</if>
         <if test="special_check_type != null">,special_check_type = #{special_check_type}</if>

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

@@ -1905,23 +1905,24 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			StatisticsBean value = station.getValue();
 			// 设置总平均扣分
 			if (value.getCompany_check_num() > 0) {
-				avg += value.getCompany_total_score() / value.getCompany_check_num();
+				avg += value.getCompany_total_score() / value.getCompany_check_num()/4.0;
 			}
 			if (value.getThird_check_num() > 0) {
-				avg += value.getThird_total_score() / value.getThird_check_num();
+				avg += value.getThird_total_score() / value.getThird_check_num()/4.0;
 			}
 			if (value.getSpecial_check_num() > 0) {
-				avg += value.getSpecial_total_score() / value.getSpecial_check_num();
+				avg += value.getSpecial_total_score() / value.getSpecial_check_num()/4.0;
 			}
 			if (value.getOnsite_check_num() > 0) {
-				avg += value.getOnsite_total_score() / value.getOnsite_check_num();
+				avg += value.getOnsite_total_score() / value.getOnsite_check_num()/4.0;
 			}
 			if (value.getData_check_num() > 0) {
-				avg += value.getData_total_score() / value.getData_check_num();
+				avg += value.getData_total_score() / value.getData_check_num()/4.0;
 			}
-			value.setCheck_total_avg(df.format(avg / value.getPeople_num()));
+//			value.setCheck_total_avg(df.format(avg / value.getPeople_num()));
+			value.setCheck_total_avg(df.format(avg ));
 			// 设置平均得分
-			Float score_avg = (1000 - Float.valueOf(df.format(avg / value.getPeople_num())));
+			Float score_avg = (1000 - Float.valueOf(df.format(avg )));
 			value.setScore_avg(score_avg.toString());
 		}
 		List<StatisticsBean> sortList = new ArrayList<>(mapStationInfos.values());