拆分

olive-console/src/main/java/com/zrqx/olive/personnel/controller/PersonnelController.java

@@ -16,9 +16,9 @@ import com.common.PageParamRequest;
 import com.zrqx.olive.personnel.request.CompleteQueryForm;
 import com.zrqx.olive.personnel.request.PersonnelRequest;
 import com.zrqx.olive.personnel.request.SaveOrUpdateLevelForm;
-import com.zrqx.olive.personnel.request.StatisticsTaskTimeForm;
 import com.zrqx.olive.personnel.service.UserTaskLevelService;
 import com.zrqx.olive.personnel.vo.StatisticsTaskTime;
+import com.zrqx.olive.personnel.vo.StatisticsTaskTimeSplit;
 import com.zrqx.olive.ttask.service.TaskService;
 import com.zrqx.statistics.entity.StatisticsTask;
 
@@ -44,7 +44,7 @@ public class PersonnelController {
 		return CommonResult.success(service.saveOrUpdate(form));
 	}
 	
-	@ApiOperation(value = "在职人员列表")
+	@ApiOperation(value = "在职人员、离职人员列表")
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public CommonResult<CommonPage<StatisticsTaskTime>> getPersonnelList(PersonnelRequest taskRequest,
 			@Validated PageParamRequest pageParamRequest) {
@@ -58,7 +58,7 @@ public class PersonnelController {
 	
 	@ApiOperation(value = "人员-工时统计拆分页")
 	@RequestMapping(value = "/project_split_data", method = RequestMethod.GET)
-	public CommonResult<List<StatisticsTaskTime>> projectSplitData(CompleteQueryForm form){
+	public CommonResult<List<StatisticsTaskTimeSplit>> projectSplitData(CompleteQueryForm form){
 		return CommonResult.success(taskService.queryProjectSplitData(form));
 	}
 }

olive-console/src/main/java/com/zrqx/olive/personnel/request/CompleteQueryForm.java

@@ -16,6 +16,8 @@ public class CompleteQueryForm {
 	
 	@ApiModelProperty(value = "人员类型 1在职 2离职" )
 	private String  isType;
+	@ApiModelProperty(value = "成员id")
+	private String userId;
 	@ApiModelProperty(value = "成员名称")
 	private String userName;
 	@ApiModelProperty(value = "开始日期")

olive-console/src/main/java/com/zrqx/olive/personnel/vo/StatisticsTaskTimeSplit.java

+package com.zrqx.olive.personnel.vo;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "StatisticsTaskTimeSplit对象", description = "人员管理表")
+public class StatisticsTaskTimeSplit {
+	
+	
+	@ApiModelProperty("id，新增时不需要填写")
+	private Integer id;
+	
+	@ApiModelProperty(value = "出版社")
+	private String customer;
+	
+	@ApiModelProperty(value = "项目名")
+	private String project;
+
+	@ApiModelProperty("最终工时")
+	private BigDecimal totalTime;
+}

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

@@ -10,8 +10,8 @@ import org.apache.ibatis.annotations.Select;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zrqx.olive.personnel.request.CompleteQueryForm;
 import com.zrqx.olive.personnel.request.PersonnelRequest;
-import com.zrqx.olive.personnel.request.StatisticsTaskTimeForm;
 import com.zrqx.olive.personnel.vo.StatisticsTaskTime;
+import com.zrqx.olive.personnel.vo.StatisticsTaskTimeSplit;
 import com.zrqx.olive.ttask.model.Task;
 import com.zrqx.olive.ttask.request.TaskRequest;
 import com.zrqx.olive.ttask.vo.TaskExcelVo;
@@ -196,14 +196,16 @@ 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 "
 			+ "<if test = 'id!=null and id!=\"\"'> "
+			+ " and task_status=1 "
 			+ " AND a.project_id = #{id} "
 			+ "</if>"
 			+ "<if test = 'departmentId!=null and departmentId!=\"\"'> "
+			+ " and task_status=1 "
 			+ " AND a.department_id = #{departmentId} "
 			+ "</if>"
 			+ "<if test = 'userId!=null and userId!=\"\"'> "
+			+ " and (task_status=1 or task_status=2 or task_status=3) "
 			+ " AND a.user_id = #{userId} "
 			+ "</if>"
 			+ "</script>")
@@ -275,29 +277,29 @@ public interface TaskDao extends BaseMapper<Task> {
 	BigDecimal totalTime(@Param("request")TaskRequest request);
 
 	@Select("<script>"
-			+ " SELECT b.id,b.real_name,c.department_name,SUM(working_hours) totalTime from t_task a INNER JOIN eb_system_admin b on a.user_id=b.id " 
-			+ " INNER JOIN sys_department c on b.department_id=c.id where 1=1 and a.task_status=3 "	
-			+ "<if test = 'taskRequest.departmentName!=null'> "
-			+ "  and c.department_name  like concat('%',#{taskRequest.departmentName},'%') "
-			+ "</if>"
-			+ "<if test = 'taskRequest.userName!=null'> "
-			+ "  and b.real_name  like concat('%',#{taskRequest.userName},'%') "
-			+ "</if>"
+			+ " SELECT (SELECT IFNULL(SUM(working_hours),'0') from t_task a WHERE a.user_id=b.id  and a.task_status=3 "
 			+ "<if test = 'taskRequest.startTime!=null'>"  
 			+ " AND a.complete_Time &gt;= concat(#{taskRequest.startTime}, ' 00:00:00' ) "
 			+ "</if>" 
 			+ "<if test = 'taskRequest.endTime!=null'>"  
 			+ " AND a.complete_Time &lt;= concat(#{taskRequest.endTime}, ' 23:59:59' ) "
 			+ "</if>" 
+			+ ") totalTime,b.id,b.real_name,c.department_name FROM  eb_system_admin b  INNER JOIN sys_department c on b.department_id=c.id where 1=1 "
 			+ "<if test = 'taskRequest.isType!=null'>"  
 			+ " AND b.is_type = #{taskRequest.isType} "
 			+ "</if>"
-			+ " and a.user_id is not null GROUP BY b.real_name ORDER BY department_name DESC"
+			+ " and (b.department_id=279 or b.department_id=278 or b.department_id=277)"	
+			+ "<if test = 'taskRequest.departmentName!=null'> "
+			+ "  and c.department_name  like concat('%',#{taskRequest.departmentName},'%') "
+			+ "</if>"
+			+ "<if test = 'taskRequest.userName!=null'> "
+			+ "  and b.real_name  like concat('%',#{taskRequest.userName},'%') "
+			+ "</if>"
+			+ " GROUP BY b.real_name ORDER BY department_name DESC,totalTime desc "
 			+ "</script>")
 	List<StatisticsTaskTime> getPersonnelList(@Param("taskRequest") PersonnelRequest taskRequest);
-
 	@Select("<script>"
-			+ " SELECT a.id,a.task_name,a.task_description,b.real_name finishedBy,c.project,a.working_hours from t_task a INNER JOIN eb_system_admin b on a.user_id=b.id INNER JOIN t_statistics_project c on a.project_id=c.id where 1=1 and a.task_status=3  "	
+			+ " SELECT a.id,a.task_name,a.task_description,b.real_name finishedBy,c.project,a.working_hours,a.complete_time from t_task a INNER JOIN eb_system_admin b on a.user_id=b.id INNER JOIN t_statistics_project c on a.project_id=c.id where 1=1 and a.task_status=3  "	
 			+ "<if test = 'form.userName!=null'> "
 			+ "  and b.real_name  like concat('%',#{form.userName},'%') "
 			+ "</if>"
@@ -313,10 +315,7 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ "</script>")
 	List<StatisticsTask> queryTaskPage(@Param("form") CompleteQueryForm form);
 	@Select("<script>"
-			+"SELECT a.id,c.project,SUM(working_hours),c.customer from t_task a INNER JOIN eb_system_admin b on a.user_id=b.id 	INNER JOIN t_statistics_project c on a.project_id=c.id where 1=1 and a.task_status=3 "
-			+ "<if test = 'form.userName!=null'> "
-			+ "  and b.real_name  like concat('%',#{form.userName},'%') "
-			+ "</if>"
+			+ "SELECT SUM(working_hours) totalTime,c.customer,c.project from t_task a INNER JOIN eb_system_admin b on a.user_id=b.id INNER JOIN t_statistics_project c on a.project_id = c.id where 1=1 "  
 			+ "<if test = 'form.startTime!=null'>"  
 			+ " AND a.complete_Time &gt;= concat(#{form.startTime}, ' 00:00:00' ) "
 			+ "</if>" 
@@ -326,6 +325,10 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ "<if test = 'form.isType!=null'>"  
 			+ " AND b.is_type = #{taskRequest.isType} "
 			+ "</if>"
+			+ "<if test = 'form.userId!=null'> "
+			+ " and rb.id=#{form.userId}  "	
+			+ "</if>"
+			+ "and a.task_status=3 GROUP BY project_id "
 			+ "</script>")
-	List<StatisticsTaskTime> queryProjectSplitData(@Param("form") CompleteQueryForm form);
+	List<StatisticsTaskTimeSplit> queryProjectSplitData(@Param("form") CompleteQueryForm form);
 }

olive-console/src/main/java/com/zrqx/olive/ttask/service/TaskService.java

@@ -14,6 +14,7 @@ import com.utils.excelutil.BaseException;
 import com.zrqx.olive.personnel.request.CompleteQueryForm;
 import com.zrqx.olive.personnel.request.PersonnelRequest;
 import com.zrqx.olive.personnel.vo.StatisticsTaskTime;
+import com.zrqx.olive.personnel.vo.StatisticsTaskTimeSplit;
 import com.zrqx.olive.ttask.model.Task;
 import com.zrqx.olive.ttask.request.TaskForm;
 import com.zrqx.olive.ttask.request.TaskRequest;
@@ -60,5 +61,5 @@ public interface TaskService extends IService<Task> {
 
 	PageInfo<StatisticsTask> queryTaskPage(PageParamRequest pageParamRequest, CompleteQueryForm form);
 
-	List<StatisticsTaskTime> queryProjectSplitData(CompleteQueryForm form);
+	List<StatisticsTaskTimeSplit> queryProjectSplitData(CompleteQueryForm form);
 }

olive-console/src/main/java/com/zrqx/olive/ttask/service/imp/TaskServiceImpl.java

@@ -32,8 +32,8 @@ import com.zrqx.olive.personnel.dao.UserTaskLevelDao;
 import com.zrqx.olive.personnel.request.CompleteQueryForm;
 import com.zrqx.olive.personnel.request.PersonnelRequest;
 import com.zrqx.olive.personnel.request.QueryLevelForm;
-import com.zrqx.olive.personnel.request.StatisticsTaskTimeForm;
 import com.zrqx.olive.personnel.vo.StatisticsTaskTime;
+import com.zrqx.olive.personnel.vo.StatisticsTaskTimeSplit;
 import com.zrqx.olive.project.model.DiyType;
 import com.zrqx.olive.project.model.Team;
 import com.zrqx.olive.project.service.DiyTypeService;
@@ -278,9 +278,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 	@Override
 	public PageInfo<StatisticsTaskTime> getPersonnelList(PersonnelRequest taskRequest,
 			PageParamRequest pageParamRequest) {
-		if(pageParamRequest.getOrderBy()==null) {
-			pageParamRequest.setOrderBy("a.create_time desc");
-		}
 		PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit(),
 				pageParamRequest.getOrderBy());
 		List<StatisticsTaskTime> list = dao.getPersonnelList(taskRequest);
@@ -322,9 +319,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 	}
 
 	@Override
-	public List<StatisticsTaskTime> queryProjectSplitData(CompleteQueryForm form) {
+	public List<StatisticsTaskTimeSplit> queryProjectSplitData(CompleteQueryForm form) {
 		// TODO Auto-generated method stub
-		List<StatisticsTaskTime> list=dao.queryProjectSplitData(form);
+		List<StatisticsTaskTimeSplit> list=dao.queryProjectSplitData(form);
 		return list;
 	}
 }