修改bug

VisualInspection/js/lib/tags/bootstrap-tagsinput.css

@@ -1,55 +0,0 @@
-.bootstrap-tagsinput {
-  background-color: #fff;
-  border: 1px solid #ccc;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  display: inline-block;
-  padding: 4px 6px;
-  color: #555;
-  vertical-align: middle;
-  border-radius: 4px;
-  max-width: 100%;
-  line-height: 22px;
-  cursor: text;
-}
-.bootstrap-tagsinput input {
-  border: none;
-  box-shadow: none;
-  outline: none;
-  background-color: transparent;
-  padding: 0 6px;
-  margin: 0;
-  width: auto;
-  max-width: inherit;
-}
-.bootstrap-tagsinput.form-control input::-moz-placeholder {
-  color: #777;
-  opacity: 1;
-}
-.bootstrap-tagsinput.form-control input:-ms-input-placeholder {
-  color: #777;
-}
-.bootstrap-tagsinput.form-control input::-webkit-input-placeholder {
-  color: #777;
-}
-.bootstrap-tagsinput input:focus {
-  border: none;
-  box-shadow: none;
-}
-.bootstrap-tagsinput .tag {
-  margin-right: 2px;
-  color: white;
-}
-.bootstrap-tagsinput .tag [data-role="remove"] {
-  margin-left: 8px;
-  cursor: pointer;
-}
-.bootstrap-tagsinput .tag [data-role="remove"]:after {
-  content: "x";
-  padding: 0px 2px;
-}
-.bootstrap-tagsinput .tag [data-role="remove"]:hover {
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-.bootstrap-tagsinput .tag [data-role="remove"]:hover:active {
-  box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-}

VisualInspection/js/lib/tags/jquery.tagsinput.min.css

@@ -0,0 +1 @@
+div.tagsinput{border:1px solid #CCC;background:#FFF;padding:5px;width:300px;height:100px;overflow-y:auto}div.tagsinput span.tag{border:1px solid #a5d24a;-moz-border-radius:2px;-webkit-border-radius:2px;display:block;float:left;padding:5px;text-decoration:none;background:#cde69c;color:#638421;margin-right:5px;margin-bottom:5px;font-family:helvetica;font-size:13px}div.tagsinput span.tag a{font-weight:700;color:#82ad2b;text-decoration:none;font-size:11px}div.tagsinput input{width:80px;margin:0 5px 5px 0;font-family:helvetica;font-size:13px;border:1px solid transparent;padding:5px;background:0 0;color:#000;outline:0}div.tagsinput div{display:block;float:left}.tags_clear{clear:both;width:100%;height:0}.not_valid{background:#FBD8DB!important;color:#90111A!important}

VisualInspection/js/mytask/check.js

@@ -6,7 +6,6 @@ function initCheck() {
     });
 
 
-
     $("#tabcontent").css("height", ($("#video_content").height() - 80) + "px");
 
     if (ISCLIENT) {
@@ -336,9 +335,11 @@ function showEditCheckScore(id) {
     $("#score_id_text").val(rowData.id);
     $("#check_item_text").val(rowData.content);
     $("#check_score_text").val(rowData.check_item_score);
-    $("#check_remark_text").val(rowData.remark);
     setFeeUserSelect("#check_checked_person_select", rowData.checked_person);
     // $("#check_checked_person_select").val(rowData.checked_person);
+    $("#check_remark_text").tagsInput({'defaultText':'添加备注','width':'240px'});
+    $("#check_remark_text").addTag(rowData.remark);
+    getTags("/score/getTopRemark",'#score_remark_div','#check_remark_text','remark');
 }
 
 function setFeeUserSelect(div, selectId) {
@@ -766,7 +767,9 @@ function submitCheck() {
         layer.msg("提交成功", {
             time: 2000 //20s后自动关闭
         });
-        changePage("/view/mytask/task_list.html?status=2");
+        var currentpage = $.zui.store.get("currentpage");
+        getPageInfo(currentpage);
+        // changePage("/view/mytask/task_list.html?status=2");
     });
 
 }
@@ -783,6 +786,8 @@ function showInvalid() {
         saveValidReason();
     }, ['400px', '500px'], '#invalid_div', 'r');
 
