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

# Conflicts:
#	VisualInspection/view/mytask/check.html

VisualInspection/js/appeal_management/appeal_list.js

@@ -6,6 +6,14 @@ $(document).ready(function(){
         if(name!=''){
             data.name = name ;
         }
+        var start_time = $("#start-time").val();
+        var end_time = $("#end-time").val();
+        if(start_time != ''){
+            data.start_time = start_time;
+        }
+        if(end_time != ''){
+            data.end_time = end_time;
+        }
         var cols = [
                         {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
                         {width: 100, text: '任务名称', flex: false,colClass: '',field:'name'},
@@ -25,6 +33,10 @@ $(document).ready(function(){
                                 'param':data}
                                 );
     }
+    //条件查询
+    $("#conditional_query").click(function(){
+        queryTable();
+    })
 
 
 })

VisualInspection/js/main.js

@@ -125,8 +125,15 @@ function getPageInfo(id) {
 
 }
 
+
 function changePage(url) {
     if (typeof(url) != "undefined") {
+        CURRENT_PAGE_URL=url;
         $("#main_content").load(base_ui_url + url);
+
+        event = document.createEvent('MessageEvent');
+		var origin = window.location.protocol + '//' + window.location.host;
+		event.initMessageEvent ('changepage', true, true, CURRENT_PAGE_URL, origin, 1234, window, null);
+		document.dispatchEvent (event);
     }
 }

VisualInspection/js/term_management/charge_terms_m.js

@@ -37,25 +37,36 @@
     }
      $(document).ready(function() {
          queryTable();
+         getUser();
     })
