更新

VisualInspection/js/mytask/check.js

@@ -663,6 +663,7 @@ function showChangeUser() {
 }
 
 function changePerson(id) {
+    console.log(id);
     layer.confirm('是否要更改考核人？', {
         btn: ['是', '否'], //按钮
         shadeClose: true,
@@ -674,10 +675,9 @@ function changePerson(id) {
         var param = {
             "id": $.checkTask.id,
             "checked_person": id,
-            "class_type": $.checkTask.class_type
         };
         post_common_service("/task/getUserCount/", param, function(data) {
-            if (data && data.length >= 2) {
+            if (data.length >= 3) {
                 layer.msg("本周期稽查次数已满，不能再被稽查！", {
                     time: 2000, //20s后自动关闭
                     offset: 'r'
@@ -769,7 +769,6 @@ function resetUserImgInfo() {
 }
 
 function changePersonContent(data) {
-    console.log(date);
     resetUserImgInfo();
     var name = data.truename;
     if (data.workno) name = data.workno + " " + data.truename;

VisualInspection/js/statistics/check_workload_statistics.js

@@ -102,6 +102,7 @@ $(function() {
             { width: 60, height: 60, text: '考核类型', flex: true, colClass: 'text-center', field: 'parent_name' },
             { width: 60, height: 60, text: '考核提交时间', flex: true, colClass: 'text-center', field: 'update_time' },
             { width: 100, height: 60, text: '考核项', flex: true, colClass: 'text-center', field: 'name' },
+            { width: 200, height: 60, text: '考核结果', flex: true, colClass: 'text-center', field: 'start_score' },
             { width: 200, height: 60, text: '扣分凭证', type: 'imagedd', flex: true, field: 'pics' },
         ];
         if (cur_status == 12 || cur_status == 13) {

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

@@ -1449,7 +1449,6 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 	@Override
 	public List<StatisticsBean> getOneCheckedDetailInfo(StatisticsBean 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());
@@ -1482,6 +1481,32 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 				}
 			}
 		}
+        for(StatisticsBean bean:list){
+			String timeText = "";
+			if(bean.getPics() != null && bean.getPics() != ""){
+				if(bean.getPics().split("_").length > 1){
+					String[] array = bean.getPics().split("\\.");
+					String fileurl = bean.getPics().split("\\.")[0];
+					String time = fileurl.split("_")[1];
+					long timetemp = Long.valueOf(time);
+					SimpleDateFormat format =  new SimpleDateFormat("MM月dd日 HH:mm"); //设置格式
+					timeText=format.format(timetemp);
+				}
+//				SimpleDateFormat format =  new SimpleDateFormat("MM月dd日 HH:mm");
+//				timeText = format.format(bean.getStart_date());
+			}else{
+				SimpleDateFormat format =  new SimpleDateFormat("MM月dd日 HH:mm");
+				timeText = format.format(bean.getStart_date());
+			}
+        	if(bean.getName().substring(bean.getName().length()-1).equals("分")){
+				timeText  = timeText + bean.getCheck_task_name().split("站")[1]+bean.getName();
+			}else{
+				timeText  = timeText + bean.getCheck_task_name().split("站")[1]+bean.getName()+"扣"+bean.getScore()+"分";
+			}
+        	bean.setStart_score(timeText);
+		}
+
+
 		return list;
 	}