修改日志配置

VisualInspection/js/mytask/check.js

@@ -215,14 +215,14 @@ function initCheckAppealBtns() {
     if ($.checkTask.appeal) {
         $("#btn_appeal_task").show();
         $("#btn_task").hide();
-        $("#appeal_div").show();
+        // $("#appeal_div").show();
         $("#appeal_time").html($.checkTask.appeal.appeal_time);
         $("#appeal_reason").html($.checkTask.appeal.appeal_reason);
         $("#appeal_file_list").html(genAppeaFiles($.checkTask.appeal.file_src));
         $("#recheck_result").html($.checkTask.appeal.recheck_result);
         showAppealLayer();
     } else {
-        $("#appeal_div").hide();
+        // $("#appeal_div").hide();
         $("#btn_appeal_task").hide();
         $("#btn_task").show();
     }
@@ -239,15 +239,7 @@ function showAppealLayer(){
             offset: 'rb',
             content: $('#appeal_div'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
             cancel:function(index){
-                // layer.msg('', {
-                //     time: 0, //不自动关闭
-                //     offset: 'rb',
-                //     btn: ['申诉详情'],
-                //     yes: function(index){
-                //         layer.close(index);
-                //         showAppealLayer();
-                //     }
-                // });
+                layer.close(index);
                 layer.open({
                     type: 1,
                     title: "",
@@ -263,6 +255,7 @@ function showAppealLayer(){
                         showAppealLayer();
                     }
                 });
+                return false;
             }
         });
 }

VisualInspection/js/mytask/task_list.js

@@ -177,12 +177,12 @@ function dispatchTaskPatch(){
         "dispatch_ids":$('.datatable').mytable('getTableCheckedIds')
     }
     console.log("放假啦:"+param.dispatch_ids);