+    function getUser(){
+        data ={}
+        post_common_service("user/getUserList", data, function(data){
+            $("#team_name").val("");
+            $("#monitor").empty();
+            $("#second-monitor").empty();
+            $("#member").empty();
+            for(i=0;i<data.length;i++){
+                console.log(data[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>\
+                                     </div>');
+            }
+        }, function(){
+
+        });
+    }
     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 value="'+users[i]+'">'+users[i]+'</option>');
-                $("#second-monitor").append('<option value="'+users[i]+'">'+users[i]+'</option>');
-                $("#member").append('<div style="width:83px;float:left;">\
-                                         <input type="checkbox" value="'+users[i]+'"><span>'+users[i]+'</span>\
-                                     </div>');
-            }
+            $("#monitor").val(data.monitor);
+            $("#second-monitor").val(data.sub_monitor);
             idUpdate = true;
             layerUpdateTeam('form-div','班组修改','550px');
         }, function(){

VisualInspection/js/term_management/check_terms_m.js

@@ -22,7 +22,7 @@
                         {width: 80, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor'},
                         {width: 80, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor'},
                         {width: 80, text: '人员',  flex: false, colClass: '',field:'user_ids'},
-                        {width: 50, text: '操作',  flex: false, colClass: '',field:'task_id',oper:[
+                        {width: 50, text: '操作',  flex: false, colClass: '',field:'id',oper:[
                             {func:'updateCheckTeam',text:'修改',col_class:'icon-edit'},{func:'deleteCheckTeam',text:'删除',col_class:'icon-remove-circle'}
                         ]},
                     ] ;
@@ -37,25 +37,36 @@
     }
      $(document).ready(function() {
          queryTable();
+         getUser();
     })
+    function getUser(){
+        data ={}
+        post_common_service("user/getUserList", data, function(data){
+            $("#team_name").val("");
+            $("#monitor").empty();
+            $("#second-monitor").empty();
+            $("#member").empty();
+            for(i=0;i<data.length;i++){
+                console.log(data[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>\
+                                     </div>');
+            }
+        }, function(){
+
+        });
+    }
     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 value="'+users[i]+'">'+users[i]+'</option>');
-                $("#second-monitor").append('<option value="'+users[i]+'">'+users[i]+'</option>');
-                $("#member").append('<div style="width:83px;float:left;">\
-                                         <input type="checkbox" value="'+users[i]+'"><span>'+users[i]+'</span>\
-                                     </div>');
-            }
+            $("#monitor").val(data.monitor);
+            $("#second-monitor").val(data.sub_monitor);
             idUpdate = true;
             layerUpdateTeam('form-div','班组修改','550px');
         }, function(){

VisualInspection/js/user/addUser.js

@@ -41,6 +41,9 @@ function resetform() {
     $("#user_idno").val("")
     $("#user_email").val("")
 
+    $("#user_img_add").addClass("hide");
+    $("#user_img_pre").removeClass("hide");
+
 }
 
 function initUserInfo() {

VisualInspection/js/user/userManager.js

@@ -48,6 +48,7 @@
      colClass: 'text-center'
  }];
  $(document).ready(function() {
+     alert("asdsa")
 
      $("#main_content_title").html("用户管理")
 
@@ -265,10 +266,12 @@
                              attr += at.authority;
                          }
                      }
+
+                     console.log(user.username + "..." + user.truename + '...' + user.workno + "..." + user.mobile + "..." + attr + "..." + user.id)
                      UserMap.set(user.id, user)
                      var userdata = {};
                      userdata["checked"] = false;
-                     userdata["data"] = [i + 1, user.username, user.truename, user.workno == null ? -1 : user.workno, user.mobile, attr, '<button class="btn btn-primary" name="user_edit" id=' + user.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + user.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
+                     userdata["data"] = [i + 1, user.username, user.truename, user.workno == null ? -1 : user.workno, user.mobile == null ? "" : user.mobile, attr, '<button class="btn btn-primary" name="user_edit" id=' + user.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + user.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
                      rowdata.push(userdata);
                  }
              }

VisualInspection/js/util/const.js

@@ -23,4 +23,7 @@ var DEPT_DELETE = "/dept/deleteDept/"
 
 
 //File
-var FILE_UPLOAD = "/file/upload"
+var FILE_UPLOAD = "/file/upload"
+
+
+var CURRENT_PAGE_URL="-1";

VisualInspection/view/appeal_management/appeal_list.html

@@ -18,7 +18,7 @@
                         </select>
                     </div>
                     <div class="col-sm-2">
-                        <button class="btn btn-primary " type="button">查询</button>
+                        <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
                     </div>
                 </div>
             </form>

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

@@ -40,12 +40,8 @@ public class CheckAppeal {
     //任务名称
     private String name;
     //任务开始时间
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date start_time;
     //任务结束时间
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date end_time;
     
 }

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

@@ -28,4 +28,9 @@ public class Team {
     private Integer monitor;
     //副班长
     private Integer sub_monitor;
+    
+    private String monitor_name;
+    
+    private String sub_monitor_name;
+    
 }

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

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.validation.Valid;
@@ -83,9 +84,9 @@ public class CheckAppealController extends BaseController {
     }
     
     @RequestMapping(value = "/getList/{page}/{size}")
-    public String getList(@PathVariable Integer page,@PathVariable Integer size){
+    public String getList(@RequestBody CheckAppeal param ,@PathVariable Integer page,@PathVariable Integer size){
     	PageHelper.startPage(page, size);
-    	List<CheckAppeal> checkAppeal =  checkAppealService.getList() ;
+    	List<CheckAppeal> checkAppeal =  checkAppealService.getList(param) ;
     	return super.returnSuccessResult(new PageInfo(checkAppeal));
     }
     

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

@@ -103,9 +103,6 @@ public class TeamController extends BaseController {
     
     @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/CheckAppealDao.java

@@ -12,7 +12,7 @@ import com.xintong.visualinspection.bean.CheckAppeal;
  */
 @Mapper
 public interface CheckAppealDao  {
-    public List<CheckAppeal> getList();
+    public List<CheckAppeal> getList(CheckAppeal param);
     public CheckAppeal getOne(Long id);
     public void insert(CheckAppeal checkAppeal);
     public void update(CheckAppeal checkAppeal);

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

@@ -43,6 +43,7 @@
         <if test="username != null">username = #{username},</if>
         <if test="age != null">age = #{age},</if>
         <if test="password != null">password = #{password},</if>
+        <if test="pic != null">pic = #{pic},</if>
         id = #{id}
         WHERE
         id = #{id}

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

@@ -19,8 +19,14 @@
         <result column="end_time" property="end_time" jdbcType="DATE" />
     </resultMap>
 
-    <select id="getList" resultMap="BaseResultMap"  >
-        SELECT ca.*,ct.name,ct.start_time,ct.end_time FROM check_appeal ca LEFT JOIN check_task ct ON ca.task_id=ct.id ORDER BY ca.appeal_time DESC
+    <select id="getList" resultMap="BaseResultMap" parameterType="com.xintong.visualinspection.bean.CheckAppeal" >
+        SELECT ca.*,ct.name,ct.start_time,ct.end_time FROM check_appeal ca LEFT JOIN check_task ct ON ca.task_id=ct.id 
+        WHERE 1=1 
+        <if test="start_time != null">AND ct.start_time >= #{start_time}</if>
+        <if test="end_time != null">
+        	<![CDATA[ AND ct.end_time < #{end_time}]]>
+        </if>
+        ORDER BY ca.appeal_time DESC
     </select>
 
     <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
@@ -41,7 +47,7 @@
         UPDATE
         check_appeal
         SET
-        <if test="check_status != null">check_status = #{check_status},</if>
+        <if test="check_status != null">check_status = #{check_status}</if>
         WHERE
         id = #{id}
     </update>

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

@@ -17,7 +17,7 @@ import com.xintong.visualinspection.bean.CheckAppeal;
  *
  */
 public interface CheckAppealService {
-    public List<CheckAppeal> getList();
+    public List<CheckAppeal> getList(CheckAppeal param);
     public CheckAppeal getById(Long id);
     public void insert(CheckAppeal checkAppeal);
     public void update(CheckAppeal checkAppeal);

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

@@ -27,8 +27,8 @@ public class CheckAppealServiceImpl extends BaseService implements CheckAppealSe
 
 
 	@Override
-	public List<CheckAppeal> getList() {
-		List<CheckAppeal> list = checkAppealDao.getList();
+	public List<CheckAppeal> getList(CheckAppeal param) {
+		List<CheckAppeal> list = checkAppealDao.getList(param);
 		return list ;
 	}