bug

olive-console/src/main/java/com/zrqx/olive/project/service/impl/TeamMemberRelationServiceImpl.java

@@ -81,7 +81,7 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
 					relation.setUploadTime(new Date());
 					relationDao.insert(relation);
 				}else {
-					TeamMemberRelation relation = new TeamMemberRelation();
+					TeamMemberRelation relation = relationDao.selectById(request.getId());
 					relation.setAccountId(request.getAccountId());
 					relation.setRoleName(request.getRoleName());
 					relation.setProjectId(request.getProjectId());

olive-console/src/main/java/com/zrqx/olive/timeApply/dao/TimeApplyChangeDao.java

@@ -19,7 +19,7 @@ import com.zrqx.olive.timeApply.vo.TimeApplyVo;
 
 public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
 
-	String PARAM_VALUE = "select c.id,a.id projectId,a.project,a.name,c.change_time,c.status1 changeStatus1,c.status2 changeStatus2"  
+	String PARAM_VALUE = "select c.id,a.id projectId,a.project,a.name,c.change_time,c.status1,c.status2"  
 						+",DATE_FORMAT(c.create_time,'%Y-%m-%d %H:%i:%s') create_time,DATE_FORMAT(a.start_time,'%Y-%m-%d') start_time,"
 						+ "DATE_FORMAT(a.end_time,'%Y-%m-%d') end_time "
 						+ "from t_statistics_project a left join time_apply_change c on a.id = c.project_id where 1=1 ";
@@ -27,21 +27,21 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
 	@Select("<script>"
 			+ PARAM_VALUE
 			+ " and (c.status1 = '0' or c.status2 = '3') "
-			+ " group by c.id "
+			+ " group by a.id "
 			+ "</script>")
 	List<TimeApplyVo> pageTimeApplyChange1();
 	
 	@Select("<script>"
 			+ PARAM_VALUE
 			+ " and c.status1 = '0' "
-			+ " group by c.id "
+			+ " group by a.id "
 			+ "</script>")
 	List<TimeApplyVo> pageTimeApplyChange2();
 	
 	@Select("<script>"
 			+ PARAM_VALUE
 			+ " and c.status2 = 3 "
-			+ " group by c.id "
+			+ " group by a.id "
 			+ "</script>")
 	List<TimeApplyVo> pageTimeApplyChange3();
 	

olive-console/src/main/java/com/zrqx/olive/timeApply/service/impl/TimeApplyChangeServiceImpl.java

@@ -207,7 +207,8 @@ public class TimeApplyChangeServiceImpl extends ServiceImpl<TimeApplyChangeDao,T
 			PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
 			List<TimeApplyChangeVo> list = new ArrayList<TimeApplyChangeVo>();
 			//获取登录人
-			String value = (String) request.getSession().getAttribute("timeApplyMember");
+			String value = systemAdminResponse.getAccount();
+			
 			if ("0".equals(form.getStatus()) && StringUtils.isNotBlank(value)) {
 				if ("duan".equals(value)) {
 					list = timeApplyChangeMapper.selectTimeApplyChange(form);

olive-console/src/main/java/com/zrqx/olive/ttask/controller/TaskController.java

@@ -266,6 +266,7 @@ public class TaskController {
 		task.setUpdateTime(new Date());
 		task.setCreateTime(new Date());
 		qw.like("id", form.getTaskId());
+		task.setCompleteTime(new Date());
 		taskService.updateById(task);
 		// 保存附件到任务里
 		if (form.getFile() != null) {

olive-console/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java

@@ -179,7 +179,7 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ " AND a.project_id = #{id} "
 			+ "</if>"
 			+ "<if test = 'departmentId!=null and departmentId!=\"\"'> "
-			+ " AND a.department_id = #{id} "
+			+ " AND a.department_id = #{departmentId} "
 			+ "</if>"
 			+ "<if test = 'userId!=null and userId!=\"\"'> "
 			+ " AND a.user_id = #{userId} "
@@ -194,17 +194,15 @@ public interface TaskDao extends BaseMapper<Task> {
 	BigDecimal queryConsume(String id,Integer userId,Integer departmentId,String presale);
 	@Select("<script>"
 			+ " select sum(working_hours) FROM t_task a  where 1=1 "	
+			+ " and (task_status=1 or task_status=2 or task_status=3)"
 			+ "<if test = 'id!=null and id!=\"\"'> "
 			+ " AND a.project_id = #{id} "
-			+ " and (task_status=1 or task_status=2)"
 			+ "</if>"
 			+ "<if test = 'departmentId!=null and departmentId!=\"\"'> "
-			+ " AND a.department_id = #{id} "
-			+ " and (task_status=1 or task_status=2)"
+			+ " AND a.department_id = #{departmentId} "
 			+ "</if>"
 			+ "<if test = 'userId!=null and userId!=\"\"'> "
 			+ " AND a.user_id = #{userId} "
-			+ " and (task_status=1 or task_status=2 or task_status=3)"
 			+ "</if>"
 			+ "</script>")
 	BigDecimal querySurplus(String id,Integer userId,Integer departmentId);