修改bug

VisualInspection/js/main.js

@@ -191,7 +191,26 @@ function redirectPage(url) {
     var pre_param = $.zui.store.set('store_param_'+url, null);
     changePage(url);
 }
-
+//跳转到最新打开的菜单，并保存上次的请求参数
+function redirectLastPage(){
+    var currentpage = $.zui.store.get("currentpage");
+    if (typeof (MENU) != "undefined" && MENU != null) {
+        for (var i = 0; i < MENU.length; i++) {
+            var menu = MENU[i];
+            if (menu.childs.length > 0) {
+                for (var j = 0; j < menu.childs.length; j++) {
+                    var mtemp = menu.childs[j];
+                    if (mtemp.id == currentpage) {
+                        if (typeof (mtemp.url) != "undefined") {
+                            changePage(mtemp.url);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+     }
+}
 function GetQueryString(url)
 {
      var theRequest = new Object();

VisualInspection/js/mytask/check.js

@@ -62,6 +62,7 @@ function initCheck() {
         } else {
             callFunc("showvideoview", "false");
             layer.msg('该处暂无视屏！', {
+                offset: 'r',
                 time: 2000, //20s后自动关闭
             });
             callFunc("stop", "");
@@ -203,6 +204,7 @@ function checkUserCount() {
     post_common_service("/task/getUserCount/", param, function(data) {
         if (data >= 2) {
             layer.msg("本周期稽查次数已满，不能再被稽查！", {
+                offset: 'r',
                 time: 2000 //20s后自动关闭
             });
             return false;
@@ -414,6 +416,7 @@ function saveEdit() {
             //查询评分情况
             queryCheckScores();
             layer.msg(data, {
+                offset: 'r',
                 time: 2000 //20s后自动关闭
             });
         });
@@ -565,12 +568,13 @@ function changePerson(id) {
                 "checked_person": id,
             }
             post_common_service("task/update/", param1, function(task_data) {
+                checkHasScore(id,$.checkTask.checked_person);
                 //重置当前任务
                 $.checkTask = task_data;
                 //获取用户信息
                 get_common_service('user/getUserById/' + id, null, function(data) {
-                        changePersonContent(data);
-                    })
+                    changePersonContent(data);                  
+                })
                     //更新用户次数表
                 no_return_common_service('task/updateUserCount/', param, function(data) {
                     // changePersonContent(data);
@@ -583,6 +587,37 @@ function changePerson(id) {
     });
 }
 
+function checkHasScore(id,old_person){
+    var param = {
+        "task_id": $.checkTask.id,
+        "checked_person":old_person
+    };
+    post_common_service("/score/getScoreList/1/10", param, function(data) {
+        if(data.list && data.list.length>0){
+            layer.confirm('是否要同步更改扣分人？', {
+                btn: ['是','否'],//按钮
+                shadeClose: true,
+                shade: 0 ,//不显示遮罩
+                offset:'r'
+            }, function(){
+                var param = {
+                    "task_id": $.checkTask.id,
+                    "checked_person":old_person,
+                    "new_checked_person":id
+                };
+                post_common_service("/score/updateByTaskIdAndPerson/", param, function(data) {
+                    layer.msg('更改成功！', {
+                        offset: 'r',
+                        time: 2000, //20s后自动关闭
+                    });
+                    queryCheckScores();
+                });
+            }, function(){
+
+            });
+        }
+    });
+}
 function showBigImg(src) {
     $('#userBigImg').attr("src", src);
     layer.open({
@@ -755,6 +790,7 @@ function zTreeOnClick(event, treeId, treeNode) {
         //查询评分情况
         queryCheckScores();
         layer.msg(data, {
+            offset: 'r',
             time: 2000 //20s后自动关闭
         });
     });
@@ -768,11 +804,12 @@ function submitCheck() {
     }
     no_return_common_service("/task/taskEnd/", param, function(data) {
         layer.msg("提交成功", {
+            offset: 'r',
             time: 2000 //20s后自动关闭
         });
-        var currentpage = $.zui.store.get("currentpage");
-        getPageInfo(currentpage);
-        // changePage("/view/mytask/task_list.html?status=2");
+        // var currentpage = $.zui.store.get("currentpage");
+        // getPageInfo(currentpage);
+        redirectLastPage();
     });
 
 }
@@ -821,11 +858,10 @@ function submitCheck4AppealResult(appeal_result){
     }
     no_return_common_service("/task/taskEnd/", param, function(data) {
         layer.msg("提交成功", {
+            offset: 'r',
             time: 2000 //20s后自动关闭
         });
-        var currentpage = $.zui.store.get("currentpage");
-        getPageInfo(currentpage);
-        // changePage("/view/appeal_management/appeal_list.html?status=12");
+        redirectLastPage();
     });
 }
 function showPre4Appeal(id) {
@@ -842,11 +878,10 @@ function saveValidReason() {
     }
     no_return_common_service("/checkApply/add/", param, function(data) {
         layer.msg("申请提交成功", {
+            offset: 'r',
             time: 2000 //20s后自动关闭
         });
-        var currentpage = $.zui.store.get("currentpage");
-        getPageInfo(currentpage);
-        // changePage("/view/mytask/task_list.html?status=2");
+        redirectLastPage();
     });
 }
 

VisualInspection/js/util/util.js

@@ -561,6 +561,10 @@ function getServerTime(){
     get_common_service("/comm/getTime", "", function(data){
         nowStr=data;
         gettime();
+    },
+    function(data){
+        nowStr=moment().format('YYYY-MM-DD HH:mm:ss');
+        gettime();
     });
 }
 function gettime(){

VisualInspection/view/appeal_management/appealDetail.html

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

VisualInspection/view/mytask/taskDetail.html

@@ -294,9 +294,7 @@
              layer.msg("提交成功", {
                 time: 2000//20s后自动关闭
              });
-            var currentpage = $.zui.store.get("currentpage");
-            getPageInfo(currentpage);
-            // changePage("/view/mytask/task_list.html?status=2");
+           redirectLastPage();
         });
         
     }
@@ -325,9 +323,7 @@
             layer.msg("提交成功", {
                 time: 2000//20s后自动关闭
             });
-            var currentpage = $.zui.store.get("currentpage");
-            getPageInfo(currentpage);
-            // changePage("/view/appeal_management/appeal_list.html?status=13");
+            redirectLastPage();
         });
     }
     var appealLayer;
@@ -363,9 +359,7 @@
                 layer.msg("确认成功", {
                     time: 2000//20s后自动关闭
                 });
-                var currentpage = $.zui.store.get("currentpage");
-                getPageInfo(currentpage);
-                // changePage("/view/mytask/task_list.html?status=5");
+                redirectLastPage();
             });
         }, function(index){
             layer.close(index);
@@ -386,9 +380,7 @@
                 layer.msg("确认成功", {
                     time: 2000//20s后自动关闭
                 });
-                var currentpage = $.zui.store.get("currentpage");
-                getPageInfo(currentpage);
-                // changePage("/view/mytask/task_list.html?status=5");
+                redirectLastPage();
             });
         }, function(index){
             layer.close(index);
@@ -423,9 +415,7 @@
              layer.msg("分配成功", {
                 time: 2000//20s后自动关闭
              });
-            var currentpage = $.zui.store.get("currentpage");
-            getPageInfo(currentpage);
-            // changePage("/view/mytask/task_list.html?status=11");
+            redirectLastPage();
         });
     }
 
