清障队

VisualInspection/js/mytask/check.js

@@ -640,23 +640,24 @@ function showChangeUser() {
         changePersonLayer = showPopup4Common('更改人员', null, ['550px', '600px'], null, 'r', '确定');
         $("#user_container").empty();
         var userStr = "";
-        for (var i in data) {
-            var name = data[i].truename;
-            if (data[i].workno) name = name + " " + data[i].workno.substr(data[i].workno.length - 3);
-            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)">' +
-                '<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>' +
-                '</div>' +
-                '</a>' +
-                '</div>';
-            userStr += str;
-        }
-        $("#user_container").html(userStr);
+        // for (var i in data) {
+        //     var name = data[i].truename;
+        //     if (data[i].workno) name = name + " " + data[i].workno.substr(data[i].workno.length - 3);
+        //     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)">' +
+        //         '<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>' +
+        //         '</div>' +
+        //         '</a>' +
+        //         '</div>';
+        //     userStr += str;
+        // }
+        // $("#user_container").html(userStr);
+        // console.log($("#user_container").html());
     })
 }
 

VisualInspection/qzd/js/task/check.js

@@ -178,29 +178,39 @@ function getAreaCheckCount() {
     var index = layer.load(1, {
         shade: [0.1, '#fff'] //0.1透明度的白色背景
     });
+    //var html = '';
+    var userids = $.checkTask.checked_users.split(",");
+    var usernames =  $.checkTask.checked_users_name.split(",");
     var param = {
-        "period_id": $.checkTask.period_id,
-        "checked_users": $.checkTask.checked_users
-    };
-    post_common_service("/q/task/getall/0/0", param, function(userList) {
-        console.log(userList);
-        $("#checked_area").html($.checkTask.checked_users_name);
-        if (userList) {
-            $("#checked_count").html(userList.length);
-        } else {
-            $("#checked_count").html(0);
-        }
-    });
+                "period_id": $.checkTask.period_id,
+                "checked_users":$.checkTask.checked_users
+            };
+                            var url = base_server_url + "/q/task/getTasks/0/0";
+                            ajaxPost(url, param, function(response) {
+                                for(var i in userids){
+                                    console.log(response);
+                                        var html ='<label id="'+userids[i]+'"></label>'+ usernames[i]+'(次数:'+
+                                                      '<a href="javascript:void(0)" onclick="showCheckDetailCount(\''+userids[i]+'\')"><span class="label label-primary" id="">'+response[i].length+'</span></a>)';
+                                                      $("#checked_area").append(html);
+                            
+                                }
+                             }, function(error) {
+                                 if (fail)
+                                     fail("网络错误");
+                                 else
+                                     console.log("网络错误");
+                             });
+                            
 }
 
 
 
 //显示考核次数
