人员班组管理，优化

VisualInspection/js/lib/mytable.js

@@ -70,6 +70,11 @@
                     }   
                     obj.setPager();
                 }
+                if(data.list.length<=0){
+                    $("#kkpager").css("display","none");
+                }else{
+                    $("#kkpager").css("display","block");
+                }
             }, function(error) {
                 alert(error);
             });

VisualInspection/js/term_management/charge_terms_m.js

@@ -1,10 +1,14 @@
- var team_id;
-    var dept_id = 12;
+    var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
+    var dept_id=user.organid;
+    var team_id;
     var idUpdate;
+    var type = 1;
+    var organid = user.organid;
     function queryTable(){
         var data = {
             "dept_id":dept_id
         }
+        data.type = type;
         var name = $("#select_name").val();
         if(name!=''){
             data.name = name ;
@@ -40,7 +44,9 @@
          getUser();
     })
     function getUser(){
-        data ={}
+        data ={
+            "organid":organid
+        }
         post_common_service("user/getUserList", data, function(data){
             $("#team_name").val("");
             $("#monitor").empty();
@@ -49,8 +55,8 @@
             for(i=0;i<data.length;i++){
                 $("#monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
                 $("#second-monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
-                $("#member").append('<div style="width:83px;float:left;">\
-                                         <input type="checkbox" value="'+data[i].id+'"><span>'+data[i].truename+'</span>\
+                $("#member").append('<div style="width:78px;float:left;">\
+                                         <input type="checkbox" value="'+data[i].id+'" name="chkItem"><span>'+data[i].truename+'</span>\
                                      </div>');
             }
         }, function(){
@@ -84,6 +90,7 @@
             area:area,
             content: $("#"+domId)
         });
+        $("[name = chkItem]:checkbox").attr("checked", false);
     }
     //关闭弹窗
     $("#close-layer").click(function(){
@@ -100,15 +107,15 @@
         if(user_ids != ""){
             user_ids = user_ids.substring(0,user_ids.length-1);
         }else{
-            // layer.msg('请选择人员');
-            // return;
+            layer.msg('请选择人员');
+            return;
         }
         data = {
             "id":team_id,
             "dept_id":dept_id,
             "name":$("#team_name").val(),
             "user_ids":user_ids,
-            "type":1,
+            "type":type,
             "monitor":$("#monitor").val(),
             "sub_monitor":$("#second-monitor").val()
         }

VisualInspection/js/term_management/check_terms_m.js

@@ -1,10 +1,14 @@
+    var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
+    var dept_id = user.organid;
     var team_id;
-    var dept_id = 1;
+    var type = 2;
     var idUpdate;
+    var organid = user.organid;
     function queryTable(){
         var data = {
             "dept_id":dept_id
         }
+        data.type = type;
         var name = $("#select_name").val();
         if(name!=''){
             data.name = name ;
@@ -40,7 +44,9 @@
          getUser();
     })
     function getUser(){
-        data ={}
+        data ={
+            "organid":organid
+        }
         post_common_service("user/getUserList", data, function(data){
             $("#team_name").val("");
             $("#monitor").empty();
@@ -49,8 +55,8 @@
             for(i=0;i<data.length;i++){
                 $("#monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
                 $("#second-monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
-                $("#member").append('<div style="width:83px;float:left;">\
-                                         <input type="checkbox" value="'+data[i].id+'"><span>'+data[i].truename+'</span>\
+                $("#member").append('<div style="width:78px;float:left;">\
+                                         <input type="checkbox" value="'+data[i].id+'" name="chkItem"><span>'+data[i].truename+'</span>\
                                      </div>');
             }
         }, function(){
@@ -66,6 +72,15 @@
             $("#team_name").val(data.name);
             $("#monitor").val(data.monitor);
             $("#second-monitor").val(data.sub_monitor);
+            var ids = data.user_ids.split(",");
+            // for(i=0;i<ids.length;i++){
+            //     console.log(ids[i])
+            //     $("input[name='chkItem']:checkbox").each(function(){ 
+            //         if($(this).attr('value') == ids[i]){
+            //             $(this).prop("checked", true);
+            //         }
+            //     });
+            // }
             idUpdate = true;
             layerUpdateTeam('form-div','班组修改','550px');
         }, function(){
@@ -84,6 +99,7 @@
             area:area,
             content: $("#"+domId)
         });
+        $("[name = chkItem]:checkbox").attr("checked", false);
     }
     //关闭弹窗
     $("#close-layer").click(function(){
@@ -108,7 +124,7 @@
             "dept_id":dept_id,
             "name":$("#team_name").val(),
             "user_ids":user_ids,
-            "type":2,
+            "type":type,
             "monitor":$("#monitor").val(),
             "sub_monitor":$("#second-monitor").val()
         }

VisualInspection/view/term_management/charge_terms_m.html

@@ -66,7 +66,7 @@
                 <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 id="member" style="width:270px;float:left;overflow:hidden;zoom:1;border:1px solid #ccc;border-radius:3px;padding:8px;min-height:50px;max-height: 110px;overflow-y: auto;">
                     
                 </div>
             </div>

VisualInspection/view/term_management/check_terms_m.html

@@ -69,7 +69,7 @@
                 <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 id="member" style="width:270px;float:left;overflow:hidden;zoom:1;border:1px solid #ccc;border-radius:3px;padding:8px;min-height:50px;max-height: 110px;overflow-y: auto;">
                     
                 </div>
             </div>

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

@@ -54,4 +54,6 @@ public class CheckAppeal {
     //申诉状态
     private String code_name;
     
+    private String code_flag;
+    
 }

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

@@ -86,6 +86,7 @@ public class CheckAppealController extends BaseController {
     @RequestMapping(value = "/getList/{page}/{size}")
     public String getList(@RequestBody CheckAppeal param ,@PathVariable Integer page,@PathVariable Integer size){
     	PageHelper.startPage(page, size);
+    	param.setCode_flag("task_status");
     	List<CheckAppeal> checkAppeal =  checkAppealService.getList(param) ;
     	return super.returnSuccessResult(new PageInfo(checkAppeal));
     }

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

@@ -19,12 +19,13 @@
         <result column="end_time" property="end_time" jdbcType="DATE" />
         
         <result column="code_name" property="code_name" jdbcType="VARCHAR" />
+        <result column="code_flag" property="code_flag" jdbcType="VARCHAR" />
     </resultMap>
 
     <select id="getList" resultMap="BaseResultMap" parameterType="com.xintong.visualinspection.bean.CheckAppeal" >
         SELECT ca.*,ct.name,ct.start_time,ct.end_time,sc.code_name FROM check_appeal ca LEFT JOIN check_task ct ON ca.task_id=ct.id 
         LEFT JOIN sys_code sc ON ca.check_status=sc.code_value
-        WHERE 1=1 
+        WHERE 1=1 AND sc.code_flag=#{code_flag} 
         <if test="start_time != null">AND ct.start_time >= #{start_time}</if>
         <if test="end_time != null">
         	<![CDATA[ AND ct.end_time < #{end_time}]]>

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

@@ -36,20 +36,20 @@ public class CheckAppealServiceImpl extends BaseService implements CheckAppealSe
 	}
 	public List<CheckAppeal> getList(List<CheckAppeal> checkAppeallist){
 		for (CheckAppeal checkAppeal : checkAppeallist) {
-			if(CacheUtil.userMap.get(checkAppeal.getAppeal_man().intValue())==null){
+			if(CacheUtil.userMap.get(checkAppeal.getAppeal_man().longValue())==null){
 				checkAppeal.setAppeal_man_name("-");
 			}else{
-				checkAppeal.setAppeal_man_name(CacheUtil.userMap.get(checkAppeal.getAppeal_man().intValue()).getTruename());
+				checkAppeal.setAppeal_man_name(CacheUtil.userMap.get(checkAppeal.getAppeal_man().longValue()).getTruename());
 			}
-			if(CacheUtil.userMap.get(checkAppeal.getVerify_person().intValue())==null){
+			if(CacheUtil.userMap.get(checkAppeal.getVerify_person().longValue())==null){
 				checkAppeal.setVerify_person_name("-");
 			}else{
-				checkAppeal.setVerify_person_name(CacheUtil.userMap.get(checkAppeal.getVerify_person().intValue()).getTruename());
+				checkAppeal.setVerify_person_name(CacheUtil.userMap.get(checkAppeal.getVerify_person().longValue()).getTruename());
 			}
-			if(CacheUtil.deptMap.get(checkAppeal.getAppeal_dept().intValue())==null){
+			if(CacheUtil.deptMap.get(checkAppeal.getAppeal_dept().longValue())==null){
 				checkAppeal.setAppeal_dept_name("-");
 			}else{
-				checkAppeal.setAppeal_dept_name(CacheUtil.deptMap.get(checkAppeal.getAppeal_dept().intValue()).getOrganname());
+				checkAppeal.setAppeal_dept_name(CacheUtil.deptMap.get(checkAppeal.getAppeal_dept().longValue()).getOrganname());
 			}
 		}
 		return checkAppeallist;

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

@@ -84,20 +84,20 @@ public class TeamServiceImpl extends BaseService implements TeamService {
 	
 	public List<Team> getList(List<Team> teamlist){
 		for (Team team : teamlist) {
-			if(CacheUtil.userMap.get(team.getMonitor().intValue()) == null){
+			if(CacheUtil.userMap.get(team.getMonitor().longValue()) == null){
 				team.setMonitor_name("-");
 			}else{
-				team.setMonitor_name(CacheUtil.userMap.get(team.getMonitor().intValue()).getTruename());
+				team.setMonitor_name(CacheUtil.userMap.get(team.getMonitor().longValue()).getTruename());
 			}
-			if(CacheUtil.userMap.get(team.getSub_monitor().intValue())==null){
+			if(CacheUtil.userMap.get(team.getSub_monitor().longValue())==null){
 				team.setSub_monitor_name("-");
 			}else{
-				team.setSub_monitor_name(CacheUtil.userMap.get(team.getSub_monitor().intValue()).getTruename());
+				team.setSub_monitor_name(CacheUtil.userMap.get(team.getSub_monitor().longValue()).getTruename());
 			}
 			String[] user_ids = team.getUser_ids().split(",");
 			String user_ids_name = "";
 			for(int i=0;i<user_ids.length;i++){
-				if(CacheUtil.userMap.get(Integer.valueOf(user_ids[i]))==null){
+				if(CacheUtil.userMap.get(Long.valueOf(user_ids[i]))==null){
 					if(i == 0){
 						user_ids_name = user_ids_name + "-";
 					}else{
@@ -105,9 +105,9 @@ public class TeamServiceImpl extends BaseService implements TeamService {
 					}
 				}else{
 					if(i==0){
-						user_ids_name = user_ids_name + CacheUtil.userMap.get(Integer.valueOf(user_ids[i])).getTruename();
+						user_ids_name = user_ids_name + CacheUtil.userMap.get(Long.valueOf(user_ids[i])).getTruename();
 					}else{
-						user_ids_name = user_ids_name + "、" + CacheUtil.userMap.get(Integer.valueOf(user_ids[i])).getTruename();
+						user_ids_name = user_ids_name + "、" + CacheUtil.userMap.get(Long.valueOf(user_ids[i])).getTruename();
 					}
 				}
 			}