修改bug

VisualInspection/js/appeal_management/appeal_list.js

@@ -79,7 +79,7 @@ function queryAppeal(){
             {width: 80, text: '稽查人员', type: 'string', flex: true, hide:hide,field:'checkman_name'},
             {width: 80, text: '复核人员', type: 'string', flex: true, hide:hide,field:'recheckman_name'},
             {width: 120, text: '稽查时间段', type: 'string', flex: true, colClass: '',field:'check_period'},
-            {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field:'check_status_name'},
+            // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field:'check_status_name'},
         ];
     var colFunc = {width: 120, text: '操作', type: 'string', flex: true, field: 'id'};   
     colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status);

VisualInspection/js/mytask/apply_task.js

@@ -60,7 +60,7 @@ function queryUnexaminedTask(){
         "check_status":cur_status
     }
     var hide = false;
-    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
+    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA)|| roleContains('STATION')) {
         hide = true;
     }
     var cols = [

VisualInspection/js/mytask/check.js

@@ -184,11 +184,18 @@ function initCheckAppealBtns() {
             title: "申诉详情",
             closeBtn: 1,
             shade: false,
+            maxmin: true,
             shadeClose: true,
             offset: 'rb',
             content: $('#appeal_div'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
-            yes: function (index) {
-                layer.close(index);
+            min: function (index) {
+                // layer.close(index);
+                layer.style(index,{width: 50,height:50}); 
+                return false;
+            },
+            cancel:function(index){
+                 layer.style(index,{width: 50,height:50,offset:'r'});
+                 return false; 
             }
         });
     } else {
@@ -249,7 +256,23 @@ function showEditCheckScore(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);
+    var param = {
+        'organid': $.checkTask.checked_dept
+    };
+    post_common_service("/user/getUserList/", param, function (data) {
+        setFeeUserSelect("#check_checked_person_select",rowData.checked_person,data);
+    });
+}
+function setFeeUserSelect(div,selectId,userList){
+    var optStr = '';
+    for(var i in userList) {
+        if(userList[i].deptid==selectId)
+            optStr += '<option value="'+userList[i].id+'" selected="selected">'+userList[i].truename+'</option>';
+        else
+            optStr += '<option value="'+userList[i].id+'">'+userList[i].truename+'</option>';
+    }
+    $(div).html('');
+    $(div).html(optStr);
 }
 function saveScoreEdit(){
     var param = {
@@ -564,59 +587,36 @@ function genNode(m) {
     zdataItem["children"] = addobj(m);
     return zdataItem;
 }
-
 function zTreeOnClick(event, treeId, treeNode) {
-    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);
+    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") + ","
         }
-        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后自动关闭
-            });
-        });
+        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后自动关闭
+        });
+    });
+    
 }
 
 function submitCheck() {

VisualInspection/js/mytask/checked.js

@@ -11,6 +11,7 @@ function queryCheckedTask(){
         // "status_search_type":1,
         "check_status_arr":[4,5,6]
     }
+    
     var cols = [
                 {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
                 {width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down',field: 'name'},

VisualInspection/js/mytask/task_list.js

@@ -67,9 +67,10 @@ function queryTask(){
         "hasScore":$("#hasScoreList").val(),
     }
     var hide = false;
-    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
+    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA)|| roleContains('STATION')) {
         hide = true;
     }
+    console.log("fffffff"+hide);
     var cols = [
                 {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
                 {width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down',field: 'name'},

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -6,7 +6,7 @@
 //    })
 
    function initChargeTeamSchedule(){
-         $("#main_content_title").html("收费人员排班")
+        //  $("#main_content_title").html("收费人员排班")
 
         var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
 

VisualInspection/js/teamClass/check_team_schedule.js

@@ -1,6 +1,6 @@
     $(document).ready(function() {
 
-         $("#main_content_title").html("稽查人员排班")
+        //  $("#main_content_title").html("稽查人员排班")
 
         var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
         // console.log(user );

VisualInspection/view/mytask/check.html

@@ -126,6 +126,9 @@
     <div>
         <table style="width:100%;">
             <tr>
+                <td width="50%"><button class="btn btn-primary" type="button" onclick="showPre4Appeal()">反馈</button></label></td>
+            </tr>
+            <tr>
                 <td width="50%">申诉时间：<label id="appeal_time"></label></td>
                 <td width="50%">申诉原因：<label id="appeal_reason"></label></td>
             </tr>

VisualInspection/view/mytask/taskDetail.html

@@ -301,29 +301,45 @@
     }
 
     function confirmCheck(){
-        var param = {
-            "id": $.checkTask.id,
-            "check_status":6
-        }
-        no_return_common_service("/task/update/",param,function(data){
-             layer.msg("确认成功", {
-                time: 2000//20s后自动关闭
-             });
-            changePage("/view/mytask/task_list.html?status=5");
+        layer.confirm('是否确认该稽查结果？', {
+            btn: ['确认','取消'], //按钮
+            offset:'auto'
+        }, function(){
+            var param = {
+                "id": $.checkTask.id,
+                "check_status":6
+            }
+            no_return_common_service("/task/update/",param,function(data){
+                layer.msg("确认成功", {
+                    time: 2000//20s后自动关闭
+                });
+                changePage("/view/mytask/task_list.html?status=5");
+            });
+        }, function(index){
+            layer.close(index);
         });
+       
     }
 
     function confirmCheck4Appeal(){
-        var param = {
-            "id": $.checkTask.id,
-            "check_status":16
-        }
-        no_return_common_service("/task/update/",param,function(data){
-             layer.msg("确认成功", {
-                time: 2000//20s后自动关闭
-             });
-            changePage("/view/mytask/task_list.html?status=5");
+        layer.confirm('是否确认该申诉结果？', {
+            btn: ['确认','取消'], //按钮
+            offset:'auto'
+        }, function(){
+            var param = {
+                "id": $.checkTask.id,
+                "check_status":16
+            }
+            no_return_common_service("/task/update/",param,function(data){
+                layer.msg("确认成功", {
+                    time: 2000//20s后自动关闭
+                });
+                changePage("/view/mytask/task_list.html?status=5");
+            });
+        }, function(index){
+            layer.close(index);
         });
+        
     }
 
     function showAssign(){

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

@@ -10,11 +10,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.github.pagehelper.util.StringUtil;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.ClassCode;
+import com.xintong.visualinspection.bean.Team;
 import com.xintong.visualinspection.bean.TeamClass;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.TeamClassService;
+import com.xintong.visualinspection.service.TeamService;
 
 /**
  * 文件名：TestController
@@ -26,6 +29,10 @@ public class TeamClassController extends BaseController {
 
     @Autowired
     private TeamClassService teamClassService;
+    
+    @Autowired
+    private TeamService teamService;
+
 
    
     /**
@@ -48,8 +55,14 @@ public class TeamClassController extends BaseController {
     public String addList(@Valid @RequestBody List<TeamClass> teamClasses,HttpServletRequest request){
     	User u =getCurrentUser(request);
     	for(int i=0;i<teamClasses.size();i++ ){
+    		TeamClass teamClass = teamClasses.get(i);
     		teamClasses.get(i).setDept_id(u.getOrganid()+0L);
-    		teamClassService.insert(teamClasses.get(i));    		
+    		//直接从后台获取当班的人员
+    		if(teamClass.getTeam_id()!=null){
+    			Team t = teamService.getById(teamClass.getTeam_id());
+    			teamClass.setUser_ids(t.getUser_ids());
+    		}
+    		teamClassService.insert(teamClasses.get(i));  
     	}
     	return super.returnSuccessResult("添加成功");
     }
@@ -81,6 +94,11 @@ public class TeamClassController extends BaseController {
     		if(teamClass.getDept_id()==null){
     			teamClass.setDept_id(u.getOrganid()+0L);
     		}
+    		//直接从后台获取当班的人员
+    		if(teamClass.getTeam_id()!=null){
+    			Team t = teamService.getById(teamClass.getTeam_id());
+    			teamClass.setUser_ids(t.getUser_ids());
+    		}
     	}
     	teamClassService.updateList(teamClasses);
     	return super.returnSuccessResult("修改成功");

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

@@ -54,6 +54,7 @@
         t_sys_users
         SET
         <if test="username != null">username = #{username},</if>
+        <if test="truename != null">truename = #{truename},</if>
         <if test="age != null">age = #{age},</if>
         <if test="password != null">password = #{password},</if>
         <if test="pic != null">pic = #{pic},</if>

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

@@ -65,6 +65,7 @@
         <if test="videos != null">videos = #{videos},</if>
         <if test="checkman != null">checkman = #{checkman},</if>
         <if test="checked_person != null">checked_person = #{checked_person},</if>
+        <if test="check_item_score != null">check_item_score = #{check_item_score},</if>
         remark=#{remark}
         WHERE
         id = #{id}

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

@@ -7,6 +7,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.druid.util.StringUtils;
+import com.github.pagehelper.util.StringUtil;
 import com.xintong.visualinspection.bean.ClassCode;
 import com.xintong.visualinspection.bean.TeamClass;
 import com.xintong.visualinspection.bean.User;
@@ -34,10 +36,10 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 		// TODO Auto-generated method stub
 		List<TeamClass> list = teamClassDao.getClassList(teamClass);
 		for(TeamClass obj:list){
-			if(obj.getUser_ids()==null)
+			if(StringUtil.isEmpty(obj.getUser_ids()))
 				continue;
-			String[] user_ids = obj.getUser_ids().split(",");
 			StringBuffer user_names = new StringBuffer();
+			String[] user_ids = obj.getUser_ids().split(",");
 			for(int i=0;i<user_ids.length;i++){
 				User user = CacheUtil.userMap.get(Long.valueOf(user_ids[i]));
 				String userNames = user!=null?user.getTruename():"";

VisualInspection_server/src/main/resources/application.properties

@@ -2,18 +2,18 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/yanhai?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -58,8 +58,9 @@ spring.redis.host=10.112.0.199
 #spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
 #spring.redis.port=6380
-spring.redis.port=7003
-#spring.redis.port=6379 
+
+#spring.redis.port=7003
+spring.redis.port=6379 
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
 # \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09
@@ -79,7 +80,6 @@ logging.level.root=INFO
 logging.level.org.springframework.web=DEBUG
 logging.level.org.springframework.data=DEBUG
 logging.level.org.springframework.security=DEBUG
-logging.level.org.mybites=INFO