c s

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

@@ -109,4 +109,8 @@ public class StatisticsBean {
     // 被考核人的姓名
     private String checked_name ;
     
+    
+    private String check_task_name ;
+    
+    private String check_task_time_name ;
 }

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

@@ -267,7 +267,7 @@
      </select>
      
      <select id="selectOneCheckedDetailInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-     	SELECT t.start_time AS start_date , t.end_time AS end_date,cs.check_item_score AS score , ci.name AS name, cs.pics ,t.checkman AS checkman_id,
+     	SELECT t.name AS check_task_name , t.start_time AS start_date , t.end_time AS end_date,cs.check_item_score AS score , ci.name AS name, cs.pics ,t.checkman AS checkman_id,
      	t.checked_person AS user_id ,t.checked_dept AS dept_id FROM check_task t 
      		INNER JOIN check_score cs ON t.id = cs.task_id 
      		LEFT JOIN check_item ci ON ci.id = cs.check_item_id  

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

@@ -7,6 +7,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -19,6 +20,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.jxls.common.Context;
 import org.jxls.util.JxlsHelper;
+import org.jxls.util.Util;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -941,13 +943,21 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 	@Override
 	public List<StatisticsBean> getOneCheckedDetailInfo(StatisticsBean obj) {
-		List<StatisticsBean> list = statisticsDao.selectOneCheckedDetailInfo(obj);		
+		List<StatisticsBean> list = statisticsDao.selectOneCheckedDetailInfo(obj);
+		
+		
 		if(obj.getQueryType() == 1){
 			for(StatisticsBean sta : list){
 				sta.setCheckman_name( CacheUtil.getUserFromMap(sta.getCheckman_id()+0L).getTruename()  ); 
 				sta.setChecked_name( CacheUtil.getUserFromMap(sta.getUser_id()+0L).getTruename());
 				sta.setFeeStationName( CacheUtil.getOrganFromMap(sta.getDept_id()).getOrganname() );
 			}
+		}else{
+			for(StatisticsBean sta : list){
+				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+				SimpleDateFormat formatter2 = new SimpleDateFormat("- HH:mm");
+				sta.setCheck_task_time_name( formatter.format(sta.getStart_date())+formatter2.format(sta.getEnd_date()));
+			}
 		}
 		return list;
 	}