bug修改

VisualInspection/js/other_check/other_check.js

@@ -120,6 +120,30 @@ $("#save-check").click(function() {
 
         // var check_time_name = timeStamp2String(new Date(),"yyyy/MM");
         var check_time_name = timeStamp2String(new Date((check_time + ":00").replace("-g-/", "")), "yyyy/MM");
+        var timeday = moment(check_time);
+        var timec = moment(timeday.get("year") + "-" + (timeday.get('month') + 1) + "-25 23:00:00");
+
+
+        if (timeday.valueOf() > timec.valueOf()) {
+            var year = timeday.get("year");
+            var month = timeday.get('month') + 2;
+
+            if (month > 12) {
+                year += 1;
+                month -= 12;
+            }
+            check_time_name = year + "/" + (month > 9 ? month : ("0" + month));
+        } else {
+            var year = timeday.get("year");
+            var month = timeday.get('month') + 1;
+
+            if (month > 12) {
+                year += 1;
+                month -= 12;
+            }
+            check_time_name = year + "/" + (month > 9 ? month : ("0" + month));
+        }
+
 
         if (dept_id == null || dept_id == undefined || dept_id == "") {
             layer.msg('请选择部门');
@@ -225,7 +249,19 @@ function queryTable() {
         { width: 30, text: '序号', flex: false, colClass: 'text-center', field: 'num' },
         { width: 50, text: '时间', flex: false, colClass: '', field: 'check_time' },
         { width: 50, text: '部门', flex: false, colClass: '', field: 'organname' },
-        { width: 30, text: '人员', flex: false, colClass: '', field: 'username' },
+        {
+            width: 30,
+            text: '人员',
+            flex: false,
+            colClass: '',
+            field: 'username',
+            func: function(obj) {
+                if (obj == null || obj == undefined) {
+                    return "站部";
+                }
+                return obj;
+            }
+        },
         { width: 50, text: '扣分类型', flex: false, colClass: '', field: 'check_item_name' },
         { width: 30, text: '扣分值', flex: false, colClass: '', field: 'check_score' },
         { width: 120, text: '扣分描述', flex: false, colClass: '', field: 'remark' },
@@ -407,6 +443,7 @@ function refreshFee(data, selectId) {
             // }
             sec.innerHTML = tempStr;
         }
+
     } else {
         sec.innerHTML = '';
     }
@@ -436,20 +473,27 @@ function setPersonal(selectUserId) {
                 userId = selectUserId;
             }
             // console.log(data);
+            if (check_type != 2) {
+                tempStr += "<option value=0>收费站</option>";
+            }
             for (var i = 0; i < data.length; i++) {
                 // for (var j = 33; j <= 53; j++) {
                 // if (select_road == j) {
                 var workno = data[i].workno;
                 if (workno) workno = workno.substring(workno.length - 3);
                 if (data[i].id == userId) {
-                    tempStr += "<option value=" + data[i].id + " selected='selected'>" + workno + data[i].truename + "</option>";
+                    tempStr += "<option value=" + data[i].id + "selected='selected' > " + workno + data[i].truename + "</option>";
                 } else {
-                    tempStr += "<option value=" + data[i].id + ">" + workno + data[i].truename + "</option>";
+                    tempStr += "<option value=" + data[i].id + (i == 0 ? " selected='selected'" : "") + ">" + workno + data[i].truename + "</option>";
                 }
                 // }
                 // }
+
+
                 sec.innerHTML = tempStr;
             }
+
+            sec.innerHTML = tempStr;
         } else {
             sec.innerHTML = '';
         }

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

@@ -215,6 +215,11 @@
 			other_check o
 		WHERE
 			o.check_type = #{check_type}
+
+           <if test="check_type!=2 ">
+              AND user_id = 0
+           </if>
+
 			<if test="start_date!=null and end_date != null">
 		        AND	 o.check_time &gt;= #{start_date} AND o.check_time &lt; #{end_date}
 			</if>

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

@@ -1878,11 +1878,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		List<StatisticsBean> data_beans = statisticsDao.getselectFeeStationOperationScoreDetail(obj);
 		
 		for (StatisticsBean company_bean : company_beans) {
-			mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num());
+			mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num()>1?1:company_bean.getChecked_num());
 			mapStationInfos.get(company_bean.getDept_id()).setCompany_total_score(company_bean.getAll_check_score());
 		}
 		for (StatisticsBean third_bean : third_beans) {
-			mapStationInfos.get(third_bean.getDept_id()).setThird_check_num(third_bean.getChecked_num());
+			mapStationInfos.get(third_bean.getDept_id()).setThird_check_num(third_bean.getChecked_num()>1?1:third_bean.getChecked_num());
 			mapStationInfos.get(third_bean.getDept_id()).setThird_total_score(third_bean.getCheck_total_score());
 		}
 		for (StatisticsBean special_bean : special_beans) {
@@ -1890,11 +1890,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			mapStationInfos.get(special_bean.getDept_id()).setSpecial_total_score(special_bean.getCheck_total_score());
 		}
 		for (StatisticsBean onsite_bean : onsite_beans) {
-			mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_check_num(onsite_bean.getChecked_num());
+			mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_check_num(onsite_bean.getChecked_num()>1?1:onsite_bean.getChecked_num());
 			mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_total_score(onsite_bean.getCheck_total_score());
 		}
 		for (StatisticsBean data_bean : data_beans) {
-			mapStationInfos.get(data_bean.getDept_id()).setData_check_num(data_bean.getChecked_num());
+			mapStationInfos.get(data_bean.getDept_id()).setData_check_num(data_bean.getChecked_num()>1?1:data_bean.getChecked_num());
 			mapStationInfos.get(data_bean.getDept_id()).setData_total_score(data_bean.getCheck_total_score());
 		}
 		// 计算出每个收费站的总平均扣分和平均得分

VisualInspection_server/src/main/resources/application.properties

@@ -3,8 +3,8 @@ spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -13,8 +13,8 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf8
-#cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url=jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -62,8 +62,8 @@ spring.redis.host=git.topm.win
 #spring.redis.port=6379
 
 #spring.redis.port=7003
-spring.redis.port=6401
-#spring.redis.port=6380
+#spring.redis.port=6401
+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