-    if(!param.dispatch_ids || param.dispatch_ids.length==0){
-        layer.msg('请选择下发任务！', {
-            time: 2000//20s后自动关闭
-        });
-        return;
-    }
+    // if(!param.dispatch_ids || param.dispatch_ids.length==0){
+    //     layer.msg('请选择下发任务！', {
+    //         time: 2000//20s后自动关闭
+    //     });
+    //     return;
+    // }
     layer.confirm('确定下发选中任务？', {
         btn: ['确定','取消'] //按钮
     }, function(){

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -451,7 +451,7 @@
                     for(var i=0;i<data.length;i++){
                             var ct = data[i].class_type ;
                             $(".tr-"+ct ).data("cache",data[i]);
-                            $(".tr-"+ct).append("<td valign='middle'><span>"+ classCode[ct].class_name +"</span> <span>"+classCode[ct].start_time+"</span> - <span>"+classCode[ct].end_time +"</span></td>");
+                            $(".tr-"+ct).append("<td vertical-align='middle' align='center' style='width:100px;'><span style='font-weight:bold;'>"+ classCode[ct].class_name +"<br></span><span>"+classCode[ct].start_time+"</span> - <span>"+classCode[ct].end_time +"</span></td>");
                             var selectv = "<select class='form-control select-self' style='width:78px;'>"
                             selectv += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
@@ -459,13 +459,13 @@
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
                             }
                             selectv += "</select> <i title='顶班详情' alt='顶班详情' class='icon icon-tags i-self' style='float:right;margin-top:7px;'></i>";
-                            // selectv += "<label>"+ct+"</label>"
-                            $(".tr-"+ct).append("<td style='vertical-align:middle;width:107px;padding:2px;' class='c-"+ct+"-0' tag='0'>"+ selectv +"</td>")
+                            selectv += "<ul style='padding:0px;'></ul>"
+                            $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"-0' tag='0'>"+ selectv +"</td>")
                             for(var z=0;z<entrance_number;z++){
-                                $(".tr-"+ct).append("<td style='vertical-align:middle;width:107px;padding:2px;' class='c-"+ct+"-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv +"</td>")
+                                $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv +"</td>")
                             }
                             for(var z=0;z<exit_number;z++){
-                               $(".tr-"+ct).append("<td style='vertical-align:middle;width:107px;padding:2px;' class='c-"+ct+"--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv +"</td>")
+                               $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv +"</td>")
                             }
                     }
                      if(data.length ==0){
@@ -499,7 +499,12 @@
                                     
                                     if(data[i].list != null)
                                         $(".c-"+data[i].class_type+"-"+data[i].lane+" select").data("data",data[i].list);
-                                    
+                                        var liStr="";
+                                        for(var mm=0;mm<data[i].list.length;mm++){
+                                            var obj = data[i].list[mm];
+                                            liStr+="<li style='list-style-type:none;font-size:11px;color:#777777'>"+obj.start_time.substr(11,5)+"-"+obj.end_time.substr(11,5)+" "+obj.user_name+"</li>";
+                                        }
+                                        $(".c-"+data[i].class_type+"-"+data[i].lane+" ul").append(liStr);
                                     for(var j=0;j<data[i].list.length;j++){
                                         data[i].list[j].id = data[i].list[j].user_id ; 
                                     }

VisualInspection/view/mytask/appealDetail.html

@@ -0,0 +1,19 @@
+<div class="container-fluid">
+    <table style="width:100%;">
+        <tr>
+            <td width="50%">申诉时间：<label id="appeal_time"></label></td>
+        </tr>
+        <tr>
+            <td width="50%">申诉原因：<label id="appeal_reason"></label></td>
+        </tr>
+        <tr>
+            <td width="50%" colspan="2">附件：
+                <div class="file-list" id="appeal_file_list"></div>
+            </td>
+        </tr>
+        <tr>
+            <td width="80%"><textarea id="recheck_result" style="height:50px;"></textarea></td>
+            <td width="20%"><button class="btn btn-primary" type="button" onclick="saveRecheckResult()">保存</button></td>
+        </tr>
+    </table>
+</div>

VisualInspection/view/mytask/check.html

@@ -133,26 +133,8 @@
         </div>
     </div>
 </div>
-<div id="appeal_div" style="padding:10px;display:none;">
-    <div>
-        <table style="width:100%;">
-            <tr>
-                <td width="50%">申诉时间：<label id="appeal_time"></label></td>
-            </tr>
-            <tr>
-                <td width="50%">申诉原因：<label id="appeal_reason"></label></td>
-            </tr>
-            <tr>
-                <td width="50%" colspan="2">附件：
-                    <div class="file-list" id="appeal_file_list"></div>
-                </td>
-            </tr>
-            <tr>
-                <td width="80%"><textarea id="recheck_result" style="height:50px;"></textarea></td>
-                <td width="20%"><button class="btn btn-primary" type="button" onclick="saveRecheckResult()">保存</button></td>
-            </tr>
-        </table>
-    </div>
+<div id="appeal_div" style="display:none;">
+    <link rel="import" href="/view/mytask/appealDetail.html?__inline">
 </div>
 <div id="form-div" style="display:none;text-align:center;">
     <link rel="import" href="/view/mytask/changePerson.html?__inline">

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -73,7 +73,7 @@
             <div class="container-fluid ">
                     <div>
                         <table class="table">
-                            <thead class="thread_charge">
+                            <thead class="thread_charge" style="padding:3px;font-size:14px;background:#F8F8F8;">
                                
                             </thead>
                             <tbody class="tbody">

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

@@ -122,24 +122,27 @@ public class TaskController extends BaseController {
     	if(task.getUpdate_check_status()==null || "".equals(task.getUpdate_check_status())){
     		task.setUpdate_check_status(Constants.STATUS_CHECK_DISPATCH);
     	}
-    	List<Task> taskList = taskService.getTaskList(task);
-    	List<TaskStatus> taskStatusList = new ArrayList<TaskStatus>();
-    	User u = getCurrentUser(request);
-    	for(Task t:taskList) {
-    		//插入状态到表
-    		TaskStatus status = new TaskStatus();
-    		status.setTask_id(t.getId());
-    		status.setUpdate_time(new Date());
-    		status.setUpdate_user(new Long(u.getId()));
-    		status.setUpdate_username(u.getTruename());
-    		status.setCheck_status(task.getUpdate_check_status());
-    		String name = (CacheUtil.codeMap.get("task_status_"+task.getUpdate_check_status())).getCode_name();
-    		status.setCheck_status_name(name);
-    		taskStatusList.add(status);
+    	if(task.getDispatch_ids()!=null && task.getDispatch_ids().length>0){
+    		List<Task> taskList = taskService.getTaskList(task);
+    		List<TaskStatus> taskStatusList = new ArrayList<TaskStatus>();
+    		User u = getCurrentUser(request);
+    		for(Task t:taskList) {
+    			//插入状态到表
+    			TaskStatus status = new TaskStatus();
+    			status.setTask_id(t.getId());
+    			status.setUpdate_time(new Date());
+    			status.setUpdate_user(new Long(u.getId()));
+    			status.setUpdate_username(u.getTruename());
+    			status.setCheck_status(task.getUpdate_check_status());
+    			String name = (CacheUtil.codeMap.get("task_status_"+task.getUpdate_check_status())).getCode_name();
+    			status.setCheck_status_name(name);
+    			taskStatusList.add(status);
+    		}
+    		taskService.dispatch(task);
+    		taskService.insertStatusBatch(taskStatusList);
+    		return super.returnSuccessResult("下发成功");
     	}
-    	taskService.dispatch(task);
-    	taskService.insertStatusBatch(taskStatusList);
-    	return super.returnSuccessResult("下发成功");
+    	return super.returnSuccessResult("下发失败，请选择需下发任务！");
     }
     
     @RequestMapping(value = "/dispatchById")

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

@@ -269,4 +269,11 @@
           	where id = #{id}
           )
     </select>
+    <select id="getTaskStatusByType" parameterType="map" resultMap="taskStatusMap" >
+        SELECT *
+        FROM check_status
+        WHERE task_id = #{task_id}
+          and check_status = #{check_status}
+        order by update_time desc
+    </select>
 </mapper>

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

@@ -43,7 +43,7 @@
    
    <select id="selectList" parameterType="com.xintong.visualinspection.bean.UserClass" resultMap="userClassMap" >
    		SELECT su.*,t.start_time AS start_time_u,t.end_time AS end_time_u,t.user_name , t.user_id AS user_id_u , t.id AS ids FROM sys_user_class su LEFT JOIN sys_user_class_unregular t ON su.id = t.class_id 
-   		 WHERE su.work_date = #{work_date} AND su.dept_id=#{dept_id} order by class_type asc , lane asc
+   		 WHERE su.work_date = #{work_date} AND su.dept_id=#{dept_id} order by t.start_time asc,class_type asc , lane asc
    </select>
    
    <delete id="delete" parameterType="com.xintong.visualinspection.bean.UserClass">

VisualInspection_server/src/main/resources/application.properties

@@ -3,8 +3,8 @@ 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://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://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.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -12,8 +12,8 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 
 ## \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://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://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.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -54,12 +54,12 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=10.112.0.199
-#spring.redis.host=git.topm.win
+#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=6380
 
-spring.redis.port=7003
+#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
@@ -75,11 +75,14 @@ spring.redis.pool.min-idle=0
 spring.redis.timeout=0 
 
 
-
-logging.level.root=INFO
-logging.level.org.springframework.web=DEBUG
-logging.level.org.springframework.data=DEBUG
-logging.level.org.springframework.security=DEBUG
+log.path=/var/log/visual/
+log.file=visual
+log.lever=info
+log.pattern=%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) |-%-5level [%thread] %c [%L] -| %msg%n
+#logging.level.root=INFO
+#logging.level.org.springframework.web=DEBUG
+#logging.level.org.springframework.data=DEBUG
+#logging.level.org.springframework.security=DEBUG
 
 
 

VisualInspection_server/src/main/resources/logback.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<property resource="application.properties" />
+	
+	<logger name="com.roncoo" level="debug" />
+
+	<!-- 控制台设置 -->
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 文件设置 -->
+	<appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 文件路径 -->
+		<file>${log.path}${log.file}.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- 文件名称 -->
+			<fileNamePattern>${log.path}${log.file}.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 文件最大保存历史数量 -->
+			<MaxHistory>${log.maxHistory}</MaxHistory>
+		</rollingPolicy>
+
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>${log.pattern}</pattern>
+		</layout>
+	</appender>
+
+	<root level="${log.lever}">
+		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="LOGFILE" />
+	</root>
+	<!-- 打印sql语句 -->
+	<logger name="com.xintong.visualinspection.dao" level="DEBUG"></logger>
+</configuration>