-function showCheckDetailCount() {
+function showCheckDetailCount(id) {
     scoreDetailLayer = showPopup4Common('本周期已考核任务', null, ['450px', '350px'], '#checked_task_list_div', 'r', '确定');
     var param = {
         "period_id": $.checkTask.period_id,
-        "checked_users": $.checkTask.checked_users
+        "checked_users": id
     };
 
     var cols = [
@@ -280,6 +290,7 @@ function queryCheckScores() {
         { width: 100, text: '评分记录', type: 'string', flex: true, sort: 'down', field: 'content' },
         { width: 40, text: '分数', type: 'string', flex: true, colClass: '', field: 'check_item_score' },
         { width: 100, text: '备注', type: 'string', flex: true, colClass: '', field: 'remark' },
+        { width: 50, text: '考核人', type: 'string', flex: true, colClass: '', field: 'checked_area_name' },
 
         // {width: 80, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'},
         // {
@@ -331,7 +342,19 @@ function showEditCheckScore(id) {
     scoreDetailLayer = showPopup4Common('修改考核项', function(data) {
         saveScoreEdit();
     }, ['350px', '550px'], '#score-detail-div', 'r');
-
+    var list = new Array();
+    var userids = $.checkTask.checked_users.split(",");
+    var usernames =  $.checkTask.checked_users_name.split(",");
+    console.log(rowData);
+    var optStr = '';
+        for (var i in userids) {
+             if (userids[i] == rowData.checked_area)
+                 optStr += '<option value="' + userids[i] + '" selected="selected">' + usernames[i] + '</option>';
+             else
+                optStr += '<option value="' + userids[i] + '">' + usernames[i] + '</option>';
+        }
+        $("#check_checked_person_select").html('');
+        $("#check_checked_person_select").html(optStr);
     $("#score_id_text").val(rowData.id);
     $("#check_item_text").val(rowData.content);
     $("#check_score_text").val(rowData.check_item_score);
@@ -376,10 +399,11 @@ function saveScoreEdit() {
         'content': $("#check_item_text").val(),
         'check_item_score': $("#check_score_text").val(),
         'remark': $("#check_remark_text").val(),
-        'checked_person': $("#check_checked_person_select").val(),
+        'checked_area': $("#check_checked_person_select").val(),
     };
     editScoreId = null;
     $("#saveEditBtn").hide();
+    console.log(param);
     no_return_common_service("/q/score/update", param, function(data) {
         if (scoreLayer) layer.close(scoreLayer);
         //查询评分情况

VisualInspection/qzd/view/appeal_management/appeal_checked.html

@@ -63,7 +63,7 @@
         if (roleContains("STATION")) {
             checked_dept = getCurrentUser().organid;
         }
-        setSASelect("#fsList", checked_dept);
+        setWreckerGroupAllSelect("#fsList", checked_dept);
         if (roleContains("STATION")) {
             $("#fsList").attr('disabled', 'disabled');
         }

VisualInspection/qzd/view/appeal_management/appeal_submited.html

@@ -54,7 +54,7 @@
         if (roleContains("STATION")) {
             checked_dept = getCurrentUser().organid;
         }
-        setSASelect("#fsList", checked_dept);
+        setWreckerGroupAllSelect("#fsList", checked_dept);
         if (roleContains("STATION")) {
             $("#fsList").attr('disabled', 'disabled');
         }

VisualInspection/qzd/view/task/check.html

@@ -9,10 +9,11 @@
                 </div>
                 <div class="form-group col-sm-5" style="margin-bottom: 0px;">
                     <label class="col-sm-3">考核对象：</label>
-                    <div class="col-sm-9" style="bottom:-5px">
-                        <label id="checked_area"></label> (次数:
+                    <div id="checked_area" class="col-sm-9" style="bottom:-5px">
+                        <!-- <label id=""></label> (次数:
                         <a href="javascript:void(0)" onclick="showCheckDetailCount()"><span class="label label-primary" id="checked_count">-</span></a>)
-
+                        <label id=""></label> (次数:
+                        <a href="javascript:void(0)" onclick="showCheckDetailCount()"><span class="label label-primary" id="checked_count">-</span></a>) -->
                     </div>
                 </div>
             </div>

VisualInspection/qzd/view/task/scoreDetail.html

@@ -1,27 +1,34 @@
 <div class="container-fluid ">
-    <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 for="exampleInputAccount1" class="col-md-3">考核项</label>
-            <div class="col-md-9">
-                <input type="text" class="form-control" id="check_item_text" placeholder="">
+        <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 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>
-        <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 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>
-
-        <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 class="form-group">
+                <label class="col-md-3">考核人</label>
+                <div class="col-md-9">
+                    <select  class="chosen-select form-control col-md-12" id="check_checked_person_select">
+                    </select>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-12" id="score_remark_div"></div>
-        </div>
-    </form>
-</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 class="form-group">
+                <div class="col-md-12" id="score_remark_div"></div>
+            </div>
+        </form>
+    </div>
+    

VisualInspection/qzd/view/task/taskDetail.html

@@ -53,15 +53,15 @@
     </div>
     <div class="row" style="margin-top:5px;text-align:center">
         <div>
-            <button id="submitBtn" style="display:block" type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
-            <button id="confirmBtn" style="display:block" type="button" class="btn btn-warning" onclick="confirmCheck()">确认</button>
-            <button id="submitAppealBtn" style="display:block" type="button" class="btn btn-warning" onclick="submitCheck4Appeal()">复核提交</button>
-            <button id="confirmAppealBtn" style="display:block" type="button" class="btn btn-warning" onclick="confirmCheck4Appeal()">申诉结果确认</button>
-            <button id="appealBtn" style="display:block" type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
-            <button id="assignBtn" style="display:block" type="button" class="btn btn-danger" onclick="showAssign()">分配</button>
-            <button id="backBtn" style="display:block" type="button" class="btn btn-danger" onclick="back2Check()">退回重新稽查</button>
-            <button id="backAppealBtn" style="display:block" type="button" class="btn btn-danger" onclick="back2AppealCheck()">退回重新复查</button>
-            <button id="backConfirmBtn" style="display:block" type="button" class="btn btn-danger" onclick="back2Confirm()">退回重新确认</button>
+            <button id="submitBtn" style="display:none" type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
+            <button id="confirmBtn" style="display:none" type="button" class="btn btn-warning" onclick="confirmCheck()">确认</button>
+            <button id="submitAppealBtn" style="display:none" type="button" class="btn btn-warning" onclick="submitCheck4Appeal()">复核提交</button>
+            <button id="confirmAppealBtn" style="display:none" type="button" class="btn btn-warning" onclick="confirmCheck4Appeal()">申诉结果确认</button>
+            <button id="appealBtn" style="display:none" type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
+            <button id="assignBtn" style="display:none" type="button" class="btn btn-danger" onclick="showAssign()">分配</button>
+            <button id="backBtn" style="display:none" type="button" class="btn btn-danger" onclick="back2Check()">退回重新稽查</button>
+            <button id="backAppealBtn" style="display:none" type="button" class="btn btn-danger" onclick="back2AppealCheck()">退回重新复查</button>
+            <button id="backConfirmBtn" style="display:none" type="button" class="btn btn-danger" onclick="back2Confirm()">退回重新确认</button>
         </div>
     </div>
 </div>
@@ -195,7 +195,7 @@
             field: 'check_item_score'
         }, {
             width: 80,
-            text: '区域',
+            text: '考核人',
             type: 'string',
             flex: true,
             colClass: '',

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/CheckAppealController_Q.java

@@ -158,4 +158,8 @@ public class CheckAppealController_Q extends BaseController {
         if(taskList==null) return super.returnSuccessResult(new PageInfo(new ArrayList()));
         return super.returnSuccessResult(taskList);
     }
+
+
 }
+
+

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/TaskController_Q.java

@@ -145,4 +145,26 @@ public class TaskController_Q extends BaseController {
         return super.returnSuccessResult("修改成功");
     }
 
+    @RequestMapping(value = "/getTasks/{page}/{size}")
+    public List getTasks(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody QzdCheckTask qzdCheckTask) {
+        User user = getCurrentUser(request);
+        if (AuthorUtil.hasRole(user, Constants.ROLE_FWQ_ADMIN)
+                || AuthorUtil.hasRole(user, Constants.ROLE_FWQ)
+                || AuthorUtil.containsRole(user, "ROLE_FWQ")) {
+            qzdCheckTask.setChecked_dept((long) user.getOrganid());
+        } else if (AuthorUtil.hasRole(user, Constants.ROLE_JICHA)) {
+            qzdCheckTask.setCheckman(new Long(user.getId()));
+        }
+        String checkedUsers[]   = qzdCheckTask.getChecked_users().split(",");
+        List objlist = new ArrayList();
+        String jsonObject ="";
+        for(int i = 0;i<checkedUsers.length;i++) {
+            qzdCheckTask.setChecked_users("%"+checkedUsers[i]+"%");
+            Object ss = taskService_q.getAllTask(page, size, qzdCheckTask);
+            objlist.add(ss);
+            //String json = super.returnSuccessResult(ss);
+            //jsonObject = jsonObject + json;
+        }
+        return objlist;
+    }
 }

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/ScoreServiceImpl.java

@@ -3,6 +3,8 @@ package com.xintong.visualinspection.visuallnspection_qzd.service.impl;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.xintong.visualinspection.bean.FwqScore;
 import com.xintong.visualinspection.bean.Item;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.service.ItemService;
 import com.xintong.visualinspection.service.ScoreService_Q;
 import com.xintong.visualinspection.visuallnspection_qzd.bean.Log;
@@ -42,6 +44,12 @@ public class ScoreServiceImpl  implements ScoreService_Q {
             registry = "${dubbo.registry.address}")
     private ItemService itemService;
 
+	@Reference(version = "1.0.0",
+			application = "${dubbo.application.id}",
+			registry = "${dubbo.registry.address}")
+	private CommonService commonService;
+
+
 	@Override
 	public List<FwqScore> getAll() {
 		// TODO Auto-generated method stub
@@ -59,6 +67,7 @@ public class ScoreServiceImpl  implements ScoreService_Q {
 		// TODO Auto-generated method stub
 		List<FwqScore> scoreList = scoreDao.getScoreList(score);
         List<Item> items = itemService.getAll();
+		Map<Long, User> userMap = commonService.getUserMap();
         for (FwqScore s:scoreList
                 ) {
             for (Item i:items
@@ -69,6 +78,9 @@ public class ScoreServiceImpl  implements ScoreService_Q {
                 }
 
             }
+            if(s.getChecked_area() != null){
+				s.setChecked_area_name(userMap.get(s.getChecked_area()).getTruename());
+			}
 
         }
 		return scoreList;