修改bug

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -194,14 +194,6 @@
                 post_common_service( "teamClass/getClassListAndUsers",data,function(data){
 
                     $(".tr-1,.tr-2,.tr-3").empty();
-                    if(data.length ==0){
-                        $(".tr-1").append("<td>早班 6:00 - 12:00</td>");
-                        $(".tr-2").append("<td>中班 12:00 - 20:00</td>");
-                        $(".tr-3").append("<td>晚班 20:00 - 6:00</td>");
-                        for(var i=0;i<lans;i++){
-                             $(".tr-1,.tr-2,.tr-3").append("<td></td>");
-                        }
-                    }
 
                     for(var i=0;i<data.length;i++){
                         if(data[i].class_type == 1){
@@ -245,6 +237,29 @@
                             }
                         }
                     }
+                     if(data.length ==0){
+                        $(".tr-1").append("<td>早班 6:00 - 12:00</td>");
+                        $(".tr-2").append("<td>中班 12:00 - 20:00</td>");
+                        $(".tr-3").append("<td>晚班 20:00 - 6:00</td>");
+                        for(var i=0;i<lans;i++){
+                             $(".tr-1,.tr-2,.tr-3").append("<td></td>");
+                        }
+                    }else{
+                         var cache = $(".tr-1").data("cache");
+                         var work_date = $("#save_user_class").data("work_date");
+                        var param = {
+                            'dept_id':cache.dept_id,
+                            'work_date':work_date
+                        }
+
+                        post_common_service( "userClass/getList",param,function(data){
+                                for(var i=0;i<data.length;i++){
+                                    $(".table select").eq(i).val(data[i].user_id);
+                                }
+                            },function(error){
+                                return "" ;
+                        })
+                    }
                 },function(error){
                     return "" ;
                 })

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

@@ -44,8 +44,10 @@ public class TeamClassController extends BaseController {
      * 添加班次 list
      */
     @RequestMapping(value = "/add/list")
-    public String addList(@Valid @RequestBody List<TeamClass> teamClasses){
+    public String addList(@Valid @RequestBody List<TeamClass> teamClasses,HttpServletRequest request){
+    	User u =getCurrentUser(request);
     	for(int i=0;i<teamClasses.size();i++ ){
+    		teamClasses.get(i).setDept_id(u.getOrganid()+0L);
     		teamClassService.insert(teamClasses.get(i));    		
     	}
     	return super.returnSuccessResult("添加成功");

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

@@ -31,9 +31,15 @@ public class UserClassController extends BaseController {
      * @since  1.0.0
      */
     @RequestMapping(value = "/addList")
-    public String getClassById(@RequestBody List<UserClass> list){
+    public String addList(@RequestBody List<UserClass> list){
     	userClassService.insertList(list);
     	return super.returnSuccessResult("添加成功");
     }
     
+    @RequestMapping(value = "/getList")
+    public String getList(@RequestBody UserClass userClass){
+    	List<UserClass> list = userClassService.selectList(userClass);
+    	return super.returnSuccessResult(list);
+    }
+    
 }

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

@@ -4,7 +4,6 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import com.xintong.visualinspection.bean.CheckItem;
 import com.xintong.visualinspection.bean.UserClass;
 
 /**
@@ -13,7 +12,7 @@ import com.xintong.visualinspection.bean.UserClass;
  */
 @Mapper
 public interface UserClassDao  {
-    public List<CheckItem> selectList(UserClass userClass);
+    public List<UserClass> selectList(UserClass userClass);
     public void insert(UserClass userClass);
     public void delete(UserClass userClass);
 }

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

@@ -11,5 +11,8 @@
         (#{work_date},#{dept_id},#{user_id},#{class_type},#{team_id},#{start_time},#{end_time},#{lane})
    </insert>
    
+   <select id="selectList" parameterType="com.xintong.visualinspection.bean.UserClass" resultType="com.xintong.visualinspection.bean.UserClass" >
+   		SELECT * from sys_user_class where work_date = #{work_date} and dept_id=#{dept_id} order by class_type asc , lane asc
+   </select>
    
 </mapper>

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

@@ -21,5 +21,5 @@ import com.xintong.visualinspection.bean.UserClass;
 public interface UserClassService {
     public void insertList(List<UserClass> list);
     public void updateList(List<UserClass> list);
-    public void selectList(UserClass obj);
+    public List<UserClass> selectList(UserClass obj);
 }

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

@@ -38,9 +38,8 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 	}
 
 	@Override
-	public void selectList(UserClass obj) {
-		// TODO Auto-generated method stub
-		
+	public List<UserClass> selectList(UserClass obj) {
+		return userClassDao.selectList(obj);
 	}