Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/view/appeal_management/appealDetail.html

@@ -12,26 +12,39 @@
         <div class="form-group">
             <label class="col-md-4 col-sm-2">申诉附件</label>
             <div class="col-md-6 col-sm-10">
-                <div id="uploader" class="wu-example">
+                <div id="uploaderExample" class="uploader">
+                    <div class="file-list" data-drag-placeholder="请拖拽文件到此处"></div>
+                    <button type="button" class="btn btn-primary uploader-btn-browse" style="float:left;"><i class="icon icon-cloud-upload"></i> 选择文件</button>
+                </div>
+                <!--<div id="uploader" class="wu-example">
                     <div id="thelist" class="uploader-list"></div>
                     <div class="btns">
                         <div id="picker">选择文件</div>
                         <button id="ctlBtn" class="btn btn-default">开始上传</button>
                     </div>
-                </div>
+                </div>-->
             </div>
         </div>
     </form>
 </div>
 <script>
+    $('#uploaderExample').uploader({
+        autoUpload: true,            // 当选择文件后立即自动进行上传操作
+        url: base_server_url +'file/upload',  // 文件上传提交地址
+        onFileUploaded: function(file, responseObject){
+            var datas = eval('('+responseObject.response+')');
+            file_src = datas.result_data.path;
+        }
+    });
  $(document).ready(function() {
-     initUpLoad();
+    //  initUpLoad();
  });
 
  function saveAppeal(){
     var param = {
         "task_id": $.checkTask.id,
-        "appeal_reason": $("#appeal_reason").val()
+        "appeal_reason": $("#appeal_reason").val(),
+        "file_src":file_src
     }
     no_return_common_service("/checkAppeal/add/", param, function (data) {
         layer.msg("申诉提交成功", {

VisualInspection/view/common/commoncsslink.html

@@ -8,3 +8,4 @@
 <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="/node_modules/zui/dist/lib/uploader/zui.uploader.min.css">

VisualInspection/view/common/commonscriptlink.html

@@ -5,6 +5,7 @@
 <script src="/node_modules/zui/dist/lib/datetimepicker/datetimepicker.min.js"></script>
 <script src="/node_modules/zui/dist/lib/datatable/zui.datatable.min.js"></script>
 <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
+<script src="/node_modules/zui/dist/lib/uploader/zui.uploader.min.js"></script>
 <!--<script src="/node_modules/zui/dist/lib/mytable/mytable.js"></script>  -->
 <script src="/js/lib/mytable.js"></script>
 <script src="/node_modules/moment/min/moment.min.js"></script>

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

@@ -40,6 +40,10 @@ public class CheckAppeal {
     private String recheck_result;
     //备注
     private String remark;
+    //申诉原因
+    private String appeal_reason;
+    //复核结果
+    private String recheck_result;
     
     
     //申诉人

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

@@ -0,0 +1,41 @@
+package com.xintong.visualinspection.bean;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 文件名：Job
+ * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Data
+public class StatisticsBean {
+    //编号
+    private Integer id;
+ 
+    // 部门id
+    private Long dept_id;
+    
+    //开始日期
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date start_date ;
+    
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date end_date ;
+    
+    private Long user_id ;
+    
+    private String name ;
+    
+    private Integer score;
+    
+    private Integer item_id ;
+
+    private Integer checked_num;
+}

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

@@ -0,0 +1,28 @@
+package com.xintong.visualinspection.bean;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * 文件名：Job
+ * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Data
+public class StatisticsBo {
+    //编号
+    private Integer id;
+ 
+    private Integer checked_num ;
+    
+    private int check_all_score =0 ; 
+    
+    private List<String> checked_socre_name = new ArrayList<>() ;
+    
+    private List<Integer> checked_score = new ArrayList<>() ;
+    
+    private User user;
+    
+}

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

@@ -0,0 +1,37 @@
+package com.xintong.visualinspection.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xintong.visualinspection.bean.StatisticsBean;
+import com.xintong.visualinspection.bean.StatisticsBo;
+import com.xintong.visualinspection.service.StatisticsService;
+
+/**
+ * 文件名：StatisticsController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@RestController
+@RequestMapping("/statistics")
+public class StatisticsController extends BaseController {
+
+	@Autowired
+	private StatisticsService statisticsService;
+    
+    /**
+     * 通过方法id获取考核项
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/employee/order")
+    public String getByRuleId(@RequestBody StatisticsBean obj){
+    	List<StatisticsBo> lists=  statisticsService.getEmployeeCheckedInfo(obj);
+    	return super.returnSuccessResult(lists);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.xintong.visualinspection.dao.master;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.xintong.visualinspection.bean.StatisticsBean;
+
+/**
+ * 文件名：StatisticsDao
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Mapper
+public interface StatisticsDao  {
+    
+	public List<StatisticsBean> selectStatistics(StatisticsBean obj);
+	
+	public List<StatisticsBean> selectCheckedTimes(StatisticsBean obj);
+   
+}

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

@@ -14,6 +14,8 @@
         <result column="appeal_reason" property="appeal_reason" jdbcType="VARCHAR" />
         <result column="recheck_result" property="recheck_result" jdbcType="VARCHAR" />
         <result column="remark" property="remark" jdbcType="VARCHAR" />
+        <result column="remark" property="appeal_reason" jdbcType="VARCHAR" />
+        <result column="remark" property="recheck_result" jdbcType="VARCHAR" />
         
         
         <result column="name" property="name" jdbcType="VARCHAR" />
@@ -51,9 +53,9 @@
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.CheckAppeal" >
         INSERT INTO
         check_appeal
-        (file_src,check_status,appeal_time,update_time,appeal_man,verify_person,appeal_dept,task_id,remark)
+        (file_src,check_status1,appeal_time,update_time,appeal_man,verify_person,appeal_dept,task_id,remark,appeal_reason,recheck_result)
         VALUES
-        (#{file_src}, #{check_status},now(),now(),#{appeal_man},#{verify_person},#{appeal_dept},#{task_id},#{remark})
+        (#{file_src}, #{check_status},now(),now(),#{appeal_man},#{verify_person},#{appeal_dept},#{task_id},#{remark},#{appeal_reason},#{recheck_result})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.CheckAppeal" >

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xintong.visualinspection.dao.master.StatisticsDao" >
+    
+    <select id="selectStatistics" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
+    	SELECT  u.checked_person AS user_id , u.checked_dept AS dept_id ,u.parent_id AS item_id ,sum(u.score) AS score ,s.name  FROM (
+			SELECT t.checked_person , t.checked_dept,ci.parent_id, t.score  FROM check_score t 
+			LEFT JOIN check_item ci ON t.check_item_id = ci.id
+			WHERE 1=1 
+			<if test="start_date!=null and end_date != null">
+		        AND	 t.update_time &gt;= #{start_date} AND t.update_time &lt;= #{end_date} 
+			</if>
+			<if test="dept_id!=null">
+				AND t.checked_dept =#{dept_id}			
+			</if>
+			 ) 
+			u LEFT JOIN check_item s ON u.parent_id = s.id GROUP  BY checked_person,id
+    </select>
+
+    <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 
+			<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="dept_id!=null">
+				AND t.checked_dept =#{dept_id}			
+			</if>
+    	GROUP BY t.checked_person
+    </select>
+    
+    
+</mapper>

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

@@ -0,0 +1,26 @@
+package com.xintong.visualinspection.service;
+
+import java.util.List;
+
+import com.xintong.visualinspection.bean.CheckRule;
+import com.xintong.visualinspection.bean.Constant;
+import com.xintong.visualinspection.bean.StatisticsBean;
+import com.xintong.visualinspection.bean.StatisticsBo;
+
+/**
+ * 
+ *
+ * StatisticsService
+ * 
+ * tiger
+ * tiger
+ * 2017年5月4日 上午10:41:40
+ * 
+ * @version 1.0.0
+ *
+ */
+public interface StatisticsService {
+   
+	public List<StatisticsBo> getEmployeeCheckedInfo(StatisticsBean obj);
+	
+}

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

@@ -0,0 +1,91 @@
+package com.xintong.visualinspection.service.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xintong.visualinspection.bean.StatisticsBean;
+import com.xintong.visualinspection.bean.StatisticsBo;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.dao.master.StatisticsDao;
+import com.xintong.visualinspection.service.BaseService;
+import com.xintong.visualinspection.service.StatisticsService;
+import com.xintong.visualinspection.util.CacheUtil;
+
+/**
+ * 文件名：StatisticsServiceImpl
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Service
+public class StatisticsServiceImpl extends BaseService implements StatisticsService {
+
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(StatisticsServiceImpl.class);
+
+    @Autowired
+    private StatisticsDao statisticsDao ;
+    
+	@Override
+	public List<StatisticsBo> getEmployeeCheckedInfo(StatisticsBean obj) {
+		// 查看是否有部门id
+		Long organId = obj.getDept_id();
+		// 将检索出来的数据放到如map中
+		List<StatisticsBean> list = statisticsDao.selectStatistics(obj);
+		
+		List<StatisticsBean> timesList = statisticsDao.selectCheckedTimes(obj);
+		
+		Map<Long,StatisticsBo> statisticBoMap = new HashMap<Long,StatisticsBo>();
+				
+		for(User user:CacheUtil.userMap.values()){
+			if(user.getPositionid() ==1){
+				if(organId ==null ||  user.getOrganid()+0L == organId+0L ){
+					StatisticsBo tmp = new StatisticsBo();
+					tmp.setUser(user);
+					statisticBoMap.put(user.getId()+0L,tmp);
+				}
+			}
+		}
+		
+		for( StatisticsBean statisticsBean : list ){
+			if(statisticBoMap.containsKey(statisticsBean.getUser_id())){
+				StatisticsBo tmp = statisticBoMap.get(statisticsBean.getUser_id());
+				if(statisticsBean.getName()!=null && statisticsBean.getScore()!=null){
+					tmp.getChecked_socre_name().add(statisticsBean.getName());
+					tmp.getChecked_score().add(statisticsBean.getScore());
+					tmp.setCheck_all_score(tmp.getCheck_all_score()+statisticsBean.getScore() );					
+				}
+			}
+		}
+		
+		for(StatisticsBean statisticsBean : timesList){
+			if(statisticBoMap.containsKey(statisticsBean.getUser_id())){
+				StatisticsBo tmp = statisticBoMap.get(statisticsBean.getUser_id());
+				tmp.setChecked_num(statisticsBean.getChecked_num());
+			}
+		}
+		
+		List<StatisticsBo> lists = new ArrayList<>(statisticBoMap.values());
+		// 进行排序
+		lists.sort(new Comparator<StatisticsBo>() {
+
+			@Override
+			public int compare(StatisticsBo o1, StatisticsBo o2) {
+				if(o1.getCheck_all_score() >= o2.getCheck_all_score() ){
+					return 1;
+				}else{
+					return -1 ;
+				}
+			}
+		});
+	
+		return lists;
+	}
+    
+}