修改获取由于值班人id问题取不到真实姓名的bug

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

@@ -53,4 +53,8 @@ public class TeamClass {
     
     private Integer user_type ;//1:收费站；2:稽查办
     
+    private List<TeamClass> unregularTeamClass;
+    
+    //班组id
+    private Long class_id;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/TeamClassDao.java

@@ -24,5 +24,7 @@ public interface TeamClassDao  {
     public List<TeamClass> getClassCode(ClassCode teamClass);
     
     public List<TeamClass> getClassListForCharge(TeamClass teamClass);
+    
+    public List<TeamClass> getClassListForChargeUnRegular(TeamClass teamClass);
    
 }

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

@@ -11,6 +11,7 @@
         <result column="team_id" property="team_id" jdbcType="INTEGER" />
         <result column="start_time" property="start_time" jdbcType="DATE" />
         <result column="end_time" property="end_time" jdbcType="DATE" />
+        <result column="class_id" property="class_id" jdbcType="INTEGER" />
     </resultMap>
 
     <select id="getAll" resultMap="BaseResultMap"  >
@@ -34,6 +35,16 @@
         ORDER BY t.work_date ASC ,t.class_type ASC) tc WHERE tc.type =#{type}
     </select>
     
+    <select id="getClassListForChargeUnRegular" 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
+        FROM sys_team_class_unregular 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>
+        <if test="start_time != null">AND t.work_date &gt;= #{start_time}</if>
+        <if test="end_time != null">AND t.work_date &lt;= #{end_time}</if>
+        ORDER BY t.work_date ASC ,t.class_type ASC) tc WHERE tc.type =#{type}
+    </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,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

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

@@ -1,13 +1,14 @@
 package com.xintong.visualinspection.service.impl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 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;
@@ -59,6 +60,14 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 	public List<TeamClass> getClassListAndUsers(TeamClass teamClass) {
 		
 		List<TeamClass> lists = teamClassDao.getClassListForCharge(teamClass);
+		
+//		List<TeamClass> lists1 = teamClassDao.getClassListForChargeUnRegular(teamClass);
+//		Map<Long,List<TeamClass>> tcMap = new HashMap<Long,List<TeamClass>>();
+//		for(TeamClass tc:lists1) {
+//			if(tcMap.containsKey(tc.getTeam_id()))
+//		}
+//		
+		
 		for(TeamClass obj : lists){
 			if(obj.getUser_ids()!=null){				
 				String[] user_ids = obj.getUser_ids().split(",");

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

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

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