+    $('#apply_reason').tagsInput({'defaultText':'添加原因'});
+    getTags("/checkApply/getTopReason","#top_reason_div",'#apply_reason','apply_reason');
 }
 
 function submitCheck4Appeal() {
@@ -812,7 +817,9 @@ function submitCheck4AppealResult(appeal_result){
         layer.msg("提交成功", {
             time: 2000 //20s后自动关闭
         });
-        changePage("/view/appeal_management/appeal_list.html?status=12");
+        var currentpage = $.zui.store.get("currentpage");
+        getPageInfo(currentpage);
+        // changePage("/view/appeal_management/appeal_list.html?status=12");
     });
 }
 function showPre4Appeal(id) {
@@ -825,13 +832,15 @@ function showPre4Appeal(id) {
 function saveValidReason() {
     var param = {
         "task_id": $.checkTask.id,
-        "apply_reason": $("#apply_reason").val()
+        "apply_reason": $('#apply_reason').val()
     }
     no_return_common_service("/checkApply/add/", param, function(data) {
         layer.msg("申请提交成功", {
             time: 2000 //20s后自动关闭
         });
-        changePage("/view/mytask/task_list.html?status=2");
+        var currentpage = $.zui.store.get("currentpage");
+        getPageInfo(currentpage);
+        // changePage("/view/mytask/task_list.html?status=2");
     });
 }
 
@@ -891,4 +900,22 @@ function saveRecheckResult() {
         });
         $.checkTask.appeal = data;
     });
-}
+}
+
+function addTag(text,tagDiv){
+    if (!$(tagDiv).tagExist(text)) {
+        $(tagDiv).addTag(text);
+    }
+}
+
+// function getTags(){
+//     post_common_service("/checkApply/getTopReason", null, function(data) {
+//         if(data){
+//             var str="";
+//             for(var i=0;i<data.length;i++){
+//                 str+='<a href="javascript:void(0)" onclick="addTag(\''+data[i].apply_reason+'\')" style="float:left;margin:5px;"><span class="label label-success" style="padding:5px;">'+data[i].apply_reason+'</span></a>';
+//             }
+//             $("#top_reason_div").html(str);
+//         }
+//     });
+// }

VisualInspection/js/mytask/checked.js

@@ -12,13 +12,16 @@ function queryCheckedTask(){
         "check_status_arr":[4,5,6],
         "position_id":$("#jobSelect").val()
     }
