人员班组管理

VisualInspection/js/lib/mytable.js

@@ -102,7 +102,7 @@
                         var oper = cols[i].oper;
                         var operStr="";
                         for(var j=0;j<oper.length;j++){
-                            operStr+='<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+')"><i class="icon icon-edit"></i>'+oper[j].text+'</a> ';
+                            operStr+='<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+')"><i class="icon '+oper[j].col_class+'"></i>'+oper[j].text+'</a> ';
                         }
                         dArr.push(operStr);
                     }else{

VisualInspection/js/term_management/charge_terms_m.js

@@ -0,0 +1,127 @@
+ var team_id;
+    var dept_id = 12;
+    var idUpdate;
+    function queryTable(){
+        var data = {
+            "dept_id":dept_id
+        }
+        var name = $("#select_name").val();
+        if(name!=''){
+            data.name = name ;
+        }
+        var cols = [
+                        {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
+                        {width: 160, text: '班组名称', flex: false,colClass: 'text-center',field:'name'},
+                        {width: 80, text: '所属人员分类',  flex: true, colClass: 'text-center',field:'type'},
+                        {width: 80, text: '班长', type: 'date', flex: false, sort: 'down',field:''},
+                        {width: 80, text: '副班长', type: 'string', flex: true, colClass: '',field:''},
+                        {width: 80, text: '人员',  flex: false, colClass: 'text-center',field:'user_ids'},
+                        {width: 50, text: '操作',  flex: false, colClass: 'text-center',field:'id',oper:[
+                            {func:'updateCheckTeam',text:'修改',col_class:'icon-edit'},{func:'deleteCheckTeam',text:'删除',col_class:'icon-remove-circle'}
+                        ]},
+                    ] ;
+        
+        $('.datatable').mytable({'cols':cols,
+                                'url':"team/getTeamByName",
+                                'param':data}
+                                );
+    }
+    function deleteCheckTeam(id){
+        deleteItem4Common(id,"team/delete",queryTable);
+    }
+     $(document).ready(function() {
+         queryTable();
+    })
+    function updateCheckTeam(id){
+        team_id = id;
+        data = {
+            "id":id
+        }
+        post_common_service("team/getTeamById", data, function(data){
+            $("#monitor").empty();
+            $("#second-monitor").empty();
+            $("#member").empty();
+            $("#team_name").val(data.name);
+            users = data.user_ids.split(",");
+            for(i=0;i<users.length;i++){
+                $("#monitor").append('<option>'+users[i]+'</option>');
+                $("#second-monitor").append('<option>'+users[i]+'</option>');
+                $("#member").append('<div style="width:83px;float:left;">\
+                                         <input type="checkbox" value="'+users[i]+'"><span>'+users[i]+'</span>\
+                                     </div>');
+            }
+            idUpdate = true;
+            layerUpdateTeam('form-div','班组修改','550px');
+        }, function(){
+
+        });
+        
+    }
+    function layerUpdateTeam(domId,title,area){
+        layer.open({
+            type: 1,
+            title: false,
+            closeBtn: 1,
+            title:title,
+            shadeClose: true,
+            skin: 'yourclass',
+            area:area,
+            content: $("#"+domId)
+        });
+    }
+    //关闭弹窗
+    $("#close-layer").click(function(){
+        layer.closeAll();
+    })
+    //保存修改或添加
+    $("#save-team").click(function(){
+        var user_ids = "";
+         $.each($('input:checkbox'),function(){
+                if(this.checked){
+                    user_ids = user_ids +　$(this).val() + ",";
+                }
+        });
+        if(user_ids != ""){
+            user_ids = user_ids.substring(0,user_ids.length-1);
+        }else{
+            // layer.msg('请选择人员');
+            // return;
+        }
+        data = {
+            "id":team_id,
+            "dept_id":dept_id,
+            "name":$("#team_name").val(),
+            "user_ids":user_ids,
+            "type":1
+        }
+        if(idUpdate){
+            //修改
+            post_common_service("team/update", data, function(data){
+                layer.closeAll();
+                queryTable();
+            }, function(){
+
+            });
+        }else{
+            //添加
+            post_common_service("team/add", data, function(data){
+                layer.closeAll();
+                queryTable();
+            }, function(){
+
+            });
+        }
+        
+    })
+
+    //条件查询
+    $("#conditional_query").click(function(){
+        queryTable();
+    })
+
+
+    //添加班组
+    $("#addTeam").click(function(){
+        idUpdate = false;
+        layerUpdateTeam('form-div','班组新增','550px');
+    })

VisualInspection/js/term_management/check_terms_m.js

@@ -0,0 +1,123 @@
+    var team_id;
+    var dept_id = 1;
+    var idUpdate;
+    function queryTable(){
+        var data = {
+            "dept_id":dept_id
+        }
+        var name = $("#select_name").val();
+        if(name!=''){
+            data.name = name ;
+        }
+        var cols = [
+                        {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
+                        {width: 160, text: '班组名称', flex: false,colClass: 'text-center',field:'name'},
+                        {width: 80, text: '所属人员分类',  flex: true, colClass: 'text-center',field:'type'},
+                        {width: 80, text: '班长', type: 'date', flex: false, sort: 'down',field:''},
+                        {width: 80, text: '副班长', type: 'string', flex: true, colClass: '',field:''},
+                        {width: 80, text: '人员',  flex: false, colClass: 'text-center',field:'user_ids'},
+                        {width: 50, text: '操作',  flex: false, colClass: 'text-center',field:'id',oper:[
+                            {func:'updateCheckTeam',text:'修改',col_class:'icon-edit'},{func:'deleteCheckTeam',text:'删除',col_class:'icon-remove-circle'}
+                        ]},
+                    ] ;
+        
+        $('.datatable').mytable({'cols':cols,
+                                'url':"team/getTeamByName",
+                                'param':data}
+                                );
+    }
+    function deleteCheckTeam(id){
+        deleteItem4Common(id,"team/delete",queryTable);
+    }
+     $(document).ready(function() {
+         queryTable();
+    })
+    function updateCheckTeam(id){
+        team_id = id;
+        data = {
+            "id":id
+        }
+        post_common_service("team/getTeamById", data, function(data){
+            $("#monitor").empty();
+            $("#second-monitor").empty();
+            $("#member").empty();
+            $("#team_name").val(data.name);
+            users = data.user_ids.split(",");
+            for(i=0;i<users.length;i++){
+                $("#monitor").append('<option>'+users[i]+'</option>');
+                $("#second-monitor").append('<option>'+users[i]+'</option>');
+                $("#member").append('<div style="width:83px;float:left;">\
+                                         <input type="checkbox" value="'+users[i]+'"><span>'+users[i]+'</span>\
+                                     </div>');
+            }
+            idUpdate = true;
+            layerUpdateTeam('form-div','班组修改','550px');
+        }, function(){
+
+        });
+        
+    }
+    function layerUpdateTeam(domId,title,area){
+        layer.open({
+            type: 1,
+            title: false,
+            closeBtn: 1,
+            title:title,
+            shadeClose: true,
+            skin: 'yourclass',
+            area:area,
+            content: $("#"+domId)
+        });
+    }
+    //关闭弹窗
+    $("#close-layer").click(function(){
+        layer.closeAll();
+    })
+    //保存修改或添加
+    $("#save-team").click(function(){
+        var user_ids = "";
+         $.each($('input:checkbox'),function(){
+                if(this.checked){
+                    user_ids = user_ids +　$(this).val() + ",";
+                }
+        });
+        if(user_ids != ""){
+            user_ids = user_ids.substring(0,user_ids.length-1);
+        }else{
+            // layer.msg('请选择人员');
+            // return;
+        }
+        data = {
+            "id":team_id,
+            "dept_id":dept_id,
+            "name":$("#team_name").val(),
+            "user_ids":user_ids,
+            "type":2
+        }
+        if(idUpdate){
+            post_common_service("team/update", data, function(data){
+                layer.closeAll();
+                queryTable();
+            }, function(){
+
+            });
+        }else{
+            post_common_service("team/add", data, function(data){
+                layer.closeAll();
+                queryTable();
+            }, function(){
+
+            });
+        }
+    })
+
+    //条件查询
+    $("#conditional_query").click(function(){
+        queryTable();
+    })
+
+    //添加班组
+    $("#addTeam").click(function(){
+        idUpdate = false;
+        layerUpdateTeam('form-div','班组新增','550px');
+    })

VisualInspection/view/term_management/charge_terms_m.html

@@ -6,17 +6,17 @@
                 <div class="form-group">
                     <label for="exampleInputAccount1" class="col-sm-1">关键词</label>
                     <div class="col-sm-2">
-                        <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
+                        <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词" id="select_name">
                     </div>
 
                     <div class="col-xs-3">
                         <div class="input-group">
-                            <button class="btn btn-primary " type="button">查询</button>
+                            <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
                         </div>
-                    </div>    
+                    </div>
 
                      <div style="float:right;margin-right:30px;">
-                        <button class="btn btn-primary" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 增加班组</button>
+                        <button class="btn btn-primary" type="button" id="addTeam"><i class="icon icon-plus-sign"></i> 增加班组</button>
                     </div>
 
                 </div>
@@ -27,48 +27,54 @@
             <!-- 使用一个div来显示数据表格 -->
             <div class="datatable" data-checkable="true" data-sortable="true"></div>
         </div>
-        <div class="row" style="text-align:center">
-            <ul class="pager center-block">
-                <li class="previous"><a href="#">« 上一页</a></li>
-                <li><a href="#">1</a></li>
-                <li class="active"><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li class="next"><a href="#">下一页 »</a></li>
-            </ul>
-        </div>
+        
 
 </div>
 <!--  end -->          
-
-
-<script type="text/javascript">
-     $(document).ready(function() {
-
-         // 使用data参数更新数据：
-        $('.datatable').datatable( {
-            checkable:false,
-            sortable:false,
-            data: {
-                cols: [
-                    {width: 30, text: '序号', type: 'number', flex: false, colClass: 'text-center'},
-                    {width: 160, text: '班组名称', type: 'date', flex: false, sort: 'down'},
-                    {width: 80, text: '所属人员分类', type: 'string', flex: true, colClass: ''},
-                    {width: 80, text: '班长', type: 'date', flex: false, sort: 'down'},
-                    {width: 80, text: '副班长', type: 'string', flex: true, colClass: ''},
-                    {width: 80, text: '人员', type: 'date', flex: false, sort: 'down'},
-                    {width: 80, text: '操作', type: 'string', flex: true, colClass: ''},
-                ],
-                rows: [
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                ]
-            }
-        });
-    })
-</script>
+<div style="display:none;" id="form-div">
+    <div class="layer-content" style="width:100%;height:100%;">
+        <div style="width:350px;overflow:hidden;zoom:1;margin:auto;">
+            <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">班组名称</span>
+                </div>
+                <div style="width:270px;float:left;">
+                    <input class="form-control" id="team_name">
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">班长</span>
+                </div>
+                <div style="width:270px;float:left;">
+                    <select class="form-control" style="width:110px;" id="monitor">
+                        
+                    </select>
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">副班长</span>
+                </div>
+                <div style="width:270px;float:left;">
+                    <select class="form-control" style="width:110px;" id="second-monitor">
+                        
+                    </select>
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">人员</span>
+                </div>
+                <div id="member" style="width:270px;float:left;overflow:hidden;zoom:1;border:1px solid #ccc;border-radius:3px;padding:8px;min-height:50px;">
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="operation" style="width:100%;overflow:hidden;zoom:1;border-top:1px solid #ddd;margin-top:20px;padding:10px 10px 10px 10px;">
+        <button class="btn btn-primary" type="button"  style="float:right;" id="save-team"> 保存</button>
+        <button class="btn btn-primary" type="button" style="float:right;background-color:#fff;color:#333;margin-right:20px;" id="close-layer"> 关闭</button>
+    </div>
+</div>
+<script src="/js/term_management/charge_terms_m.js?_inline"></script>

VisualInspection/view/term_management/check_terms_m.html

@@ -6,17 +6,17 @@
                 <div class="form-group">
                     <label for="exampleInputAccount1" class="col-sm-1">关键词</label>
                     <div class="col-sm-2">
-                        <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
+                        <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词" id="select_name">
                     </div>
 
                     <div class="col-xs-3">
                         <div class="input-group">
-                            <button class="btn btn-primary " type="button">查询</button>
+                            <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
                         </div>
                     </div>
 
                      <div style="float:right;margin-right:30px;">
-                        <button class="btn btn-primary" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 增加班组</button>
+                        <button class="btn btn-primary" type="button"id="addTeam"><i class="icon icon-plus-sign"></i> 增加班组</button>
                     </div>
 
                 </div>
@@ -27,48 +27,57 @@
             <!-- 使用一个div来显示数据表格 -->
             <div class="datatable" data-checkable="true" data-sortable="true"></div>
         </div>
-        <div class="row" style="text-align:center">
-            <ul class="pager center-block">
-                <li class="previous"><a href="#">« 上一页</a></li>
-                <li><a href="#">1</a></li>
-                <li class="active"><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li class="next"><a href="#">下一页 »</a></li>
-            </ul>
+        <div class="">
+            
+
         </div>
 
 </div>
 <!--  end -->          
-
-
-<script type="text/javascript">
-     $(document).ready(function() {
-
-         // 使用data参数更新数据：
-        $('.datatable').datatable( {
-            checkable:false,
-            sortable:false,
-            data: {
-                cols: [
-                    {width: 30, text: '序号', type: 'number', flex: false, colClass: 'text-center'},
-                    {width: 160, text: '班组名称', type: 'date', flex: false, sort: 'down'},
-                    {width: 80, text: '所属人员分类', type: 'string', flex: true, colClass: ''},
-                    {width: 80, text: '班长', type: 'date', flex: false, sort: 'down'},
-                    {width: 80, text: '副班长', type: 'string', flex: true, colClass: ''},
-                    {width: 80, text: '人员', type: 'date', flex: false, sort: 'down'},
-                    {width: 80, text: '操作', type: 'string', flex: true, colClass: ''},
-                ],
-                rows: [
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                ]
-            }
-        });
-    })
-</script>
+<div style="display:none;" id="form-div">
+    <div class="layer-content" style="width:100%;height:100%;">
+        <div style="width:350px;overflow:hidden;zoom:1;margin:auto;">
+            <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">班组名称</span>
+                </div>
+                <div style="width:270px;float:left;">
+                    <input class="form-control" id="team_name">
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">班长</span>
+                </div>
+                <div style="width:270px;float:left;">
+                    <select class="form-control" style="width:110px;" id="monitor">
+                        
+                    </select>
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">副班长</span>
+                </div>
+                <div style="width:270px;float:left;">
+                    <select class="form-control" style="width:110px;" id="second-monitor">
+                        
+                    </select>
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">人员</span>
+                </div>
+                <div id="member" style="width:270px;float:left;overflow:hidden;zoom:1;border:1px solid #ccc;border-radius:3px;padding:8px;min-height:50px;">
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="operation" style="width:100%;overflow:hidden;zoom:1;border-top:1px solid #ddd;margin-top:20px;padding:10px 10px 10px 10px;">
+        <button class="btn btn-primary" type="button"  style="float:right;" id="save-team"> 保存</button>
+        <button class="btn btn-primary" type="button" style="float:right;background-color:#fff;color:#333;margin-right:20px;" id="close-layer"> 关闭</button>
+    </div>
+</div>
+<script src="/js/term_management/check_terms_m.js?_inline"></script>

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

@@ -22,4 +22,6 @@ public class Team {
     private Long dept_id;
     //人员ids
     private String user_ids;
+    //分类
+    private Long type;
 }

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

@@ -5,10 +5,13 @@ import java.util.List;
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.Team;
 import com.xintong.visualinspection.service.TeamService;
@@ -87,12 +90,24 @@ public class TeamController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/getTeamByDeptId")
-    public String getTeamByDeptId(@RequestBody Team team){
+    @RequestMapping(value = "/getTeamByDeptId/{page}/{size}")
+    public String getTeamByDeptId(@RequestBody Team team,@PathVariable Integer page,@PathVariable Integer size){
     	if(team.getDept_id()==null){
     		throw new BusinessException(20901);
     	}
+    	PageHelper.startPage(page, size);
     	List<Team> teamList = teamService.getByDeptId(team.getDept_id());
-    	return super.returnSuccessResult(teamList);
+//    	return super.returnSuccessResult(teamList);
+    	return super.returnSuccessResult(new PageInfo(teamList));
+    }
+    
+    @RequestMapping(value = "/getTeamByName/{page}/{size}")
+    public String getTeamByName(@RequestBody Team team,@PathVariable Integer page,@PathVariable Integer size){
+//    	if(team.getDept_id()==null){
+//    		throw new BusinessException(20901);
+//    	}
+    	PageHelper.startPage(page, size);
+    	List<Team> teamList = teamService.getTeamByName(team);
+    	return super.returnSuccessResult(new PageInfo(teamList));
     }
 }

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

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

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

@@ -24,22 +24,31 @@
         FROM sys_team
         WHERE dept_id = #{dept_id}
     </select>
+    
+    <select id="getTeamByName" parameterType="com.xintong.visualinspection.bean.Team" resultMap="BaseResultMap" >
+        SELECT *
+        FROM sys_team
+        WHERE 1=1 
+        <if test="dept_id != null">AND dept_id = #{dept_id}</if>
+        <if test="name != null and name != ''">AND name like CONCAT('%',#{name},'%') </if>
+        <if test="type != null">AND type = #{type}</if>
+    </select>
 
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.Team" >
         INSERT INTO
         sys_team
-        (name,dept_id,user_ids)
+        (name,dept_id,user_ids,type)
         VALUES
-        (#{name}, #{dept_id},#{user_ids})
+        (#{name}, #{dept_id},#{user_ids},#{type})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.Team" >
         UPDATE
         sys_team
         SET
-        <if test="name != null">name = #{name},</if>
-        <if test="dept_id != null">dept_id = #{dept_id},</if>
-        <if test="user_ids != null">user_ids = #{user_ids}</if>
+        <if test="name != null">name = #{name}</if>
+        <if test="dept_id != null">,dept_id = #{dept_id}</if>
+        <if test="user_ids != null">,user_ids = #{user_ids}</if>
         WHERE
         id = #{id}
     </update>

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

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

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

@@ -67,4 +67,11 @@ public class TeamServiceImpl extends BaseService implements TeamService {
 		teamDao.delete(id);
 	}
 
+
+	@Override
+	public List<Team> getTeamByName(Team team) {
+		// TODO Auto-generated method stub
+		return teamDao.getTeamByName(team);
+	}
+
 }