报表

VisualInspection/js/statistics/assess_type.js

@@ -9,6 +9,7 @@ var rank = new Array();
  * 点击查询
  */
 function queryTypeClick() {
+    var type = $("#type").val();
     //每次点击前清空表格数据
     $(".table-tbody").empty('');
     var start_date = $("#start-time").val();
@@ -36,6 +37,7 @@ function queryTypeClick() {
         "dept_id": $("#fsList").val(),
         "start_date": start_date,
         "end_date": end_date,
+        "check_type":type
     }
     var url = "statistics/score/item/info";
     var strTbody = '';
@@ -51,6 +53,7 @@ function queryTypeClick() {
  * 表格初始化
  */
 function initQueryType() {
+    getItem();
     // 默认初始化前一周查所有
     var tdaytime = moment();
     var start_time = "";
@@ -78,11 +81,13 @@ function initQueryType() {
     var param = {
         "start_date": start_date,
         "end_date": end_date,
+        "check_type":0
     }
     var url = "statistics/score/item/info";
     var strTbody = '';
 
     post_common_service(url, param, function(data) {
+        console.log(data);
         // 管道中心受检人平均每人次扣分
         check_people_avg(data);
     }, function(error) {
@@ -91,82 +96,57 @@ function initQueryType() {
 
 }
 
+function getItem(){
+    var param = {
+      "id":7
+    }
+    var url = "checkRule/getListById";
+    var strTbody = '';
+
+    post_common_service(url, param, function(data) {
+        $("#type").empty();
+        $("#type").append("<option value='0'>全部</option>");
+        for(var index in data.check_items){
+               var html = "<option value='"+data.check_items[index].id+"'>"+data.check_items[index].name+"</option>"
+               $("#type").append(html);
+        }
+    
+        console.log(data);
+    }, function(error) {
+        return "";
+    });
+}
+
 /**
  * 表格拼接及数据传入
  * @param {*} data
  * @param {*} i
  * @param {*} avg
  */
-function gethtml(data, i, avg, lists) {
+function gethtml(data, itemList) {
+    //console.log(itemList);
     var strTbody = "";
-
-    if (i == 0 || i == 7 || i == 13) {
-
-        var ranking;
-        var name = "";
-        var rowspan = 0;
-        order = 1;
-        if (i == 0) {
-            name = "连云港";
-            rowspan = 7;
-            ranking = rank[i];
-            for (var i = 0; i < lists.length; i++) {
-                if (avg > lists[i]) {
-                    order = order + 1;
-                }
+        strTbody += "<tr>";
+        strTbody += "<td width='10%'>" + data.name + "</td><td width='10%'>"+data.ranking +"</td><td width='10%'>"+ data.people_num + "</td><td width='10%'>" +
+            filter(data.checked_people_num, '0') + "</td><td width='10%'>" + filter(data.checked_num, '0') +
+            "</td>";
+            var width = 20/itemList.length;
+            for(var index in itemList){
+                strTbody+="<td width='"+width+"%'>" + getItemScore(data, itemList[index].name) + "</td>"
             }
-        } else if (i == 7) {
-            name = "盐城";
-            rowspan = 6;
-            ranking = rank[i];
-            for (var i = 0; i < lists.length; i++) {
-                if (avg > lists[i]) {
-                    order = order + 1;
-                }
-            }
-        } else if (i == 13) {
-            name = "南通";
-            rowspan = 9;
-            ranking = rank[i];
-            for (var i = 0; i < lists.length; i++) {
-                if (avg > lists[i]) {
-                    order = order + 1;
-                }
-            }
-        }
-        strTbody += "<tr><td rowspan=" + rowspan + " width='6%'>" + order + "</td>" + "<td rowspan=" + rowspan + " width='6%'>" + name + "</td>";
-        strTbody += "<td width='6%'>" + ranking + "</td><td width='8%'>" + data.name + "</td><td width='6%'>" + filter(data.people_num, '0') +
-            "</td><td width='6%'>" + filter(data.checked_people_num, '0') +
-            "</td><td width='6%'>" + filter(data.checked_num, '0') + "</td><td width='54px'>" + getItemScore(data, '环境卫生') +
-            "</td><td width='54px'>" + getItemScore(data, '仪容仪表') + "</td><td width='54px'>" + getItemScore(data, '表情') +
-            "</td><td width='54px'>" + getItemScore(data, '动作') + "</td><td width='54px'>" + getItemScore(data, '文明用语') +
-            "</td><td width='54px'>" + getItemScore(data, '工作纪律') + "</td><td width='54px'>" + getItemScore(data, '便民服务') +
-            "</td><td width='54px'>" + getItemScore(data, '安全管理') + "</td><td>" + data.all_check_score + "</td><td width='6%'>" +
-            filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') +
-            "</td><td rowspan=" + rowspan + " width='6%'>" + avg + "</td>";
+        
+            strTbody+="<td width='10%'>" + data.all_check_score + "</td><td width='10%'>" +
+            filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') + "</td><td width='10%'>" + data.score + "</td>";
         strTbody += "</tr>";
-    } else {
-        strTbody += "<tr><td>" + rank[i] + "</td>";
-        strTbody += "<td>" + data.name + "</td><td>" + data.people_num + "</td><td>" +
-            filter(data.checked_people_num, '0') + "</td><td>" + filter(data.checked_num, '0') +
-            "</td><td>" + getItemScore(data, '环境卫生') + "</td><td>" + getItemScore(data, '仪容仪表') +
-            "</td><td>" + getItemScore(data, '表情') + "</td><td>" + getItemScore(data, '动作') +
-            "</td><td>" + getItemScore(data, '文明用语') + "</td><td>" + getItemScore(data, '工作纪律') +
-            "</td><td>" + getItemScore(data, '便民服务') + "</td><td>" + getItemScore(data, '安全管理') +
-            "</td><td>" + data.all_check_score + "</td><td>" +
-            filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') + "</td>";
-        strTbody += "</tr>";
-
-    }
     return strTbody;
 }
 
 function getTotalHtml(data) {
-    var html = "<tr><td>合计</td><td></td><td></td><td></td><td>" + data.totalMan + "</td><td>" + data.totalcheckedMan + "</td><td>" + data.totalcheckedCount + "</td><td>" +
-        getTotalScore(data, '环境卫生') + "</td><td>" + getTotalScore(data, '仪容仪表') + "</td><td>" + getTotalScore(data, '表情') + "</td><td>" + getTotalScore(data, '动作') +
-        "</td><td>" + getTotalScore(data, '文明用语') + "</td><td>" + getTotalScore(data, '工作纪律') + "</td><td>" + getTotalScore(data, '便民服务') +
-        "</td><td>" + getTotalScore(data, '安全管理') + "</td><td>" + data.totalAll + "</td><td>-</td><td>-</td></tr>";
-    return html;
+    // var html = "<tr><td>合计</td><td></td><td></td><td></td><td>" + data.totalMan + "</td><td>" + data.totalcheckedMan + "</td><td>" + data.totalcheckedCount + "</td><td>" +
+    //     getTotalScore(data, '环境卫生') + "</td><td>" + getTotalScore(data, '仪容仪表') + "</td><td>" + getTotalScore(data, '表情') + "</td><td>" + getTotalScore(data, '动作') +
+    //     "</td><td>" + getTotalScore(data, '文明用语') + "</td><td>" + getTotalScore(data, '工作纪律') + "</td><td>" + getTotalScore(data, '便民服务') +
+    //     "</td><td>" + getTotalScore(data, '安全管理') + "</td><td>" + data.totalAll + "</td><td>-</td><td>-</td></tr>";
+    // return html;
 }
 /**
  * 获取扣分合计
@@ -191,38 +171,17 @@ function check_people_avg(data) {
     var dataArray = new Array();
     var sum = 0;
     var sum1 = 0;
-    for (k = 0; k < list.length; k++) {
-        sum = parseFloat(sum) + parseFloat(filterByZeroHandle(list[k].all_check_score, '0'));
-        sum1 = parseFloat(sum1) + parseFloat(filterByZeroHandle(list[k].checked_num, '0'));
-        if (k == 6) {
-            dataArray.push(filterJudge(sum, sum1));
-            sum = 0;
-            sum1 = 0;
-        }
-        if (k == 12) {
-            dataArray.push(filterJudge(sum, sum1));
-            sum = 0;
-            sum1 = 0;
-        }
-        if (k == 20) {
-            dataArray.push(filterJudge(sum, sum1));
-            sum = 0;
-            sum1 = 0;
-        }
-    }
+    $('#item').empty();
+   for(var index in data.itemList){
+        $('#item').append("<th width='54px'>"+data.itemList[index].name+"</th>")
+   }
     // 道管下的收费站排名
     ranking_method(list);
 
     for (i = 0; i < list.length; i++) {
-        if (i == 0) {
-            $(".table-tbody").append(gethtml(list[i], i, dataArray[0], dataArray));
-        } else if (i == 7) {
-            $(".table-tbody").append(gethtml(list[i], i, dataArray[1], dataArray));
-        } else if (i == 13) {
-            $(".table-tbody").append(gethtml(list[i], i, dataArray[2], dataArray));
-        } else {
-            $(".table-tbody").append(gethtml(list[i], i));
-        }
+      
+            $(".table-tbody").append(gethtml(list[i], data.itemList));
+       
     }
     $(".table-tbody").append(getTotalHtml(data));
 }
@@ -354,5 +313,5 @@ function exportExcel() {
         start.setDate(start.getDate() - 1);
         start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     }
-    window.open(getserveraddr() + "/file/score/item/info?start_date=" + start_date + "&end_date=" + end_date);
+    window.open(getserveraddr() + "/file/score/item/info?start_date=" + start_date + "&end_date=" + end_date+"&type="+$('#type').val());
 }

VisualInspection/view/statistics/assess_type.html

@@ -14,6 +14,16 @@
                     </div>
                 </div>
                 <div  class="form-group col-sm-3">
+                    <label class="col-sm-2">类型</label>
+                    <div class="col-sm-7">
+                        <select class="form-control" id="type">
+                            <!--<option value="30">连云港</option>
+                            <option value="31">盐城</option>
+                            <option value="32">南通</option>-->
+                            </select>
+                    </div>    
+                </div>
+                <div  class="form-group col-sm-3">
                     <div class="col-sm-6">
                         <button class="btn btn-info2" type="button" onclick="queryTypeClick()">查询</button>
                     </div>
@@ -32,15 +42,14 @@
               <div class="table-head" ><table border="1" width="100%" height="90px" align="center">
                  <thead>
                         <tr>
-                        <th rowspan="2" width="6%">道管整体排名</th><th rowspan="2" width="6%">道管</th><th rowspan="2" width="6%">管道内收费站排名</th>
-                        <th rowspan="2" width="8%">站名</th><th rowspan="2" width="6%">收费值机岗位人数</th><th rowspan="2" width="6%">受检人数</th>
-                        <th rowspan="2" width="6%">受检次数</th><th colspan="9" height="40px">存在问题扣分详情</th>
-                        <th rowspan="2" width="6%">受检人平均每人次扣分（千分制）</th><th rowspan="2" width="6%">管道中心受检人平均每人次扣分（千分制）</th>
+                        <!-- <th rowspan="2" width="6%">道管整体排名</th><th rowspan="2" width="6%">道管</th><th rowspan="2" width="6%">管道内收费站排名</th> -->
+                        <th rowspan="2" width="10%">站名</th><th rowspan="2" width="10%">排名</th><th rowspan="2" width="10%">收费值机岗位人数</th><th rowspan="2" width="10%">受检人数</th>
+                        <th rowspan="2" width="10%">受检次数</th><th colspan="9" height="20%" >存在问题扣分详情</th>
+                        <th rowspan="2" width="10%">扣分合计</th><th rowspan="2" width="10%">受检人平均每人次扣分（百分制）</th>
+                        <th rowspan="2" width="10%">得分</th>
                         </tr>
-                        <tr> 
-                        <th width="54px">环境卫生</th><th width="54px">仪容仪表</th><th width="54px">表情</th>
-                        <th width="54px">收费动作</th><th width="54px">文明用语</th><th width="54px">工作纪律</th>
-                        <th width="54px">便民服务</th><th width="54px">安全管理</th><th>扣分合计</th>
+                        <tr id="item"> 
+                        <!-- <th width="54px">环境卫生</th><th width="54px">仪容仪表</th><th width="54px">表情</th> -->
                         </tr>
                  </thead>
                     <!-- <tbody class="table-tbody" style="background:white" align="center">

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

@@ -138,10 +138,11 @@ public class FileExcelController extends BaseController {
      */
     @RequestMapping(value = "/score/item/info",method=RequestMethod.GET)
     public String getScoreItemInfo(HttpServletRequest req,HttpServletResponse resp,
-    		@RequestParam String start_date,@RequestParam String end_date){
+    		@RequestParam String start_date,@RequestParam String end_date,@RequestParam String type){
     	StatisticsBean obj = new StatisticsBean();
 		Date start = DateUtil.strParseDate(start_date);
 		Date end = DateUtil.strParseDate(end_date);
+		obj.setCheck_type(Integer.valueOf(type));
 		obj.setStart_date(start);
 		obj.setEnd_date(end);
     	statisticsService.getFeeStationCheckItemScore(obj, req, resp);

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

@@ -7,6 +7,7 @@ import java.util.Map;
 import com.xintong.visualinspection.bean.*;
 import com.xintong.visualinspection.pojo.StatisiticPojo;
 import com.xintong.visualinspection.pojo.UserRankingData;
+import com.xintong.visualinspection.service.CheckRuleService;
 import com.xintong.visualinspection.util.CacheUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +27,9 @@ public class StatisticsController extends BaseController {
 
 	@Autowired
 	private StatisticsService statisticsService;
+
+	@Autowired
+	private CheckRuleService checkRuleService;
     
     /**
      * 温馨服务考核情况反馈表（所有员工排名）
@@ -113,6 +117,20 @@ public class StatisticsController extends BaseController {
      */
     @RequestMapping(value = "/score/item/info")
     public String getScoreItemInfo(@RequestBody StatisticsBean obj){
+		Map<String,String> param = new HashMap<String,String>();
+		param.put("rule_type", "4");
+		CheckRule cr = checkRuleService.getItemListByRuleType(param);
+		List<CheckItem> itemList=null;
+		if(cr!=null && obj.getCheck_type() == 0)
+			itemList = cr.getCheck_items();
+		if(cr!=null && obj.getCheck_type() != 0 && obj.getCheck_type() != null){
+              for(CheckItem item: cr.getCheck_items()){
+              	 long id = item.getId();
+              	  if((int)id == obj.getCheck_type()){
+              	  	   itemList = item.getSubCheckItem();
+				  }
+			  }
+		}
     	List<StatisticsBean> lists=  statisticsService.getFeeStationCheckItemScore(obj);
     	int totalMan=0,totalcheckedMan=0,totalcheckedCount=0,totalAll=0;
     	Map<String,Integer> scoreTypeMap = new HashMap<String,Integer>();
@@ -134,6 +152,7 @@ public class StatisticsController extends BaseController {
 //    		bean.get
     	}
     	Map<String,Object> resultMap = new HashMap<String,Object>();
+    	resultMap.put("itemList",itemList);
     	resultMap.put("list", lists);
     	resultMap.put("totalMan", totalMan);
     	resultMap.put("totalcheckedMan", totalcheckedMan);

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

@@ -23,6 +23,14 @@ public interface StatisticsDao  {
 	public List<StatisticsBean> selectFeeStationCheckedScore(StatisticsBean obj);
    
 	public List<StatisticsBean> selectFeeStationCheckedPersonScoreDetail(StatisticsBean obj);
+
+	public List<StatisticsBean> selectFeeStationCheckedPersonAllScoreDetail(StatisticsBean obj);
+
+	public List<StatisticsBean> selectFeeStationCheckedPersonScoreDetailByUser(StatisticsBean obj);
+
+	public List<StatisticsBean> selectFeeStationCheckedPersonScoreDetailByUserByParentid(StatisticsBean obj);
+
+	public List<StatisticsBean> selectFeeStationCheckedPersonScoreDetailByParent(StatisticsBean obj);
 	
 	public List<StatisticsBean> selectYearScoreInfo(StatisticsBean obj);
 	

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

@@ -320,6 +320,35 @@
         GROUP BY t.checked_dept,t.checked_person
     </select>
 
+    <select id="selectFeeStationCheckedPersonScoreDetailByParent"
+            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 ,s.parent_id FROM (
+        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 t.check_item_score is not null and ct.id not in
+        <include refid="taskexclouddeleteUser"/>
+        <if test="start_date!=null and end_date != null">
+            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
+            <foreach collection="position_ids" item="position_id" index="index"
+                     open="(" close=")" separator=",">
+                #{position_id}
+            </foreach>
+        </if>
+        )
+        u LEFT JOIN check_item s ON u.parent_id = s.id
+        where 1=1
+        <if test="check_type != null">
+            AND s.parent_id = #{check_type}
+        </if>
+        GROUP BY dept_id,item_id
+    </select>
+
     <select id="selectFeeStationCheckedPersonScoreDetail"
             parameterType="com.xintong.visualinspection.bean.StatisticsBean"
             resultType="com.xintong.visualinspection.bean.StatisticsBean">
@@ -344,6 +373,87 @@
         u LEFT JOIN check_item s ON u.parent_id = s.id GROUP BY dept_id,item_id
     </select>
 
+    <select id="selectFeeStationCheckedPersonScoreDetailByUser"
+            parameterType="com.xintong.visualinspection.bean.StatisticsBean"
+            resultType="com.xintong.visualinspection.bean.StatisticsBean">
+        SELECT a.*,b.ORGANID as dept_id FROM
+        (SELECT u.checked_person AS user_id ,sum(u.score) AS score  FROM (
+        SELECT t.checked_person,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 t.check_item_score is not null and ct.id not in
+        <include refid="taskexclouddeleteUser"/>
+        <if test="start_date!=null and end_date != null">
+            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
+            <foreach collection="position_ids" item="position_id" index="index"
+                     open="(" close=")" separator=",">
+                #{position_id}
+            </foreach>
+        </if>
+        )
+        u LEFT JOIN check_item s ON u.parent_id = s.id GROUP BY user_id)a left join t_sys_users b on a.user_id = b.id
+    </select>
+
+    <select id="selectFeeStationCheckedPersonScoreDetailByUserByParentid"
+            parameterType="com.xintong.visualinspection.bean.StatisticsBean"
+            resultType="com.xintong.visualinspection.bean.StatisticsBean">
+        SELECT u.checked_person AS user_id ,u.parent_id AS item_id ,sum(u.score) AS score ,s.name,s.id ,s.parent_id FROM (
+        SELECT t.checked_person,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 t.check_item_score is not null and ct.id not in
+        <include refid="taskexclouddeleteUser"/>
+        <if test="start_date!=null and end_date != null">
+            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
+            <foreach collection="position_ids" item="position_id" index="index"
+                     open="(" close=")" separator=",">
+                #{position_id}
+            </foreach>
+        </if>
+        )
+        u LEFT JOIN check_item s ON u.parent_id = s.id
+        where 1=1
+        <if test="check_type != null">
+            AND s.parent_id = #{check_type}
+        </if>
+        GROUP BY user_id,item_id
+    </select>
+
+    <select id="selectFeeStationCheckedPersonAllScoreDetail"
+            parameterType="com.xintong.visualinspection.bean.StatisticsBean"
+            resultType="com.xintong.visualinspection.bean.StatisticsBean">
+        SELECT a.*,b.name FROM(
+        SELECT main.dept_id,sum(main.score) as score,cit.parent_id as id from(
+        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, 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 t.check_item_score is not null and ct.id not in
+        <include refid="taskexclouddeleteUser"/>
+        <if test="start_date!=null and end_date != null">
+            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
+            <foreach collection="position_ids" item="position_id" index="index"
+                     open="(" close=")" separator=",">
+                #{position_id}
+            </foreach>
+        </if>
+        )
+        u LEFT JOIN check_item s ON u.parent_id = s.id GROUP BY dept_id,item_id) main left join check_item cit on main.item_id = cit.id
+        GROUP BY dept_id,parent_id)a left join check_item b on a.id = b.id
+    </select>
+
     <sql id="selectAllCheckedInfo">
         SELECT
         check_num_t.checked_num , checked_score_t.mth, checked_score_t.checkd_all_score ,

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

@@ -22,6 +22,7 @@ import com.xintong.visualinspection.dao.master.CheckTaskPeriodDao;
 import com.xintong.visualinspection.dao.master.CheckUserStatisticsDao;
 import com.xintong.visualinspection.pojo.StatisiticPojo;
 import com.xintong.visualinspection.pojo.UserRankingData;
+import com.xintong.visualinspection.service.CheckRuleService;
 import com.xintong.visualinspection.service.ThreadTaskService;
 import org.jxls.common.Context;
 import org.jxls.util.JxlsHelper;
@@ -68,10 +69,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
     @Autowired
     private ThreadTaskService threadTaskService;
 
-
-
-
-
+	@Autowired
+	private CheckRuleService checkRuleService;
 
     @Override
     public List<UserChangeStation> getUserChangeStation(StatisticsBean obj) {
@@ -424,91 +423,91 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		return sortList;
 	}
 
-	@Override
-	public List<StatisticsBean> getFeeStationCheckItemScore(StatisticsBean obj) {
-
-		// 获取收费站信息收费站人数
-		Constant t = CodeUtil.getCodeByFlagAndValue("feestation_check_jobs", "1");
-		String[] postions = t.getCode_name().split(",");
-		User user = new User();
-		List<Integer> positionList = new ArrayList<Integer>();
-		for (int i = 0; i < postions.length; i++) {
-			positionList.add(Integer.parseInt(postions[i]));
-		}
-		user.setPosition_ids(positionList);
-		user.setInvalidtime(obj.getStart_date());
-		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
-		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
-		int i = 0;
-		for (StatisticsBean sta : lists) {
-			if (i < 7) {
-				sta.setId(1);
-			} else if (i < 13) {
-				sta.setId(2);
-			} else {
-				sta.setId(3);
-			}
-			i++;
-			mapStationInfos.put(sta.getDept_id(), sta);
-		}
-
-		// 检查人数 和 检查次数
-		obj.setPosition_ids(positionList);
-		List<StatisticsBean> listCheckNum = statisticsDao.selectFeeStationCheckNum(obj);
-		for (StatisticsBean sta : listCheckNum) {
-			if (mapStationInfos.containsKey(sta.getDept_id())) {
-				mapStationInfos.get(sta.getDept_id()).setChecked_num(sta.getChecked_num());
-				mapStationInfos.get(sta.getDept_id()).setChecked_people_num(sta.getChecked_people_num());
-			}
-		}
-
-		List<StatisticsBean> listCheckedScore = statisticsDao.selectFeeStationCheckedPersonScoreDetail(obj);
-		for (StatisticsBean sta : listCheckedScore) {
-			if (mapStationInfos.containsKey(sta.getDept_id()) && sta != null) {
-				StatisticsBean statis = mapStationInfos.get(sta.getDept_id());
-				statis.setAll_check_score(statis.getAll_check_score() + sta.getScore());
-				statis.getChecked_socre_name().add(sta.getName());
-				statis.getChecked_score().add(sta.getScore());
-				statis.getChecked_score_ids().add(sta.getId());
-			}
-		}
-
-		List<StatisticsBean> sortList = new ArrayList<>(mapStationInfos.values());
-
-		sortList.sort(new Comparator<StatisticsBean>() {
-			@Override
-			public int compare(StatisticsBean o1, StatisticsBean o2) {
-				if (o1.getId() > o2.getId()) {
-					return 1;
-				} else if (o1.getId() == o2.getId()) {
-					if (o1.getChecked_num() != 0 && o2.getChecked_num() != 0) {
-						if (o1.getAll_check_score() / (o1.getChecked_num() + 0.0) > o2.getAll_check_score()
-								/ (o2.getChecked_num() + 0.0)) {
-							return 1;
-						} else if (o1.getAll_check_score() / (o1.getChecked_num() + 0.0) < o2.getAll_check_score()
-								/ (o2.getChecked_num() + 0.0)) {
-							return -1;
-						} else {
-							return 0;
-						}
-					} else {
-						if (o1.getChecked_num() == 0) {
-							return -1;
-						} else if (o2.getChecked_num() == 0) {
-							return 1;
-						} else {
-							return 0;
-						}
-					}
-				} else {
-					return -1;
-				}
-			}
-		});
-
-		return sortList;
-
-	}
+//	@Override
+//	public List<StatisticsBean> getFeeStationCheckItemScore(StatisticsBean obj) {
+//
+//		// 获取收费站信息收费站人数
+//		Constant t = CodeUtil.getCodeByFlagAndValue("feestation_check_jobs", "1");
+//		String[] postions = t.getCode_name().split(",");
+//		User user = new User();
+//		List<Integer> positionList = new ArrayList<Integer>();
+//		for (int i = 0; i < postions.length; i++) {
+//			positionList.add(Integer.parseInt(postions[i]));
+//		}
+//		user.setPosition_ids(positionList);
+//		user.setInvalidtime(obj.getStart_date());
+//		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
+//		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
+//		int i = 0;
+//		for (StatisticsBean sta : lists) {
+//			if (i < 7) {
+//				sta.setId(1);
+//			} else if (i < 13) {
+//				sta.setId(2);
+//			} else {
+//				sta.setId(3);
+//			}
+//			i++;
+//			mapStationInfos.put(sta.getDept_id(), sta);
+//		}
+//
+//		// 检查人数 和 检查次数
+//		obj.setPosition_ids(positionList);
+//		List<StatisticsBean> listCheckNum = statisticsDao.selectFeeStationCheckNum(obj);
+//		for (StatisticsBean sta : listCheckNum) {
+//			if (mapStationInfos.containsKey(sta.getDept_id())) {
+//				mapStationInfos.get(sta.getDept_id()).setChecked_num(sta.getChecked_num());
+//				mapStationInfos.get(sta.getDept_id()).setChecked_people_num(sta.getChecked_people_num());
+//			}
+//		}
+//
+//		List<StatisticsBean> listCheckedScore = statisticsDao.selectFeeStationCheckedPersonScoreDetail(obj);
+//		for (StatisticsBean sta : listCheckedScore) {
+//			if (mapStationInfos.containsKey(sta.getDept_id()) && sta != null) {
+//				StatisticsBean statis = mapStationInfos.get(sta.getDept_id());
+//				statis.setAll_check_score(statis.getAll_check_score() + sta.getScore());
+//				statis.getChecked_socre_name().add(sta.getName());
+//				statis.getChecked_score().add(sta.getScore());
+//				statis.getChecked_score_ids().add(sta.getId());
+//			}
+//		}
+//
+//		List<StatisticsBean> sortList = new ArrayList<>(mapStationInfos.values());
+//
+//		sortList.sort(new Comparator<StatisticsBean>() {
+//			@Override
+//			public int compare(StatisticsBean o1, StatisticsBean o2) {
+//				if (o1.getId() > o2.getId()) {
+//					return 1;
+//				} else if (o1.getId() == o2.getId()) {
+//					if (o1.getChecked_num() != 0 && o2.getChecked_num() != 0) {
+//						if (o1.getAll_check_score() / (o1.getChecked_num() + 0.0) > o2.getAll_check_score()
+//								/ (o2.getChecked_num() + 0.0)) {
+//							return 1;
+//						} else if (o1.getAll_check_score() / (o1.getChecked_num() + 0.0) < o2.getAll_check_score()
+//								/ (o2.getChecked_num() + 0.0)) {
+//							return -1;
+//						} else {
+//							return 0;
+//						}
+//					} else {
+//						if (o1.getChecked_num() == 0) {
+//							return -1;
+//						} else if (o2.getChecked_num() == 0) {
+//							return 1;
+//						} else {
+//							return 0;
+//						}
+//					}
+//				} else {
+//					return -1;
+//				}
+//			}
+//		});
+//
+//		return sortList;
+//
+//	}
 
 	private Integer getItemScore(StatisticsBo obj, String name) {
 		List<String> names = obj.getChecked_socre_name();
@@ -649,6 +648,20 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 	@Override
 	public void getFeeStationCheckItemScore(StatisticsBean obj, HttpServletRequest req, HttpServletResponse resp) {
+		Map<String,String> param = new HashMap<String,String>();
+		param.put("rule_type", "4");
+		CheckRule cr = checkRuleService.getItemListByRuleType(param);
+		List<CheckItem> itemList=null;
+		if(cr!=null && obj.getCheck_type() == 0)
+			itemList = cr.getCheck_items();
+		if(cr!=null && obj.getCheck_type() != 0 && obj.getCheck_type() != null){
+			for(CheckItem item: cr.getCheck_items()){
+				long id = item.getId();
+				if((int)id == obj.getCheck_type()){
+					itemList = item.getSubCheckItem();
+				}
+			}
+		}
 		List<StatisticsBean> list = getFeeStationCheckItemScore(obj);
 		int totalMan = 0, totalcheckedMan = 0, totalcheckedCount = 0, totalAll = 0;
 		Map<String, Integer> scoreTypeMap = new HashMap<String, Integer>();
@@ -657,16 +670,21 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			StatisticsBean st = list.get(i);
 			// id值设置 seq_checked_score
 			// 平均值
+			DecimalFormat decimalFormat=new DecimalFormat("0.00");
 			st.setCheck_score_avg(
 					(st.getChecked_num() != 0) ? st.getAll_check_score() / (st.getChecked_num() + 0.0f) : 0.00f);
-			st.getSeq_checked_score().add(getItemScore2(st, "环境卫生"));
-			st.getSeq_checked_score().add(getItemScore2(st, "仪容仪表"));
-			st.getSeq_checked_score().add(getItemScore2(st, "表情"));
-			st.getSeq_checked_score().add(getItemScore2(st, "动作"));
-			st.getSeq_checked_score().add(getItemScore2(st, "文明用语"));
-			st.getSeq_checked_score().add(getItemScore2(st, "工作纪律"));
-			st.getSeq_checked_score().add(getItemScore2(st, "便民服务"));
-			st.getSeq_checked_score().add(getItemScore2(st, "安全管理"));
+			st.setScore_avg(decimalFormat.format(st.getCheck_score_avg()));
+			for(CheckItem item: itemList){
+				st.getSeq_checked_score().add(getItemScore2(st, item.getName()));
+			}
+//			st.getSeq_checked_score().add(getItemScore2(st, "环境卫生"));
+//			st.getSeq_checked_score().add(getItemScore2(st, "仪容仪表"));
+//			st.getSeq_checked_score().add(getItemScore2(st, "表情"));
+//			st.getSeq_checked_score().add(getItemScore2(st, "动作"));
+//			st.getSeq_checked_score().add(getItemScore2(st, "文明用语"));
+//			st.getSeq_checked_score().add(getItemScore2(st, "工作纪律"));
+//			st.getSeq_checked_score().add(getItemScore2(st, "便民服务"));
+//			st.getSeq_checked_score().add(getItemScore2(st, "安全管理"));
 			totalMan += st.getPeople_num();
 			totalcheckedMan += st.getChecked_people_num();
 			totalcheckedCount += st.getChecked_num();
@@ -686,6 +704,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		map.put("totalMan", totalMan);
 		map.put("totalcheckedMan", totalcheckedMan);
 		map.put("totalcheckedCount", totalcheckedCount);
+		map.put("itemList",itemList);
 		List<Constant> typeList = CodeUtil.getCodeByFlag("statistic_check_item_type");
 		for (Constant c : typeList) {
 			if (scoreTypeMap.containsKey(c.getCode_name())) {
@@ -2500,4 +2519,98 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
         return user_ids;
     }
+
+    @Override
+	public List<StatisticsBean> getFeeStationCheckItemScore(StatisticsBean obj) {
+		Map<String,String> param = new HashMap<String,String>();
+		param.put("rule_type", "4");
+		CheckRule cr = checkRuleService.getItemListByRuleType(param);
+		List<CheckItem> itemList=null;
+		if(cr!=null)
+			itemList = cr.getCheck_items();
+		// 获取收费站信息收费站人数
+ 		Constant t = CodeUtil.getCodeByFlagAndValue("feestation_check_jobs", "1");
+		String[] postions = t.getCode_name().split(",");
+		User user = new User();
+		List<Integer> positionList = new ArrayList<Integer>();
+		for (int i = 0; i < postions.length; i++) {
+			positionList.add(Integer.parseInt(postions[i]));
+		}
+		user.setPosition_ids(positionList);
+		user.setInvalidtime(obj.getStart_date());
+		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
+		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
+		int i = 0;
+		for (StatisticsBean sta : lists) {
+			sta.setScore(100);
+			mapStationInfos.put(sta.getDept_id(), sta);
+		}
+
+		// 检查人数 和 检查次数
+		obj.setPosition_ids(positionList);
+		List<StatisticsBean> listCheckNum = statisticsDao.selectFeeStationCheckNum(obj);
+		for (StatisticsBean sta : listCheckNum) {
+			if (mapStationInfos.containsKey(sta.getDept_id())) {
+				mapStationInfos.get(sta.getDept_id()).setChecked_num(sta.getChecked_num());
+				mapStationInfos.get(sta.getDept_id()).setChecked_people_num(sta.getChecked_people_num());
+			}
+		}
+		List<StatisticsBean> listCheckedScore = null;
+		if(obj.getCheck_type() == 0){
+			 listCheckedScore = statisticsDao.selectFeeStationCheckedPersonAllScoreDetail(obj);
+		}else{
+			listCheckedScore = statisticsDao.selectFeeStationCheckedPersonScoreDetailByParent(obj);
+		}
+		for (StatisticsBean sta : listCheckedScore) {
+			if (mapStationInfos.containsKey(sta.getDept_id()) && sta != null) {
+				StatisticsBean statis = mapStationInfos.get(sta.getDept_id());
+				statis.setAll_check_score(statis.getAll_check_score() + sta.getScore());
+				statis.getChecked_socre_name().add(sta.getName());
+				statis.getChecked_score().add(sta.getScore());
+				statis.getChecked_score_ids().add(sta.getId());
+			}
+		}
+		List<StatisticsBean> listUserCheckedScore = null;
+		//List<StatisticsBean> listUserCheckedScore1 = statisticsDao.selectFeeStationCheckedPersonScoreDetailByUser(obj);
+		if(obj.getCheck_type() == 0){
+			listUserCheckedScore = statisticsDao.selectFeeStationCheckedPersonScoreDetailByUser(obj);
+		}else{
+			listUserCheckedScore = statisticsDao.selectFeeStationCheckedPersonScoreDetailByUserByParentid(obj);
+		}
+		for(StatisticsBean sta : listUserCheckedScore){
+					   if (mapStationInfos.containsKey(sta.getDept_id()) && sta != null) {
+						   StatisticsBean statis = mapStationInfos.get(sta.getDept_id());
+						   if(sta.getScore() > 20){
+							   statis.setScore(statis.getScore() - 2);
+						   }else if(sta.getScore() > 10){
+							   statis.setScore(statis.getScore() - 1);
+						   }
+					   }
+
+		}
+		List<StatisticsBean> sortList = new ArrayList<>(mapStationInfos.values());
+		sortList.sort(new Comparator<StatisticsBean>() {
+			@Override
+			public int compare(StatisticsBean o1, StatisticsBean o2) {
+					if(o1.getScore() > o2.getScore()){
+						return  -1;
+					}else if(o1.getScore() < o2.getScore()){
+						return  1;
+					}else{
+						return  0;
+					}
+				}
+		});
+     for(int c=0;c<sortList.size();c++){
+     	 if(c == 0){
+              sortList.get(c).setRanking(1);
+		 }else if(sortList.get(c).getScore() == sortList.get(c-1).getScore()){
+     	 	   sortList.get(c).setRanking(sortList.get(c-1).getRanking());
+		 }else if(sortList.get(c).getScore() < sortList.get(c-1).getScore()){
+     	 	    sortList.get(c).setRanking(c+1);
+		 }
+	 }
+		return sortList;
+
+	}
 }

VisualInspection_server/src/main/resources/application.properties

@@ -7,8 +7,11 @@ 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://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://172.28.2.6:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+#master.datasource.username = root
+#master.datasource.password = root
+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.6:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = xgssoft
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -20,10 +23,13 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 #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.url=jdbc:mysql://xt.wenhq.top:8082/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.6:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.username=root
+#cluster.datasource.password=root
+cluster.datasource.url=jdbc:mysql://127.0.0.1:8502/visualinspection_njy?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://172.28.2.6:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
-cluster.datasource.password=xgssoft
+cluster.datasource.password = xgssoft
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
 cluster.mapper-locations=classpath:com/xintong/visualinspection/mapper/cluster/*.xml
 
@@ -33,9 +39,14 @@ cluster.mapper-locations=classpath:com/xintong/visualinspection/mapper/cluster/*
 #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.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://172.28.2.6:3306/DBTSIIS?useUnicode=true&characterEncoding=utf8
+xiansuo.datasource.url=jdbc:mysql://127.0.0.1:8502/DBTSIIS?useUnicode=true&characterEncoding=utf8
 xiansuo.datasource.username=root
 xiansuo.datasource.password=xgssoft
+#xiansuo.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection_njy?useUnicode=true&characterEncoding=utf-8
+#xiansuo.datasource.username=root
+#xiansuo.datasource.password=root
 xiansuo.datasource.driver-class-name = com.mysql.jdbc.Driver
 xiansuo.mapper-locations=classpath:com/xintong/visualinspection/mapper/xiansuo/*.xml
 
@@ -75,8 +86,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
 
@@ -84,8 +95,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