-    
+    var hide = false;
+    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA)|| roleContains('STATION')) {
+        hide = true;
+    }
     var cols = [
                 {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
                 {width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down',field: 'name'},
                 {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
                 {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
-                {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: '',field: 'checkman_name'},
+                {width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide,field: 'checkman_name'},
                 {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
                 // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
                 {width: 160, text: '操作', type: 'string', flex: true, field: 'id',

VisualInspection/js/util/util.js

@@ -537,4 +537,15 @@ function Map() {
         str += "}";
         return str;
     }
+}
+function getTags(url,div,tagDiv,field){
+    post_common_service(url, null, function(data) {
+        if(data){
+            var str="";
+            for(var i=0;i<data.length;i++){
+                str+='<a href="javascript:void(0)" onclick="addTag(\''+data[i][field]+'\',\''+tagDiv+'\')" style="float:left;margin:5px;"><span class="label label-success" style="padding:5px;">'+data[i][field]+'</span></a>';
+            }
+            $(div).html(str);
+        }
+    });
 }

VisualInspection/view/appeal_management/appealDetail.html

@@ -51,7 +51,9 @@
         layer.msg("申诉提交成功", {
             time: 2000//20s后自动关闭
         });
-        changePage("/view/mytask/task_list.html?status=5");
+        var currentpage = $.zui.store.get("currentpage");
+        getPageInfo(currentpage);
+        // changePage("/view/mytask/task_list.html?status=5");
     });
  }
  </script>

VisualInspection/view/common/commoncsslink.html

@@ -8,6 +8,6 @@
 <link rel="stylesheet" type="text/css" href="/js/lib/slide/css/bootstrap-slider.min.css">
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">
 <link rel="stylesheet" type="text/css" href="/js/lib/webuploader/webuploader.css">  
-<link rel="stylesheet" type="text/css" href="/js/lib/tags/bootstrap-tagsinput.css"> 
+<link rel="stylesheet" type="text/css" href="/js/lib/tags/jquery.tagsinput.min.css"> 
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/uploader/zui.uploader.min.css">
 <link href="/node_modules/zui/dist/lib/chosen/chosen.min.css" rel="stylesheet">

VisualInspection/view/common/commonscriptlink.html

@@ -21,7 +21,7 @@
 <script src="/js/lib/webuploader/webuploader.js"></script>
 <script type="text/javascript" src="/js/lib/combotree/icontains.js"></script>
 <script type="text/javascript" src="/js/lib/combotree/comboTreePlugin.js"></script>
-<script src="/js/lib/tags/tagsbootstrap-tagsinput.min.js"></script>
+<script src="/js/lib/tags/jquery.tagsinput.min.js"></script>
 <script src="/js/util/util.js"></script>
 <script src="/js/util/service.js"></script>
 <script src="/js/constant/constant.js"></script>

VisualInspection/view/mytask/check.html

@@ -169,14 +169,18 @@
 </div>
 <!-- 对话框HTML -->
 <div id="invalid_div" style="display:none;text-align:center;">
-    <div class="container-fluid ">
+    <div class="container-fluid" style="overflow: hidden">
         <div class="cards">
             <div class="form-group">
-                <label class="col-md-4 col-sm-2">原因</label>
                 <div class="col-md-6 col-sm-10">
-                    <input type="text" class="form-control" id="apply_reason" placeholder="">
+                    <input type="text" name="tags" class="form-control" id="apply_reason" placeholder="">
                 </div>
             </div>
+            <br>
+            <div class="row" style="clear:both;height:100%;">
+            </div>
+            <div class="row" id="top_reason_div" style="padding:15px;">
+            </div>
         </div>
     </div>
 </div>

VisualInspection/view/mytask/scoreDetail.html

@@ -26,5 +26,8 @@
                 <textarea class="form-control" id="check_remark_text"  placeholder=""/>
             </div>
         </div>
+        <div class="form-group">
+            <div class="col-md-12" id="score_remark_div"></div>
+        </div>
     </form>
 </div>

VisualInspection/view/mytask/taskDetail.html

@@ -292,7 +292,9 @@
              layer.msg("提交成功", {
                 time: 2000//20s后自动关闭
              });
-            changePage("/view/mytask/task_list.html?status=2");
+            var currentpage = $.zui.store.get("currentpage");
+            getPageInfo(currentpage);
+            // changePage("/view/mytask/task_list.html?status=2");
         });
         
     }
@@ -359,7 +361,9 @@
                 layer.msg("确认成功", {
                     time: 2000//20s后自动关闭
                 });
-                changePage("/view/mytask/task_list.html?status=5");
+                var currentpage = $.zui.store.get("currentpage");
+                getPageInfo(currentpage);
+                // changePage("/view/mytask/task_list.html?status=5");
             });
         }, function(index){
             layer.close(index);
@@ -380,7 +384,9 @@
                 layer.msg("确认成功", {
                     time: 2000//20s后自动关闭
                 });
-                changePage("/view/mytask/task_list.html?status=5");
+                var currentpage = $.zui.store.get("currentpage");
+                getPageInfo(currentpage);
+                // changePage("/view/mytask/task_list.html?status=5");
             });
         }, function(index){
             layer.close(index);
@@ -415,7 +421,9 @@
              layer.msg("分配成功", {
                 time: 2000//20s后自动关闭
              });
-            changePage("/view/mytask/task_list.html?status=11");
+            var currentpage = $.zui.store.get("currentpage");
+            getPageInfo(currentpage);
+            // changePage("/view/mytask/task_list.html?status=11");
         });
     }
 
