Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/js/teamClass/check_team_schedule.js

@@ -3,8 +3,10 @@
 
          $("#main_content_title").html("稽查人员排班")
 
+        var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
+        // console.log(user );
         // 用户的dept_id
-        var user_dept_id = '' ;
+        var user_dept_id = user.organid ;
         
         // 稽查小组type
         var team_type = 2 ;
@@ -12,8 +14,7 @@
         // 日期游标
         var date_cursor = 0 ;
 
-        // var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
-        // console.log(user );
+
 
         $('#calendar').calendar();
         var calendar = $('#calendar').data('zui.calendar');
@@ -107,7 +108,7 @@
             setAddTermTitle(date.format("yyyy-MM-dd"));
             // 保存当前日期
             $("#save_term_class").data("date",date.format("yyyy-MM-dd"));
-
+             $("#team_detail").html("");
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":date.format("yyyy-MM-dd 00:00:00"),
@@ -124,6 +125,7 @@
                     for(var i=0;i<data.length;i++){
                         $(".class_team_"+data[i].class_type).val(data[i].team_id);
                     }
+                    $("#team_detail").html(data[0].user_ids_name);
                 }else{
                      $("#save_term_class").data("modify_flag",0);
                 }
@@ -179,7 +181,8 @@
                         "work_date": $("#save_term_class").data("date")+" 00:00:00",
                         "start_time": $("#save_term_class").data("date")+" 00:00:00",
                         "end_time": $("#save_term_class").data("date")+" 00:00:00",
-                        "dept_id":user_dept_id
+                        "dept_id": user_dept_id,
+                        "user_ids":  $("#team_detail").data("user_ids")      
                     };
                     data.push(obj);
                 }
@@ -227,6 +230,19 @@
 
    })
 
+   $("#all_term").change(function(){
+       if($(this).val() !="" ){
+           // 请求班组下人员信息
+           var data ={ "id": $(this).val() };
+           post_common_service( "team/getDetailById",data,function(data){
+                $("#team_detail").html(data.user_ids_name); 
+                $("#team_detail").data("user_ids",data.user_ids);            
+           },function(error){})
+       }else{
+            $("#team_detail").html("");   
+       }
+   })
+
    // 根据class_type 获取班次名称
    function getTeamName(class_type){
        if(class_type == 1){

VisualInspection/js/user/login.js

@@ -25,6 +25,7 @@ $(document).ready(function() {
 
         }, function(error) {
             $btn.button('reset');
+            layer.alert('用户名或密码错误');
         });
 
 

VisualInspection/view/term_management/check_stuff_schedule.html

@@ -23,36 +23,18 @@
             <!-- 添加对话框 -->
             <div class="container-fluid ">
                 <div class="form-horizontal">
-                    <!--<div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">早班</label>
-                        <div class="col-md-6 col-sm-8">
-                            <select id="mooring_term" type="text" class="form-control class_team_1" >
-                                <option value=''>请选择班组</option>
-                            </select>
-                        </div>
-                    </div>
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">中班</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">全班</label>
                         <div class="col-md-6 col-sm-8">
-                            <select id="middle_term" type="text" class="form-control class_team_2" >
+                            <select id="all_term" type="text" class="form-control class_team_4" >
                                 <option value=''>请选择班组</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">晚班</label>
-                        <div class="col-md-6 col-sm-8">
-                            <select id="night_term" type="text" class="form-control class_team_3" >
-                                <option value=''>请选择班组</option>
-                            </select>
-                        </div>
-                    </div>-->
-                    <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">全班</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">人员详情</label>
                         <div class="col-md-6 col-sm-8">
-                            <select id="all_term" type="text" class="form-control class_team_4" >
-                                <option value=''>请选择班组</option>
-                            </select>
+                            <div class="form-control class_team_4" id="team_detail" style="height:auto;min-height:32px;"></div>
                         </div>
                     </div>
                     <hr>

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

@@ -39,6 +39,7 @@ public class TeamClass {
     private Long team_id;
     //人员ids
     private String user_ids;
+    private String user_ids_name ;
     //部门id
     private Long dept_id;
     //班次类型（早、中、晚、全天）

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

@@ -87,6 +87,20 @@ public class TeamController extends BaseController {
     }
     
     /**
+     * 根据team_id 获取班组详情
+     * @param team
+     * @return
+     */
+    @RequestMapping(value = "/getDetailById")
+    public String getTeamPersonsById(@RequestBody Team team){
+    	if(team.getId()==null){
+    		throw new BusinessException(20002);
+    	}
+    	Team t = teamService.getDetailsById(team);
+    	return super.returnSuccessResult(t);
+    }
+    
+    /**
      * 通过部门id获取班组
      * @return
      * String

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

@@ -25,7 +25,7 @@
     </select>
     
     <select id="getClassList" parameterType="com.xintong.visualinspection.bean.TeamClass" resultMap="BaseResultMap" >
-        SELECT * FROM ( SELECT t.id,t.work_date,t.dept_id,t.class_type,t.team_id,t.start_time,t.end_time,st.user_ids ,st.name as team_name,st.type
+        SELECT * FROM ( SELECT t.id,t.work_date,t.dept_id,t.class_type,t.team_id,t.start_time,t.end_time,t.user_ids ,st.name as team_name,st.type
         FROM sys_team_class t left join sys_team st ON t.team_id = st.id
         WHERE 1=1
         <if test="dept_id != null">AND t.dept_id = #{dept_id}</if>

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

@@ -26,4 +26,5 @@ public interface TeamService {
     public void update(Team team);
     public void delete(Long id);
     public List<Team> getTeamByName(Team team);
+    public Team getDetailsById(Team team);
 }

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

@@ -32,7 +32,21 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 	@Override
 	public List<TeamClass> getClassList(TeamClass teamClass) {
 		// TODO Auto-generated method stub
-		return teamClassDao.getClassList(teamClass);
+		List<TeamClass> list = teamClassDao.getClassList(teamClass);
+		for(TeamClass obj:list){
+			if(obj.getUser_ids()==null)
+				continue;
+			String[] user_ids = obj.getUser_ids().split(",");
+			StringBuffer user_names = new StringBuffer();
+			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():"";
+				user_names.append(userNames);
+				user_names.append(",");
+			}
+			obj.setUser_ids_name(user_names.toString());
+		}
+		return list;
 	}
 
 	@Override

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

@@ -115,4 +115,21 @@ public class TeamServiceImpl extends BaseService implements TeamService {
 		}
 		return teamlist;
 	}
+
+
+	@Override
+	public Team getDetailsById(Team team) {
+		team = teamDao.getOne(team.getId());
+		if(team != null){
+			String[] user_ids = team.getUser_ids().split(",");
+			StringBuffer user_names = new StringBuffer();
+			for(int i=0;i<user_ids.length;i++){
+				String userNames = CacheUtil.userMap.get(Long.valueOf(user_ids[i])).getTruename();
+				user_names.append(userNames!=null?userNames:"" );
+				user_names.append(",");
+			}
+			team.setUser_ids_name(user_names.toString());
+		}
+		return team;
+	}
 }

VisualInspection_server/src/main/resources/application.properties

@@ -2,14 +2,16 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-master.datasource.url = jdbc:mysql://192.168.8.236: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.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://192.168.8.236: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.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -50,9 +52,11 @@ 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=192.168.8.236
+#spring.redis.host=10.112.0.199
+spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-spring.redis.port=6379  
+spring.redis.port=6380
+#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