@@ -440,9 +430,7 @@
              layer.msg("退回成功", {
                 time: 2000//20s后自动关闭
              });
-            var currentpage = $.zui.store.get("currentpage");
-            getPageInfo(currentpage);
-            // changePage("/view/mytask/task_list.html?status=4");
+            redirectLastPage();
         });
     }
     function back2Confirm(){
@@ -456,9 +444,7 @@
              layer.msg("退回成功", {
                 time: 2000//20s后自动关闭
              });
-            var currentpage = $.zui.store.get("currentpage");
-            getPageInfo(currentpage);
-            // changePage("/view/mytask/task_list.html?status=6");
+            redirectLastPage();
         });
     }
 
@@ -473,9 +459,7 @@
              layer.msg("退回成功", {
                 time: 2000//20s后自动关闭
              });
-            var currentpage = $.zui.store.get("currentpage");
-            getPageInfo(currentpage);
-            // changePage("/view/mytask/task_list.html?status=4");
+            redirectLastPage();
         });
     }
     </script>

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

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

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

@@ -115,4 +115,23 @@ public class ScoreController extends BaseController {
     	List<Score> scoreList =  scoreService.getTopRemarkList(param);
     	return super.returnSuccessResult(scoreList);
     }
+    
+    /**
+     * 修改旧的考核人到新的考核人扣分项
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/updateByTaskIdAndPerson")
+    public String updateByTaskIdAndPerson(@Valid @RequestBody Score score){
+    	if(score.getChecked_person()==null || score.getNew_checked_person()==null){
+    		throw new BusinessException(21301);
+    	}
+    	if(score.getTask_id()==null){
+    		throw new BusinessException(21302);
+    	}
+    	scoreService.updateByTaskIdAndPerson(score);
+    	return super.returnSuccessResult("修改成功");
+    }
 }

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

@@ -19,6 +19,7 @@ public interface ScoreDao  {
     public List<Score> getScoreListByTaskId(Long task_id);
     public void insert(Score score);
     public void update(Score score);
+    public void updateByTaskIdAndPerson(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/ScoreMapper.xml

@@ -71,6 +71,16 @@
         id = #{id}
     </update>
 
+	<update id="updateByTaskIdAndPerson" parameterType="com.xintong.visualinspection.bean.Score" >
+        UPDATE
+        	check_score
+        SET
+        	checked_person = #{new_checked_person}
+        WHERE
+        	  task_id = #{task_id}
+          and checked_person=#{checked_person}
+    </update>
+    
     <delete id="delete" parameterType="java.lang.Long" >
         DELETE FROM
         check_score

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

@@ -25,6 +25,7 @@ public interface ScoreService {
     public List<Score> getScoreListByTaskId(Long task_id);
     public void insert(Score score);
     public void update(Score score);
+    public void updateByTaskIdAndPerson(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/ScoreServiceImpl.java

@@ -79,4 +79,10 @@ public class ScoreServiceImpl extends BaseService implements ScoreService {
 		// TODO Auto-generated method stub
 		return scoreDao.getTopRemarkList(param);
 	}
+
+	@Override
+	public void updateByTaskIdAndPerson(Score score) {
+		// TODO Auto-generated method stub
+		scoreDao.updateByTaskIdAndPerson(score);
+	}
 }

VisualInspection_server/src/main/resources/errcode.properties

@@ -41,7 +41,8 @@
 #\u4efb\u52a1\u7ba1\u7406\u9519\u8bef
 21201=\u5df2\u63d0\u4ea4\u65e0\u6548\u7533\u8bf7\uff0c\u4e0d\u80fd\u91cd\u590d\u63d0\u4ea4
 #\u6263\u5206\u7ba1\u7406\u9519\u8bef
-21301=
+21301=\u8003\u6838\u4eba\u4e0d\u80fd\u4e3a\u7a7a
+21302=\u4efb\u52a1\u7f16\u53f7\u4e0d\u80fd\u4e3a\u7a7a
 #\u7533\u8bc9\u7ba1\u7406\u9519\u8bef
 21401=\u5df2\u63d0\u4ea4\u7533\u8bc9\uff0c\u4e0d\u80fd\u91cd\u590d\u63d0\u4ea4