@@ -430,7 +438,9 @@
              layer.msg("退回成功", {
                 time: 2000//20s后自动关闭
              });
-            changePage("/view/mytask/task_list.html?status=4");
+            var currentpage = $.zui.store.get("currentpage");
+            getPageInfo(currentpage);
+            // changePage("/view/mytask/task_list.html?status=4");
         });
     }
     function back2Confirm(){
@@ -444,7 +454,9 @@
              layer.msg("退回成功", {
                 time: 2000//20s后自动关闭
              });
-            changePage("/view/mytask/task_list.html?status=6");
+            var currentpage = $.zui.store.get("currentpage");
+            getPageInfo(currentpage);
+            // changePage("/view/mytask/task_list.html?status=6");
         });
     }
     </script>

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

@@ -55,4 +55,6 @@ public class CheckApply {
     private String code_name;
     
     private Long[] apply_ids;
+    
+    private Integer count;
 }

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

@@ -114,6 +114,8 @@ public class StatisticsBean {
     
     private String check_task_time_name ;
     
+    private List<Integer> position_ids;
+    
     // 比较大小 1 小 ， -1 大
     public int compareTo(StatisticsBean o2){
     	if(this.getChecked_num()!=0 && o2.getChecked_num()!=0){

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

@@ -1,6 +1,8 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -15,12 +17,14 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.CheckApply;
+import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Task;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.CheckApplyService;
 import com.xintong.visualinspection.service.TaskService;
 import com.xintong.visualinspection.util.AuthorUtil;
 import com.xintong.visualinspection.util.CacheUtil;
+import com.xintong.visualinspection.util.CodeUtil;
 import com.xintong.visualinspection.util.Constants;
 
 /**
@@ -156,7 +160,8 @@ public class CheckApplyController extends BaseController {
     	checkApplyService.update(checkAppeal);
     	Task task = new Task();
     	task.setId(checkAppeal.getTask_id());
-    	task.setCheck_status(check_status);
+    	//无效任务拒绝后，任务该外待稽查状态
+    	task.setCheck_status(Constants.STATUS_CHECK_SUBMIT);
     	task.setUpdate_user(new Long(user.getId()));
     	taskService.update(task);
     	return super.returnSuccessResult("拒绝成功");
@@ -215,5 +220,20 @@ public class CheckApplyController extends BaseController {
     	return super.returnSuccessResult(new PageInfo(checkAppeal));
     }
     
-    
+    /**
+     * 获取无效任务原因排名前10
+     * @param checkItem
+     * @return
+     */
+    @RequestMapping(value = "/getTopReason")
+    public String getTopReason(){
+    	Map<String,Object> param = new HashMap<String,Object>();
+    	// 获取原因显示条数
+    	int showNum = 10;
+		Constant t =  CodeUtil.getCodeByFlagAndValue("top_show_num", "1");
+		if(t!=null) showNum = Integer.parseInt(t.getCode_name());
+    	param.put("num", showNum);
+    	List<CheckApply> checkApplyList =  checkApplyService.getTopReasonList(param);
+    	return super.returnSuccessResult(checkApplyList);
+    }
 }

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

@@ -1,6 +1,8 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.validation.Valid;
 
@@ -11,8 +13,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.CheckApply;
+import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Score;
 import com.xintong.visualinspection.service.ScoreService;
+import com.xintong.visualinspection.util.CodeUtil;
 
 /**
  * 文件名：TestController
@@ -93,4 +98,21 @@ public class ScoreController extends BaseController {
     	List<Score> scorelist = scoreService.getScoreList(score);
     	return super.returnSuccessPageResult(scorelist);
     }
+    
+    /**
+     * 获取备注排名前10
+     * @param checkItem
+     * @return
+     */
+    @RequestMapping(value = "/getTopRemark")
+    public String getTopRemark(){
+    	Map<String,Object> param = new HashMap<String,Object>();
+    	// 获取原因显示条数
+    	int showNum = 10;
+		Constant t =  CodeUtil.getCodeByFlagAndValue("top_show_num", "1");
+		if(t!=null) showNum = Integer.parseInt(t.getCode_name());
+    	param.put("num", showNum);
+    	List<Score> scoreList =  scoreService.getTopRemarkList(param);
+    	return super.returnSuccessResult(scoreList);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.xintong.visualinspection.dao.master;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
 
@@ -18,4 +19,5 @@ public interface CheckApplyDao  {
     public void insert(CheckApply checkApply);
     public void update(CheckApply checkApply);
     public void delete(Long id);
+    public List<CheckApply> getTopReasonList(Map<String,Object> param);
 }

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

@@ -1,6 +1,7 @@
 package com.xintong.visualinspection.dao.master;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
 
@@ -19,4 +20,5 @@ public interface ScoreDao  {
     public void insert(Score score);
     public void update(Score score);
     public void delete(Long id);
+    public List<Score> getTopRemarkList(Map<String,Object> param);
 }

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

@@ -19,6 +19,7 @@
         <result column="end_time" property="end_time" jdbcType="DATE" />
         
         <result column="code_name" property="code_name" jdbcType="VARCHAR" />
+        <result column="count" property="count" jdbcType="INTEGER" />
     </resultMap>
 
     <select id="getList" resultMap="BaseResultMap" parameterType="com.xintong.visualinspection.bean.CheckApply" >
@@ -54,7 +55,7 @@
         WHERE task_id = #{id}
     </select>
     
-    <insert id="insert" parameterType="com.xintong.visualinspection.bean.CheckAppeal" >
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.CheckApply" >
         INSERT INTO
         check_apply
         (apply_reason,check_status,apply_time,update_time,apply_man,verify_person,apply_dept,task_id,remark)
@@ -62,7 +63,7 @@
         (#{apply_reason}, #{check_status},now(),now(),#{apply_man},#{verify_person},#{apply_dept},#{task_id},#{remark})
     </insert>
 
-    <update id="update" parameterType="com.xintong.visualinspection.bean.CheckAppeal" >
+    <update id="update" parameterType="com.xintong.visualinspection.bean.CheckApply" >
         UPDATE
         	check_apply
         SET
@@ -79,4 +80,12 @@
         WHERE
         id =#{id}
     </delete>
+    
+    <select id="getTopReasonList" parameterType="map" resultMap="BaseResultMap">
+    	SELECT count(*) as count,apply_reason
+		FROM check_apply
+		GROUP BY apply_reason
+		ORDER BY count desc
+		LIMIT 0,#{num}
+    </select>
 </mapper>

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

@@ -77,4 +77,12 @@
         WHERE
         id =#{id}
     </delete>
+    <select id="getTopRemarkList" parameterType="map" resultMap="BaseResultMap">
+    	SELECT count(*) as count,remark
+		FROM check_score
+		WHERE remark is not null
+		GROUP BY remark
+		ORDER BY count desc
+		LIMIT 0,#{num}
+    </select>
 </mapper>

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

@@ -7,7 +7,7 @@
 			SELECT t.checked_person , t.checked_dept,ci.parent_id, ci.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!=23
+			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}
 			</if>
@@ -20,7 +20,7 @@
 
     <select id="selectCheckedTimes" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
     	SELECT COUNT(1) AS checked_num , t.checked_person AS user_id FROM check_task t 
-    	WHERE 1=1 and t.check_status!=23
+    	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} 
 			</if>
@@ -31,11 +31,19 @@
     </select>
     
     <select id="selectFeeStationCheckNum" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-    	SELECT COUNT(DISTINCT( t.checked_person )) AS checked_people_num , COUNT(t.checked_person) AS checked_num  ,t.checked_dept AS dept_id FROM check_task  t
-    	WHERE 1=1 and t.check_status!=23
+    	SELECT COUNT(DISTINCT( t.checked_person )) AS checked_people_num , COUNT(t.checked_person) AS checked_num  ,t.checked_dept AS dept_id 
+    	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}
 			</if>
+			<if test="position_ids != null and position_ids.size() > 0">
+        		AND u.positionid in 
+        		<foreach collection="position_ids" item="position_id" index="index"
+		            open="(" close=")" separator=",">
+		            #{position_id}
+		        </foreach>
+        	</if>
     	 GROUP BY t.checked_dept
     </select>
     
@@ -44,7 +52,7 @@
     		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!=23
+    		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}
 			</if>
