Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection/view/term_management/charge_stuff_schedule.html

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -38,14 +38,11 @@
             getTeamClass(datap,function(data){
                 var newEvents = [];
 
-                
-
                 // console.log(data);
                 for(var i=0;i<data.length;i++){
                     var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].end_time, end: data[i].end_time};//都以开始时间的日期为准
                     newEvents.push(obj);
                 }
-               
 
                  // 这里轮训给每天都增加一个事件
                
@@ -207,6 +204,13 @@
         }
 
         $("#save_user_class").click(function(){
+
+            var now_date = new Date();
+            if(now_date.Format('yyyy-MM-dd') > $("#save_user_class").data("work_date") ){
+                tip("不能生成过期的排班");
+                return ;
+            }
+
             var dutyList = [];
             var work_date = $("#save_user_class").data("work_date")+"00:00:00";
 
@@ -451,11 +455,24 @@
                                       $("#save_user_class").data("modify_flag",false);
                                 }
                                 for(var i=0;i<data.length;i++){
-                                    console.log(data[i].list)
+                                    // console.log(data[i].list)
+                                    // 这边需要把id转换成user_id
+                                    
                                     if(data[i].list != null)
                                         $(".c-"+data[i].class_type+"-"+data[i].lane+" select").data("data",data[i].list);
-                                   $(".c-"+data[i].class_type+"-"+data[i].lane+" select").val(data[i].user_id);
-                                    // $(".table .tr-"+data[i].class_type+" select").eq(i%(lans+1)).val(data[i].user_id);
+                                    
+                                    for(var j=0;j<data[i].list.length;j++){
+                                        data[i].list[j].id = data[i].list[j].user_id ; 
+                                    }
+
+                                    var aim_selector =  $(".c-"+data[i].class_type+"-"+data[i].lane+" select") ;
+
+                                  aim_selector.val(data[i].user_id);
+
+                                  if(aim_selector.find("option:selected").text() == ''){
+                                       aim_selector.append("<option selected='selected'>"+ data[i].user_name +"</option>")
+                                  }
+                                  // $(".table .tr-"+data[i].class_type+" select").eq(i%(lans+1)).val(data[i].user_id);
                                 }
                             },function(error){
                                 return "" ;
@@ -539,6 +556,13 @@
         });
 
         $("#save_term_class").click(function(){
+            // 判断当前时间和待添加班组时间判断
+            var now_date = new Date();
+            if(now_date.Format('yyyy-MM-dd') > $("#save_term_class").data("date") ){
+                tip("不能生成过期的排班");
+                return ;
+            }
+
             var data = [];
             for(var i=0;i<$("select[id*='_term']").length;i++){
                 if($("select[id*='_term']").eq(i).val()!=""){

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -179,8 +179,8 @@
     $(document).ready(function() {
         initChargeTeamSchedule();
 
-        jeDate({ dateCell:"#start_time", format:"YYYY-MM-DD hh:mm", isTime:true,festival: true,isinitVal: true,zIndex:99999999});
-        jeDate({ dateCell:"#end_time", format:"YYYY-MM-DD hh:mm", isTime:true,festival: true,isinitVal: true,zIndex:99999999 });
+        jeDate({ dateCell:"#start_time", format:"hh:mm:00", isTime:true,festival: true,isinitVal: true,zIndex:99999999});
+        jeDate({ dateCell:"#end_time", format:"hh:mm:00", isTime:true,festival: true,isinitVal: true,zIndex:99999999 });
   
     })
 </script>

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

@@ -44,6 +44,8 @@ public class UserClass {
     //班次类型（早、中、晚、全天）
     private Integer class_type;
     
+    private String user_name ;
+    
     private Integer lane;
     
     private Integer class_flag ;

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

@@ -163,7 +163,12 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 
 	@Override
 	public List<UserClass> selectList(UserClass obj) {
-		return userClassDao.selectList(obj);
+		// 这边需要处理一下 user_name
+		List<UserClass> list = userClassDao.selectList(obj);
+		for(UserClass userClass : list){
+			userClass.setUser_name( CacheUtil.userMap.get(userClass.getUser_id()).getTruename());
+		}
+		return list ;
 	}
 
 	@Override

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