后台逻辑

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

@@ -20,6 +20,8 @@ public class Task{
     private String name;
     //审核状态
     private Integer check_status;
+    //审核状态(用作搜索条件使用)
+    private Integer check_status_end;
     //更新后的值
     private Integer update_check_status;
     //审核状态
@@ -43,6 +45,8 @@ public class Task{
     //考核人员ids
     private Long checkman;
     private String checkman_name;
+    private Long recheckman;
+    private String recheckman_name;
     //被考核人员id
     private Long checked_person;
     private String checked_person_name;

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

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19,6 +20,7 @@ import com.xintong.visualinspection.bean.Task;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.CheckAppealService;
 import com.xintong.visualinspection.service.TaskService;
+import com.xintong.visualinspection.util.AuthorUtil;
 import com.xintong.visualinspection.util.Constants;
 
 /**
@@ -47,17 +49,21 @@ public class CheckAppealController extends BaseController {
 //		if(ca!=null) {
 //			throw new BusinessException(21201);
 //		}
-		
-    	User u = getCurrentUser(request);
-    	checkAppeal.setAppeal_man(new Long(u.getId()));
-    	checkAppeal.setCheck_status(Constants.STATUS_APPEALING);
-    	if(u.getOrganid()!=null)
-    		checkAppeal.setAppeal_dept(new Long(u.getOrganid()));
-    	checkAppealService.insert(checkAppeal);
-    	Task task = taskService.getById(checkAppeal.getTask_id());
-    	task.setCheck_status(checkAppeal.getCheck_status());
-    	taskService.update(task);
-    	return super.returnSuccessResult("添加成功");
+    	CheckAppeal ca = checkAppealService.getByTaskId(checkAppeal.getTask_id());
+    	if(ca==null){
+    		User u = getCurrentUser(request);
+    		checkAppeal.setAppeal_man(new Long(u.getId()));
+    		checkAppeal.setCheck_status(Constants.STATUS_APPEALING);
+    		if(u.getOrganid()!=null)
+    			checkAppeal.setAppeal_dept(new Long(u.getOrganid()));
+    		checkAppealService.insert(checkAppeal);
+    		Task task = taskService.getById(checkAppeal.getTask_id());
+    		task.setCheck_status(checkAppeal.getCheck_status());
+    		taskService.update(task);
+    		return super.returnSuccessResult("添加成功");
+    	}else{
+    		throw new BusinessException(21401);
+    	}
     }
     
     /**
@@ -100,6 +106,20 @@ public class CheckAppealController extends BaseController {
     	return super.returnSuccessResult(checkItemOne);
     }
     
+    /**
+     * 根据taskid获取申诉数据
+     * @param checkItem
+     * @return
+     */
+    @RequestMapping(value = "/getByTaskId")
+    public String getByTaskId(@RequestBody CheckAppeal checkAppeal){
+    	if(checkAppeal.getTask_id()==null){
+    		throw new BusinessException(20002);
+    	}
+    	CheckAppeal checkItemOne =  checkAppealService.getByTaskId(checkAppeal.getTask_id()) ;
+    	return super.returnSuccessResult(checkItemOne);
+    }
+    
     @RequestMapping(value = "/getList/{page}/{size}")
     public String getList(@RequestBody CheckAppeal param ,@PathVariable Integer page,@PathVariable Integer size){
     	PageHelper.startPage(page, size);
@@ -108,5 +128,25 @@ public class CheckAppealController extends BaseController {
     	return super.returnSuccessResult(new PageInfo(checkAppeal));
     }
     
-    
+    /**
+     * 通过多条件获取考核任务
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getTaskList/{page}/{size}")
+    public String getTaskList(HttpServletRequest request, @PathVariable Integer page,@PathVariable Integer size, @RequestBody Task task){
+    	PageHelper.startPage(page, size); 
+    	User user = getCurrentUser(request);
+    	if(AuthorUtil.hasRole(user, Constants.ROLE_STATION_ADMIN)
+    			||AuthorUtil.hasRole(user, Constants.ROLE_STATION)){
+    		task.setChecked_dept((long)user.getOrganid());
+    	}else if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA)){
+    		task.setRecheckman(new Long(user.getId()));
+    	}
+    	List<Task> taskList = taskService.getTaskList(task);
+    	if(taskList==null) return super.returnSuccessResult(new PageInfo(new ArrayList()));
+    	return super.returnSuccessResult(new PageInfo(taskList));
+    }
 }

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

@@ -177,7 +177,15 @@ public class UserController extends BaseController {
     	return returnResult(0, "获取成功", u);
     }
     
-    
+    @RequestMapping(value = "/getAllCheckman",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String getAllCheckman(){
+        try{
+        	List<User> users= userService.getAllCheckmans();
+        	return returnResult(0, "获取成功", users);
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
     
 
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/UserInfoDao.java

@@ -18,4 +18,5 @@ public interface UserInfoDao {
     public void update(User user);
     public void delete(Integer id);
     public User findByUserName(String username);
+    public List<User> getAllCheckmans();
 }

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

@@ -17,4 +17,5 @@ public interface CheckAppealDao  {
     public void insert(CheckAppeal checkAppeal);
     public void update(CheckAppeal checkAppeal);
     public void delete(Long id);
+    public CheckAppeal getByTaskId(Long id);
 }

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

@@ -17,6 +17,7 @@ public interface TaskDao  {
     public Task getOne(Long id);
     public List<Task> getList(Task task);
     public List<Task> getListByChecked(Task task);
+    public List<Task> getListBySubmited(Task task);
     public void insert(Task task);
     public void insertStatus(TaskStatus taskStatus);
     public void update(Task task);

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

@@ -81,5 +81,9 @@
         <if test="teamid != null and teamid != 0">and teamid = #{teamid} </if>
         
     </select>
-    
+    <select id="getAllCheckmans" parameterType="com.xintong.visualinspection.bean.User" resultMap="BaseResultMap"  >
+        SELECT *
+        FROM t_sys_users
+        where organid=29 and status>0 and positionid = 2
+    </select>
 </mapper>

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

@@ -50,6 +50,12 @@
         WHERE id = #{id}
     </select>
     
+    <select id="getByTaskId" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+        SELECT *
+        FROM check_appeal
+        WHERE task_id = #{task_id}
+    </select>
+    
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.CheckAppeal" >
         INSERT INTO
         check_appeal

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

@@ -25,6 +25,7 @@
          <if test="type != null and type != 0">and type = #{type}</if>
          <if test="sortNo != null and sortNo != 0">and sortNo = #{sortNo}</if>
          <if test="status != null">and status = #{status}</if>
+         order by sortNo,id
     </select>
     
 	<select id="getMenuByParent" parameterType="com.xintong.visualinspection.bean.Menu" resultMap="BaseResultMap">
@@ -33,6 +34,7 @@
          FROM sys_menu
          where status!=-1
          <if test="parentId != null and parentId != 0">and (parentId = #{parentId} or id = #{parentId})</if>
+    	order by sortNo,id
     </select>
     
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.Menu" >

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

@@ -12,6 +12,7 @@
         <result column="start_time" property="start_time" jdbcType="VARCHAR" />
         <result column="end_time" property="end_time" jdbcType="VARCHAR" />
         <result column="checkman" property="checkman" jdbcType="INTEGER" />
+        <result column="recheckman" property="recheckman" jdbcType="INTEGER" />
         <result column="checked_person" property="checked_person" jdbcType="INTEGER" />
         <result column="checked_dept" property="checked_dept" jdbcType="INTEGER" />
         <result column="rule_id" property="rule_id" jdbcType="INTEGER" />
@@ -76,6 +77,20 @@
         	<if test="checked_person != null">AND checked_person = #{checked_person}</if>
     </select>
 
+	<select id="getListBySubmited" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
+        SELECT *,
+        	  CONCAT(substr(start_time,1,16),'-',substr(end_time,11,6)) as check_period,
+              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=check_status) as check_status_name
+        FROM check_task
+        WHERE 1=1
+        	<if test="check_status != null">AND check_status >= #{check_status}</if>
+        	<if test="check_status != null">AND check_status &lt;= #{check_status_end}</if>
+        	<if test="start_time != null">AND create_time &gt;= #{start_time}</if>
+        	<if test="end_time != null">AND create_time &lt;= #{end_time}</if>
+        	<if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
+        	<if test="checkman != null">AND checkman = #{checkman}</if>
+        	<if test="checked_person != null">AND checked_person = #{checked_person}</if>
+    </select>
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.Task" >
         INSERT INTO check_task
         (name,check_status,video_id,create_time,update_time,start_time,
@@ -123,6 +138,7 @@
         <if test="start_time != null">start_time = #{start_time},</if>
         <if test="end_time != null">end_time = #{end_time},</if>
         <if test="checkman != null">checkman = #{checkman},</if>
+        <if test="recheckman != null">recheckman = #{recheckman},</if>
         <if test="checked_person != null">checked_person = #{checked_person},</if>
         <if test="checked_dept != null">checked_dept = #{checked_dept},</if>
         <if test="rule_id != null">rule_id = #{rule_id},</if>

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

@@ -3,6 +3,7 @@ package com.xintong.visualinspection.service;
 import java.util.List;
 
 import com.xintong.visualinspection.bean.CheckAppeal;
+import com.xintong.visualinspection.bean.Task;
 
 /**
  * 
@@ -19,6 +20,7 @@ import com.xintong.visualinspection.bean.CheckAppeal;
 public interface CheckAppealService {
     public List<CheckAppeal> getList(CheckAppeal param);
     public CheckAppeal getById(Long id);
+    public CheckAppeal getByTaskId(Long id);    
     public void insert(CheckAppeal checkAppeal);
     public void update(CheckAppeal checkAppeal);
     public void delete(Long id);

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

@@ -20,4 +20,5 @@ public interface UserService extends UserDetailsService {
     public void delete(Integer id);
     public UserDetails loadUserByUsername(String username);
     public int queryCountByJob(User user);
+    public List<User> getAllCheckmans();
 }

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.CheckAppeal;
+import com.xintong.visualinspection.bean.Task;
 import com.xintong.visualinspection.dao.master.CheckAppealDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.CheckAppealService;
@@ -40,7 +41,7 @@ public class CheckAppealServiceImpl extends BaseService implements CheckAppealSe
 			checkAppeal.setVerify_person_name(CacheUtil.getUserTurenameFromMap(checkAppeal.getVerify_person()));
 			checkAppeal.setCheckman_name(CacheUtil.getUserTurenameFromMap(checkAppeal.getCheckman()));
 			checkAppeal.setRecheckman_name(CacheUtil.getUserTurenameFromMap(checkAppeal.getRecheckman()));
-			checkAppeal.setAppeal_dept_name(CacheUtil.getOrgannameFromMap(checkAppeal.getRecheckman()));
+			checkAppeal.setAppeal_dept_name(CacheUtil.getOrgannameFromMap(checkAppeal.getAppeal_dept()));
 		}
 		return checkAppeallist;
 	}
@@ -67,6 +68,10 @@ public class CheckAppealServiceImpl extends BaseService implements CheckAppealSe
 	public void delete(Long id) {
 		checkAppealDao.delete(id);
 	}
-
+	@Override
+	public CheckAppeal getByTaskId(Long id) {
+		// TODO Auto-generated method stub
+		return checkAppealDao.getByTaskId(id);
+	}
 
 }

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

@@ -48,6 +48,8 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 		List<Task> taskList;
 		if(task.getStatus_search_type()!=null && task.getStatus_search_type()==1){
 			taskList = taskDao.getListByChecked(task);
+		}if(task.getStatus_search_type()!=null && task.getStatus_search_type()==2){
+			taskList = taskDao.getListBySubmited(task);
 		}else{
 			taskList = taskDao.getList(task);
 		}
@@ -63,6 +65,7 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 					t.setChecked_dept_name(((Organ)CacheUtil.deptMap.get(t.getChecked_dept())).getOrganname());
 				}
 			}
+			t.setRecheckman_name(CacheUtil.getUserTurenameFromMap(t.getRecheckman()));
 		}
 		return taskList;
 	}

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

@@ -140,5 +140,9 @@ public class UserServiceImpl extends BaseService implements UserService {
 		return 0;
 	}
 
-
+	@Override
+	public List<User> getAllCheckmans() {
+		// TODO Auto-generated method stub
+		return userInfoDao.getAllCheckmans();
+	}
 }

VisualInspection_server/src/main/resources/errcode.properties

@@ -42,6 +42,8 @@
 21201=\u5df2\u63d0\u4ea4\u65e0\u6548\u7533\u8bf7\uff0c\u4e0d\u80fd\u91cd\u590d\u63d0\u4ea4
 #\u6263\u5206\u7ba1\u7406\u9519\u8bef
 21301=
+#\u7533\u8bc9\u7ba1\u7406\u9519\u8bef
+21401=\u5df2\u63d0\u4ea4\u7533\u8bc9\uff0c\u4e0d\u80fd\u91cd\u590d\u63d0\u4ea4