分数可以为小数

VisualInspection/js/config.js

@@ -19,12 +19,15 @@ function getserveraddr() {
         return "http://server_release_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
-        return "http://localhost:8089/"
+        return "http://localhost:8088/"
     } else if (base_ui_url.indexOf("http://172.28.2.6") != -1) {
         return "http://172.28.2.6:8079/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:8089/"
     }
+    else if (base_ui_url.indexOf("192.168.1.105") != -1) {
+        return "http://192.168.1.105:8088/"
+    }
 }
 
 function getImageaddr() {

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

@@ -19,7 +19,7 @@ public class CheckItem {
     //内容
     private String content;
     //分数
-    private Integer score;
+    private Double score;
     //分数类型（奖励--1  or惩罚--2 ）
     private Integer score_type;
     //考核类型或考核项，1：考核类型；2:考核项

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

@@ -31,7 +31,7 @@ public class Score {
     
     private String check_item_name;
     
-    private Integer check_item_score;
+    private Double check_item_score;
     //扣分内容
     private String content;
     //考核人员ids

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

@@ -48,9 +48,9 @@ public class StatisticsBean {
     
     private String parent_name ;
     
-    private int score;
+    private double score;
 
-    private int deptwscore;
+    private double deptwscore;
     
     private Integer item_id ;
 
@@ -60,29 +60,29 @@ public class StatisticsBean {
     
     private int people_num;
     
-    private int score_fifteen;
+    private double score_fifteen;
     
-    private int score_fifty;
+    private double score_fifty;
     
-    private int score_over_fifty ;
+    private double score_over_fifty ;
     
-    private int all_check_score ;
-    private int all_check_deptw_score ;
+    private double all_check_score ;
+    private double all_check_deptw_score ;
     
     // 满分
-    private int check_no_score ;
+    private double check_no_score ;
     
     // 平均得分
     private String score_avg ;
     
     // 平均人均扣分
-    private float check_score_avg;
+    private double check_score_avg;
     
     private List<String> checked_socre_name = new ArrayList<>() ;
     
-    private List<Integer> checked_score = new ArrayList<>() ;
+    private List<Double> checked_score = new ArrayList<>() ;
     
-    private List<Integer> seq_checked_score = new ArrayList<>() ;
+    private List<Double> seq_checked_score = new ArrayList<>() ;
     
     private List<Organ> dept_list  ;
     private List<Integer> checked_score_ids = new ArrayList<>() ;
@@ -114,7 +114,7 @@ public class StatisticsBean {
     
     // 排名变化
     private Integer ranking_change;
-    
+
     // 照片
     private String pics ;
     
@@ -138,32 +138,32 @@ public class StatisticsBean {
     // 其他稽查不同类型
     private Integer check_type;
     // 扣分合计
-    private Integer check_total_score = 0;
+    private Double check_total_score = 0.00;
     // 公司受检次数
     private Integer company_check_num = 0;
     // 公司扣分合计
-    private Integer company_total_score= 0;
+    private Double company_total_score= 0.00;
     // 第三方暗访受检次数
     private Integer third_check_num = 0;
     // 第三方暗访扣分合计
-    private Integer third_total_score = 0;
+    private Double third_total_score = 0.00;
     // 特情受检次数
     private Integer special_check_num = 0;
     // 特情访扣分合计
-    private Integer special_total_score = 0;
+    private Double special_total_score = 0.00;
     // 现场受检次数
     private Integer onsite_check_num = 0;
     // 现场扣分合计
-    private Integer onsite_total_score = 0;
+    private Double onsite_total_score = 0.00;
     // 数据平台受检次数
     private Integer data_check_num = 0;
     // 数据平台扣分合计
     
     // 其他
     private Integer other_check_num =0;
-    private Integer other_total_score = 0 ;
+    private Double other_total_score = 0.00 ;
     
-    private Integer data_total_score = 0;
+    private Double data_total_score = 0.00;
     // 总平均扣分
     private String check_total_avg  = "0";
     // 公司排名
@@ -173,19 +173,19 @@ public class StatisticsBean {
     
     private Integer check_t_num = 0;
     
-    private Integer check_t_score = 0;
+    private Double check_t_score = 0.00;
     
     private Integer check_x_num = 0;
     
-    private Integer check_x_score = 0;
+    private Double check_x_score = 0.00;
     
     private Integer check_s_num = 0;
     
-    private Integer check_s_score = 0;
+    private Double check_s_score = 0.00;
     
     private Integer check_all_num = 0;
     
-    private Integer check_all_score = 0;
+    private Double check_all_score = 0.00;
 
     private List<CheckItem> itemList;
     

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

@@ -17,17 +17,17 @@ public class StatisticsBo {
     
     private int checked_m_num = 0 ;
     
-    private int check_all_m_score =0 ; 
+    private double check_all_m_score =0.00 ;
     
-    private int check_all_score =0 ; 
+    private double check_all_score =0.00 ;
     
     private List<String> checked_socre_name = new ArrayList<>() ;
     
-    private List<Integer> checked_score = new ArrayList<>() ;
+    private List<Double> checked_score = new ArrayList<>() ;
     
     private User user;
     
-    private List<Integer> emp_item_score = new ArrayList<>();
+    private List<Double> emp_item_score = new ArrayList<>();
     
     private String check_score_avg;
     
@@ -41,19 +41,19 @@ public class StatisticsBo {
     // 收费站排名
     private Integer fee_station_ranking;
     
-    private int score = 0;
+    private double score = 0.00;
     
     private Integer check_t_num = 0;
     
-    private Integer check_t_score = 0;
+    private Double check_t_score = 0.00;
     
     private Integer check_x_num = 0;
     
-    private Integer check_x_score = 0;
+    private Double check_x_score = 0.00;
     
     private Integer check_s_num = 0;
     
-    private Integer check_s_score = 0;
+    private Double check_s_score = 0.00;
     
     private Integer check_all_num = 0;
     

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

@@ -11,7 +11,7 @@ public class UserStatistic {
     private Long id;
     private Integer user_id;
     private Integer period_id;
-    private Integer user_score;
+    private Double user_score;
     private Double user_total_score;
     private Integer user_check_num;
     private Integer user_ranking_c;

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

@@ -157,17 +157,17 @@ public class StatisticsController extends BaseController {
 		}
     	List<StatisticsBean> lists=  statisticsService.getFeeStationCheckItemScore(obj);
     	int totalMan=0,totalcheckedMan=0,totalcheckedCount=0,totalAll=0;
-    	Map<String,Integer> scoreTypeMap = new HashMap<String,Integer>();
+    	Map<String,Double> scoreTypeMap = new HashMap<String,Double>();
     	for(StatisticsBean bean:lists){
     		totalMan+=bean.getPeople_num();
     		totalcheckedMan+=bean.getChecked_people_num();
     		totalcheckedCount+=bean.getChecked_num();
     		totalAll+=bean.getAll_check_score();
     		List<String> names = bean.getChecked_socre_name();
-    		List<Integer> scores = bean.getChecked_score();
+    		List<Double> scores = bean.getChecked_score();
     		for(int i=0;i<names.size();i++){
-    			Integer score = scoreTypeMap.get(names.get(i));
-    			if(score==null) score=0;
+    			Double score = scoreTypeMap.get(names.get(i));
+    			if(score==null) score=0.00;
     			score+=scores.get(i);
     			if(names.get(i)!=null){
     				scoreTypeMap.put(names.get(i), score);    				

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

@@ -6,7 +6,7 @@
         <result column="parent_id" property="parent_id" jdbcType="INTEGER" />
         <result column="name" property="name" jdbcType="VARCHAR" />
         <result column="content" property="content" jdbcType="VARCHAR" />
-        <result column="score" property="score" jdbcType="INTEGER" />
+        <result column="score" property="score" jdbcType="DOUBLE" />
         <result column="score_type" property="score_type" jdbcType="INTEGER" />
         <result column="type" property="type" jdbcType="INTEGER" />
     </resultMap>

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

@@ -9,7 +9,7 @@
         <result column="videos" property="videos" jdbcType="VARCHAR" />
         <result column="check_item_id" property="check_item_id" jdbcType="INTEGER" />
         <result column="check_item_name" property="check_item_name" jdbcType="VARCHAR" />
-        <result column="check_item_score" property="check_item_score" jdbcType="INTEGER" />
+        <result column="check_item_score" property="check_item_score" jdbcType="DOUBLE" />
         <result column="content" property="content" jdbcType="VARCHAR" />
         <result column="checkman" property="checkman" jdbcType="VARCHAR" />
         <result column="checked_person" property="checked_person" jdbcType="INTEGER" />

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

@@ -399,8 +399,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 					return 1;
 				} else if (o1.getId().equals( o2.getId())) {
 //					if (o1.getChecked_num() != 0 && o2.getChecked_num() != 0) {
-                        int  wsc = o1.getAll_check_deptw_score();
-                        int  wsc2 = o2.getAll_check_deptw_score();
+                        double  wsc = o1.getAll_check_deptw_score();
+                        double  wsc2 = o2.getAll_check_deptw_score();
 						if ((o1.getAll_check_score() - wsc +(wsc >= 20 ? 2 : wsc < 10 ? 0 : 1 ) + 0.0) > (o2.getAll_check_score()
 								-wsc2 + (wsc2 >= 20 ? 2 : wsc2 < 10 ? 0 : 1) + 0.0)) {
 							return 1;
@@ -514,28 +514,28 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 //
 //	}
 
-	private Integer getItemScore(StatisticsBo obj, String name) {
+	private Double getItemScore(StatisticsBo obj, String name) {
 		List<String> names = obj.getChecked_socre_name();
-		List<Integer> scores = obj.getChecked_score();
+		List<Double> scores = obj.getChecked_score();
 		for (int i = 0; i < names.size(); i++) {
 			if (names.get(i).indexOf(name) > -1) {
 				return scores.get(i);
 			}
 		}
-		return 0;
+		return 0.00;
 	}
 
-	private Integer getItemScore2(StatisticsBean obj, String name) {
+	private Double getItemScore2(StatisticsBean obj, String name) {
 
             List<String> names = obj.getChecked_socre_name();
-            List<Integer> scores = obj.getChecked_score();
+            List<Double> scores = obj.getChecked_score();
             for (int i = 0; i < names.size(); i++) {
                 if(names.get(i)==null) continue;
                 if (names.get(i).indexOf(name) > -1) {
                     return scores.get(i);
                 }
             }
-            return 0;
+            return 0.00;
 
 
 	}
@@ -679,7 +679,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		}
 		List<StatisticsBean> list = getFeeStationCheckItemScore(obj);
 		int totalMan = 0, totalcheckedMan = 0, totalcheckedCount = 0, totalAll = 0;
-		Map<String, Integer> scoreTypeMap = new HashMap<String, Integer>();
+		Map<String, Double> scoreTypeMap = new HashMap<String, Double>();
 		// 处理数据
 		for (int i = 0; i < list.size(); i++) {
 			StatisticsBean st = list.get(i);
@@ -705,11 +705,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			totalcheckedCount += st.getChecked_num();
 			totalAll += st.getAll_check_score();
 			List<String> names = st.getChecked_socre_name();
-			List<Integer> scores = st.getChecked_score();
+			List<Double> scores = st.getChecked_score();
 			for (int j = 0; j < names.size(); j++) {
-				Integer score = scoreTypeMap.get(names.get(j));
+				Double score = scoreTypeMap.get(names.get(j));
 				if (score == null)
-					score = 0;
+					score = 0.00;
 				score += scores.get(j);
 				scoreTypeMap.put(names.get(j), score);
 			}
@@ -725,7 +725,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			if (scoreTypeMap.containsKey(c.getCode_name())) {
 				scoreTypeMap.put(c.getRemark(), scoreTypeMap.get(c.getCode_name()));
 			} else {
-				scoreTypeMap.put(c.getRemark(), 0);
+				scoreTypeMap.put(c.getRemark(), 0.00);
 			}
 		}
 		map.putAll(scoreTypeMap);
@@ -857,7 +857,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			StatisticsBean req = obj;
 			obj.setMth(sab.getMth());
             StatisticsBean scoreObj = statisticsDao.selectYearScoreInfoM(req);
-			int score = sab.getAll_check_score();
+			double score = sab.getAll_check_score();
             if(scoreObj != null){
             	score = score - sab.getAll_check_score();
             	if(scoreObj.getAll_check_score() >= 20){
@@ -910,8 +910,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 //		cal.setTime(nowDate);
 //		String mth =
 		for(StatisticsBean sta: scoreList){
-			int score = sta.getAll_check_score();
-			int aScore = 0;
+			double score = sta.getAll_check_score();
+			double aScore = 0.00;
 			if(statisticsDao.selectYearScoreInfoM(obj)!= null){
 				 aScore = statisticsDao.selectYearScoreInfoM(obj).getAll_check_score();
 			}
@@ -1487,6 +1487,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 				if(bean.getPics().split("_").length > 1){
 					String[] array = bean.getPics().split("\\.");
 					String fileurl = bean.getPics().split("\\.")[0];
+
 					String time = fileurl.split("_")[1];
 					//int timeCoumt =  (Integer.valueOf(time)-62135596800000000)/10000000
 					long timetemp = (Long.valueOf(time)-621355968000000000l)/10000000-60*60*8;

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

@@ -239,7 +239,7 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 		Date now =new Date();
 		Task task = new Task();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		SimpleDateFormat startFormat1 = new SimpleDateFormat("yyyy-MM-dd 07:50:00");
+		SimpleDateFormat startFormat1 = new SimpleDateFormat("yyyy-MM-dd 07:5 0:00");
 		SimpleDateFormat endFormat1 = new SimpleDateFormat("yyyy-MM-dd 09:30:00");
 		SimpleDateFormat startFormat2 = new SimpleDateFormat("yyyy-MM-dd 22:50:00");
 		SimpleDateFormat endFormat2 = new SimpleDateFormat("yyyy-MM-dd 23:30:00");

VisualInspection_server/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-server.port=8089
+server.port=8088
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
@@ -7,11 +7,12 @@ context.listener.classes=com.xintong.SystemInit
 #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.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://192.168.45.164:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://127.0.0.1:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
 #master.datasource.username = root
 #master.datasource.password = root
-#master.datasource.url = jdbc:mysql://172.28.2.84:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://172.28.2.121:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -29,8 +30,9 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
 cluster.mapper-locations=classpath:com/xintong/visualinspection/mapper/cluster/*.xml
-#cluster.datasource.url=jdbc:mysql://172.28.2.84:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://172.28.2.121:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://127.0.0.1:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password = root
 
@@ -39,9 +41,9 @@ cluster.datasource.password = root
 #cluster.datasource.url=jdbc:mysql://git.topm.win:9003/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
+xiansuo.datasource.url=jdbc:mysql://172.28.2.121:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf8
 #xiansuo.datasource.url=jdbc:mysql://172.28.2.6:3306/DBTSIIS?useUnicode=true&characterEncoding=utf8
-#xiansuo.datasource.url=jdbc:mysql://172.28.2.6:3306/DBTSIIS?useUnicode=true&characterEncoding=utf8
-xiansuo.datasource.url=jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf8
+#xiansuo.datasource.url=jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf8
 #xiansuo.datasource.url=jdbc:mysql://xt.wenhq.top:8082/visualinspection_njy?useUnicode=true&characterEncoding=utf8
 xiansuo.datasource.username=root
 xiansuo.datasource.password=root
@@ -87,8 +89,8 @@ spring.redis.database=0
 # Redis\u670D\u52A1\u5668\u5730\u5740
 #spring.redis.host=10.112.0.199
 #spring.redis.host=192.168.45.158
-spring.redis.host=127.0.0.1
-#spring.redis.host=172.28.2.6
+#spring.redis.host=127.0.0.1
+spring.redis.host=172.28.2.6
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 spring.redis.port=6379
 
@@ -96,8 +98,8 @@ spring.redis.port=6379
 #spring.redis.port=9004
 #spring.redis.port=6380
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-#spring.redis.password=xintong
-spring.redis.password=123
+spring.redis.password=xintong
+#spring.redis.password=123
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.pool.max-active=8  
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09