修改无效任务确认后，删除此条用户次数记录

VisualInspection/js/lib/mytable.js

@@ -141,7 +141,7 @@
                         var oper = cols[i].oper;
                         var operStr="";
                         for(var j=0;j<oper.length;j++){
-                            operStr+='&nbsp;<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+','+obj[cols[i].field_other]+')"><i class="icon '+oper[j].icon_class+'"></i>&nbsp;'+oper[j].text+' </a>&nbsp;';
+                            operStr+='<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+','+obj[cols[i].field_other]+')"><i class="icon '+oper[j].icon_class+'"></i>&nbsp;'+oper[j].text+' </a>&nbsp;';
                         }
                         dArr.push(operStr);
                     }else{

VisualInspection/js/mytask/check.js

@@ -206,14 +206,17 @@ function queryCheckScores() {
     }
     // alert("ff");
     var cols = [
-        { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 40, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
         { width: 160, text: '评分记录', type: 'string', flex: true, sort: 'down', field: 'content' },
-        { width: 80, text: '分数', type: 'string', flex: true, colClass: '', field: 'check_item_score' },
+        { width: 50, text: '分数', type: 'string', flex: true, colClass: '', field: 'check_item_score' },
+        { width: 100, text: '备注', type: 'string', flex: true, colClass: '', field: 'remark' },
+        { width: 55, text: '考核人', type: 'string', flex: true, colClass: '', field: 'checked_person_name' },
         // {width: 80, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'},
         {
-            width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+            width: 110, text: '操作', type: 'string', flex: true, field: 'id',
             oper: [
                 { func: 'showEditCheckScore', text: '修改', icon_class: 'icon-edit' },
+                { func: 'showEditPic', text: '修改图片', icon_class: 'icon-edit' },
                 { func: 'deleteCheckScore', text: '删除', icon_class: 'icon-remove-circle' }
             ]
         }
@@ -229,16 +232,44 @@ function queryCheckScores() {
     }
     );
 }
-function showEditCheckScore(id) {
-    // deleteItem4Common(id,"/score/delete/",queryCheckScores);
+function showEditPic(){
     var rowData = getItemByIdFromArr(id, $('#score_datatable').mytable('getTableData'));
-    // scoreDetailLayer = showPopup4Common('修改考核项',null,['600px','500px'],'#score-detail-div');
-    // var rowData=getItemByIdFromArr(id,$('#score_datatable').mytable('getTableData'));
     showPics(rowData.pics);
-    // $("#scoreContent").val(rowData.content);
     $("#saveEditBtn").show();
     editScoreId = id;
 }
+function showEditCheckScore(id) {
+    // deleteItem4Common(id,"/score/delete/",queryCheckScores);
+    var rowData = getItemByIdFromArr(id, $('#score_datatable').mytable('getTableData'));
+    scoreDetailLayer = showPopup4Common('修改考核项',function(data){
+       saveScoreEdit();
+    },['350px','400px'],'#score-detail-div','r');
+    
+    $("#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);
+    setTeamUserSelect("#check_checked_person_select",rowData.checked_person,$.checkTask.user_class_id);
+}
+function saveScoreEdit(){
+    var param = {
+        'id': $("#score_id_text").val(),
+        'content': $("#check_item_text").val(),
+        'check_item_score': $("#check_score_text").val(),
+        'remark': $("#check_remark_text").val(),
+        'checked_person': $("#check_checked_person_select").val(),
+    };
+    editScoreId = null;
+    $("#saveEditBtn").hide();
+    no_return_common_service("/score/update", param, function (data) {
+        if (scoreLayer) layer.close(scoreLayer);
+        //查询评分情况
+        queryCheckScores();
+        // layer.msg(data, {
+        //     time: 2000//20s后自动关闭
+        // });
+    });
+}
 var editScoreId;
 function saveEdit() {
     if (editScoreId) {
@@ -360,8 +391,8 @@ function showChangeUser() {
             var pic = "../../images/body-bg.png";
             if (data[i].pic) pic = base_image_server_url + data[i].pic;
             str = '<div style="width:90px;float:left;margin:5px;">'
-                + '<a class="card" href="javascript:void(0)" onclick="showBigImg(\'' + pic + '\')">'
-                + '<img src="' + pic + '" alt="" style="height:100px;width:90px;">'
+                + '<a class="card" href="javascript:void(0)">'
+                + '<img src="' + pic + '" alt="" style="height:100px;width:90px;" onclick="showBigImg(\'' + pic + '\')">'
                 + '<div class="card-heading"><strong>' + name + '</strong></div>'
                 + '<div class="card-actions">'
                 + '<button type="button" class="btn btn-mini btn-danger" onclick="changePerson(\'' + data[i].id + '\')">选择</button>'
@@ -380,10 +411,17 @@ function changePerson(id) {
         "id": $.checkTask.id,
         "checked_person": id,
     }
-    no_return_common_service("task/update/", param, function (data) {
+    post_common_service("task/update/", param, function (task_data) {
+        //重置当前任务
+        $.checkTask = task_data;
+        //获取用户信息
         get_common_service('user/getUserById/' + id, null, function (data) {
             changePersonContent(data);
         })
+        //更新用户次数表
+        no_return_common_service('task/updateUserCount/', param, function (data) {
+            // changePersonContent(data);
+        })
         layer.close(changePersonLayer);
     }, function (error) {
         alert(error);
@@ -528,35 +566,57 @@ function genNode(m) {
 }
 
 function zTreeOnClick(event, treeId, treeNode) {
-    //alert(treeNode.name);
-    var imgArr = $("#img_container .pic-class");
-    var picsStr = "";
-    if (imgArr && imgArr.length > 0) {
-        for (var i = 0; i < imgArr.length; i++) {
-            picsStr += $(imgArr[i]).attr("path") + ","
+    if(isEdit){
+        var imgArr = $("#img_container .pic-class");
+        var picsStr = "";
+        if (imgArr && imgArr.length > 0) {
+            for (var i = 0; i < imgArr.length; i++) {
+                picsStr += $(imgArr[i]).attr("path") + ","
+            }
+            picsStr = picsStr.substr(0, picsStr.length - 1);
         }
-        picsStr = picsStr.substr(0, picsStr.length - 1);
-    }
-    var param = {
-        'task_id': $.checkTask.id,
-        'pics': picsStr,
-        'name': treeNode.value,
-        'check_item_score': treeNode.score,
-        'content': treeNode.value,
-        'check_item_id': treeNode.id,
-        'checkman': treeNode.id,
-        'checked_person': $.checkTask.checked_person,
-        'checked_dept': $.checkTask.checked_dept
-    };
-    no_return_common_service("/score/add", param, function (data) {
-        if (scoreLayer) layer.close(scoreLayer);
-        clearAllImg();
-        //查询评分情况
-        queryCheckScores();
-        layer.msg(data, {
-            time: 2000//20s后自动关闭
+        var param = {
+            'task_id': $.checkTask.id,
+            'pics': picsStr,
+            'name': treeNode.value,
+            'check_item_score': treeNode.score,
+            'content': treeNode.value,
+            'check_item_id': treeNode.id,
+            'checkman': treeNode.id,
+            'checked_person': $.checkTask.checked_person,
+            'checked_dept': $.checkTask.checked_dept
+        };
+        no_return_common_service("/score/add", param, function (data) {
+            if (scoreLayer) layer.close(scoreLayer);
+            clearAllImg();
+            //查询评分情况
+            queryCheckScores();
+            layer.msg(data, {
+                time: 2000//20s后自动关闭
+            });
         });
-    });
+    }else{
+         var param = {
+            'task_id': $.checkTask.id,
+            'pics': picsStr,
+            'name': treeNode.value,
+            'check_item_score': treeNode.score,
+            'content': treeNode.value,
+            'check_item_id': treeNode.id,
+            'checkman': treeNode.id,
+            'checked_person': $.checkTask.checked_person,
+            'checked_dept': $.checkTask.checked_dept
+        };
+        no_return_common_service("/score/add", param, function (data) {
+            if (scoreLayer) layer.close(scoreLayer);
+            clearAllImg();
+            //查询评分情况
+            queryCheckScores();
+            layer.msg(data, {
+                time: 2000//20s后自动关闭
+            });
+        });
+    }
 }
 
 function submitCheck() {

VisualInspection/js/util/util.js

@@ -377,3 +377,18 @@ function showClientImg(src){
 function downloadClientfile(src){
     callFunc("downloadfile", src);
 }
+
+function setTeamUserSelect(div,selectId,classId){
+   post_common_service("/team/getTeamPersonsByUserClassId/"+classId,null,function(data){
+        var optStr = '';
+        for(var i in data) {
+            if(data[i].positionid==4) data[i].truename=data[i].truename+'(班长)';
+            if(data[i].id==selectId)
+                optStr += '<option value="'+data[i].id+'" selected="selected">'+data[i].truename+'</option>';
+            else
+                optStr += '<option value="'+data[i].id+'">'+data[i].truename+'</option>';
+        }
+        $(div).html('');
+        $(div).html(optStr);
+    });
+}

VisualInspection/view/mytask/scoreDetail.html

@@ -1,19 +1,30 @@
 <div class="container-fluid ">
-    <div class="cards">
+    <form class="form-horizontal" style="margin-top:10px;">
+        <input type="hidden" class="form-control" id="score_id_text" disabled="disabled" placeholder="">
         <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="content" placeholder="">
+            <label for="exampleInputAccount1" class="col-md-3">考核项</label>
+            <div class="col-md-9">
+                <input type="text" class="form-control" id="check_item_text" placeholder="">
             </div>
         </div>
-        <div id="img_edit_container" class="cards cards-borderless col-sm-11">
+        <div class="form-group">
+            <label for="exampleInputAccount1" class="col-md-3">分数</label>
+            <div class="col-md-9">
+                <input type="text" class="form-control" id="check_score_text"  placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-3">考核人</label>
+            <div class="col-md-9">
+                <select class="form-control" id="check_checked_person_select">
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-3">备注</label>
+            <div class="col-md-9">
+                <textarea class="form-control" id="check_remark_text"  placeholder=""/>
+            </div>
         </div>
-    </div>
-    <div>
-        <br>
-        <button class="btn btn-primary" type="button" onclick="clearAllImg()">清空</button>
-        <br>
-        <br>
-        <button class="btn btn-primary" type="button"  onclick="showScore()">评分</button>
-    </div>
+    </form>
 </div>

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

@@ -38,6 +38,8 @@ public class Score {
     private String checkman;
     //被考核人员id
     private Long checked_person;
+    //被考核人员名称
+    private String checked_person_name;
     //被考核部门
     private Long checked_dept;
     //备注

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

@@ -100,6 +100,8 @@ public class CheckApplyController extends BaseController {
     	task.setCheck_status(check_status);
     	task.setUpdate_user(new Long(user.getId()));
     	taskService.update(task);
+    	//删除此任务的用户稽查次数
+    	taskService.deleteInvalidTaskCount(checkAppeal.getTask_id());
     	return super.returnSuccessResult("同意成功");
     }
     
@@ -128,6 +130,9 @@ public class CheckApplyController extends BaseController {
     		task.setCheck_status(check_status);
     		task.setUpdate_user(new Long(user.getId()));
     		taskService.update(task);
+    		
+    		//删除此任务的用户稽查次数
+        	taskService.deleteInvalidTaskCount(ca.getTask_id());
     	}
     	return super.returnSuccessResult("同意成功");
     }

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

@@ -65,7 +65,8 @@ public class TaskController extends BaseController {
     	User user = getCurrentUser(request);
     	task.setUpdate_user(new Long(user.getId()));
     	taskService.update(task);
-    	return super.returnSuccessResult("修改成功");
+    	Task t = taskService.getById(task.getId());
+    	return super.returnSuccessResult("修改成功",t);
     }
     
     @RequestMapping(value = "/taskEnd")
@@ -221,4 +222,35 @@ public class TaskController extends BaseController {
     	List<TaskStatus> tList = taskService.getTaskStatusList(task.getId());
     	return super.returnSuccessResult(tList);
     }
+    /**
+     * 删除用户被考核次数
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/deleteUserCount")
+    public String deleteUserCount(@RequestBody Task task){
+    	if(task.getId()==null){
+    		throw new BusinessException(20002);
+    	}
+    	taskService.deleteInvalidTaskCount(task.getId());
+    	return super.returnSuccessResult("删除成功！");
+    }
+    
+    /**
+     * 更新用户被考核次数
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/updateUserCount")
+    public String updateUserCount(@RequestBody Task task){
+    	if(task.getId()==null){
+    		throw new BusinessException(20002);
+    	}
+    	taskService.updateInvalidTaskCount(task);;
+    	return super.returnSuccessResult("修改成功！");
+    }
 }

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

@@ -101,6 +101,20 @@ public class TeamController extends BaseController {
     }
     
     /**
+     * 根据team_id 获取班组详情
+     * @param team
+     * @return
+     */
+    @RequestMapping(value = "/getTeamPersonsByUserClassId/{user_calss_id}")
+    public String getTeamPersonsByUserClassId(@PathVariable Long user_calss_id){
+    	if(user_calss_id==null){
+    		throw new BusinessException(20002);
+    	}
+    	List<User> userList= teamService.getTeamPersonByUserClassid(user_calss_id);
+    	return super.returnSuccessResult(userList);
+    }
+    
+    /**
      * 通过部门id获取班组
      * @return
      * String

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

@@ -27,4 +27,6 @@ public interface TaskDao  {
     public void dispatch(Task task);
     public void dispatchById(Task task);
     public void insertStatusBatch(List<TaskStatus> taskStatusList);
+    public void deleteInvalidTaskCount(Long task_id);
+    public void updateInvalidTaskCount(Task task);
 }

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

@@ -20,4 +20,5 @@ public interface TeamDao  {
     public void delete(Long id);
 	public List<Team> getTeamByName(Team team);
 	public List<Team> getList(Team obj);
+	public Team getTeamByUserClassid(Long id);
 }

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

@@ -236,4 +236,17 @@
         WHERE
         id =#{id}
     </delete>
+    <delete id="deleteInvalidTaskCount" parameterType="java.lang.Long" >
+        DELETE FROM
+        	check_user_count
+        WHERE
+        	task_id =#{id}
+    </delete>
+    <update id="updateInvalidTaskCount" parameterType="com.xintong.visualinspection.bean.Task" >
+        UPDATE
+        	check_user_count
+        SET
+	        <if test="checked_person != null">user_id = #{checked_person}</if>
+        WHERE task_id=#{id}
+    </update>
 </mapper>

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

@@ -25,7 +25,11 @@
         WHERE dept_id = #{dept_id}
     </select>
     
-    
+    <select id="getTeamByUserClassid" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+        SELECT *
+        FROM sys_team
+        WHERE id = (select uc.team_id from sys_user_class uc where uc.id=#{id})
+    </select>
     <select id="getList" parameterType="java.lang.Long" resultMap="BaseResultMap" >
         SELECT *
         FROM sys_team

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

@@ -30,4 +30,5 @@ public interface TaskService {
     public void insertStatus(TaskStatus taskStatus);
     public void insertStatusBatch(List<TaskStatus> taskStatusList);
     public void deleteInvalidTaskCount(Long task_id);
+    public void updateInvalidTaskCount(Task task);
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Team;
+import com.xintong.visualinspection.bean.User;
 
 /**
  * 
@@ -27,4 +28,5 @@ public interface TeamService {
     public void delete(Long id);
     public List<Team> getTeamByName(Team team);
     public Team getDetailsById(Team team);
+    public List<User> getTeamPersonByUserClassid(Long id);
 }

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

@@ -11,6 +11,7 @@ import com.xintong.visualinspection.bean.Score;
 import com.xintong.visualinspection.dao.master.ScoreDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.ScoreService;
+import com.xintong.visualinspection.util.CacheUtil;
 
 /**
  * 文件名：ScoreServiceImpl
@@ -40,7 +41,11 @@ public class ScoreServiceImpl extends BaseService implements ScoreService {
 	@Override
 	public List<Score> getScoreList(Score score) {
 		// TODO Auto-generated method stub
-		return scoreDao.getScoreList(score);
+		List<Score> scoreList = scoreDao.getScoreList(score);
+		for(Score s:scoreList) {
+			s.setChecked_person_name(CacheUtil.getUserTurenameFromMap(s.getChecked_person()));
+		}
+		return scoreList;
 	}
 
 	@Override

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

@@ -39,7 +39,20 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 	@Override
 	public Task getById(Long id) {
 		// TODO Auto-generated method stub
-		return taskDao.getOne(id);
+		Task t = taskDao.getOne(id);
+		if(t.getCheckman() != null){
+			t.setCheckman_name(CacheUtil.getUserTurenameFromMap(t.getCheckman()));
+		}
+		if(t.getChecked_person() != null){
+			t.setChecked_person_name(CacheUtil.getUserTurenameFromMap(t.getChecked_person()));
+		}
+		if(t.getChecked_dept() != null){
+			if(CacheUtil.deptMap.get(t.getChecked_dept())!=null){
+				t.setChecked_dept_name(CacheUtil.getOrgannameFromMap(t.getChecked_dept()));
+			}
+		}
+		t.setRecheckman_name(CacheUtil.getUserTurenameFromMap(t.getRecheckman()));
+		return t;
 	}
 
 
@@ -157,6 +170,12 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 	@Override
 	public void deleteInvalidTaskCount(Long task_id) {
 		// TODO Auto-generated method stub
-		
+		taskDao.deleteInvalidTaskCount(task_id);
+	}
+
+	@Override
+	public void updateInvalidTaskCount(Task task) {
+		// TODO Auto-generated method stub
+		taskDao.updateInvalidTaskCount(task);
 	}
 }

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

@@ -1,13 +1,15 @@
 package com.xintong.visualinspection.service.impl;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.druid.util.StringUtils;
 import com.xintong.visualinspection.bean.Team;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.master.TeamDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.TeamService;
@@ -132,4 +134,27 @@ public class TeamServiceImpl extends BaseService implements TeamService {
 		}
 		return team;
 	}
+
+
+	@Override
+	public List<User> getTeamPersonByUserClassid(Long id) {
+		Team team = teamDao.getTeamByUserClassid(id);
+		List<User> userList = new ArrayList<User>();
+		if(team!=null) {
+			String user_ids = team.getUser_ids();
+			String[] userArr = user_ids.split(",");
+			for(String user:userArr) {
+				if(!StringUtils.isEmpty(user)){
+					User u = CacheUtil.getUserFromMap(Long.parseLong(user));
+					if(u!=null){
+						if(user.equals(team.getMonitor()+"")){
+							u.setPositionid(4);//收费班长，参考职位表
+						}
+						userList.add(u);
+					}
+				}
+			}
+		}
+		return userList;
+	}
 }