@@ -56,10 +64,19 @@
 			SELECT  t.checked_dept,ci.parent_id, ci.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!=23
+			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
 			<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>
+			<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
     </select>
       

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/CheckApplyService.java

@@ -1,6 +1,7 @@
 package com.xintong.visualinspection.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.xintong.visualinspection.bean.CheckApply;
 
@@ -23,4 +24,5 @@ public interface CheckApplyService {
     public void insert(CheckApply checkApply);
     public void update(CheckApply checkApply);
     public void delete(Long id);
+    public List<CheckApply> getTopReasonList(Map<String,Object> param);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/ScoreService.java

@@ -1,6 +1,7 @@
 package com.xintong.visualinspection.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Score;
@@ -25,4 +26,5 @@ public interface ScoreService {
     public void insert(Score score);
     public void update(Score score);
     public void delete(Long id);
+    public List<Score> getTopRemarkList(Map<String,Object> param);
 }

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

@@ -1,6 +1,7 @@
 package com.xintong.visualinspection.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,4 +56,9 @@ public class CheckApplyServiceImpl extends BaseService implements CheckApplyServ
 		// TODO Auto-generated method stub
 		return checkApplyDao.getOneByTaskId(id);
 	}
+	@Override
+	public List<CheckApply> getTopReasonList(Map<String, Object> param) {
+		// TODO Auto-generated method stub
+		return checkApplyDao.getTopReasonList(param);
+	}
 }

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

@@ -2,6 +2,7 @@ package com.xintong.visualinspection.service.impl;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,4 +73,10 @@ public class ScoreServiceImpl extends BaseService implements ScoreService {
 		// TODO Auto-generated method stub
 		scoreDao.delete(id);
 	}
+
+	@Override
+	public List<Score> getTopRemarkList(Map<String, Object> param) {
+		// TODO Auto-generated method stub
+		return scoreDao.getTopRemarkList(param);
+	}
 }

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

@@ -268,6 +268,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		}
 
 		// 检查人数 和 检查次数
+		obj.setPosition_ids(positionList);
 		List<StatisticsBean> listCheckNum = statisticsDao.selectFeeStationCheckNum(obj);
 		for (StatisticsBean sta : listCheckNum) {
 			if (mapStationInfos.containsKey(sta.getDept_id())) {
@@ -278,7 +279,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 		List<StatisticsBean> listCheckedScore = statisticsDao.selectFeeStationCheckedPersonScoreDetail(obj);
 		for (StatisticsBean sta : listCheckedScore) {
-			if (mapStationInfos.containsKey(sta.getDept_id())) {
+			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());

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/Constants.java

@@ -7,6 +7,7 @@ public class Constants {
 	public static int STATUS_CHECK_START = 3;
 	public static int STATUS_CHECK_END = 4;
 	public static int STATUS_CHECK_DISPATCH = 5;
+	public static int STATUS_CHECK_SUBMIT = 7;
 	public static int STATUS_APPEALING = 11;
 	public static int STATUS_APPEAL_SUCCEED = 12;
 	public static int STATUS_APPEAL_FAILED = 13;