提交

tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java

@@ -28,12 +28,13 @@ public class LwbsDto {
         @ApiModelProperty("项目id")
         private Long id;
         @NotNull
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
         @ApiModelProperty("开始时间")
-        private Date startTime;
+        private Long startTime;
         @NotNull
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
         @ApiModelProperty("结束时间")
-        private Date endTime;
+        private Long endTime;
+        @ApiModelProperty("任务等级")
+        private Byte level=(byte)2;
     }
 }

tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java

@@ -24,14 +24,10 @@ public class LwbsVo {
     @Data
     @ApiModel("查询某人下的项目的任务")
     public static class SelByProjectIdToTaskVo {
-        @NotNull
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
         @ApiModelProperty("开始时间")
-        private Date startTime;
+        private Long startTime;
-        @NotNull
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
         @ApiModelProperty("结束时间")
-        private Date endTime;
+        private Long endTime;
         @ApiModelProperty("详情")
         private String description;
         @ApiModelProperty("标签 0否 1是 2普通任务 3关键任务")

tall/src/main/java/com/ccsens/tall/persist/dao/IInputDocDao.java

@@ -0,0 +1,14 @@
+package com.ccsens.tall.persist.dao;
+
+import com.ccsens.tall.bean.dto.LwbsDto;
+import com.ccsens.tall.bean.vo.LwbsVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IInputDocDao {
+
+    List<LwbsVo.SelByProjectIdToTasksVo> selectById(@Param("param") LwbsDto.SelByProjectIdToTaskDto param, @Param("userId") Long userId);
+}

tall/src/main/java/com/ccsens/tall/service/InputDocService.java

@@ -6,9 +6,11 @@ import com.ccsens.tall.bean.po.ProMemberExample;
 import com.ccsens.tall.bean.po.SysProject;
 import com.ccsens.tall.bean.po.SysProjectExample;
 import com.ccsens.tall.bean.vo.LwbsVo;
+import com.ccsens.tall.persist.dao.IInputDocDao;
 import com.ccsens.tall.persist.mapper.ProMemberMapper;
 import com.ccsens.tall.persist.mapper.SysProjectMapper;
 import com.rabbitmq.client.TopologyRecoveryException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -21,7 +23,8 @@ public class InputDocService implements IInputDocService {
     public ProMemberMapper proMemberMapper;
     @Resource
     public SysProjectMapper sysProjectMapper;
-
+    @Resource
+    private IInputDocDao iInputDocDao;
     @Override
     public List<LwbsVo.SelByUserIdToComProjectVo> selBylwbs(LwbsDto.SelByUserIdToComProject param, Long userId) {
         List<LwbsVo.SelByUserIdToComProjectVo> selByUserIdToComProjectVos =new ArrayList<LwbsVo.SelByUserIdToComProjectVo>();
@@ -38,7 +41,7 @@ public class InputDocService implements IInputDocService {
             longList.add(proMember.getProjectId());
         });
         SysProjectExample sysProjectExample=new SysProjectExample();
-        sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeGreaterThanOrEqualTo(param.getStartTime().getTime()).andEndTimeLessThanOrEqualTo(param.getEndTime().getTime());
+        sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getStartTime().getTime()).andEndTimeGreaterThanOrEqualTo(param.getEndTime().getTime());
         List<SysProject> sysProjects = sysProjectMapper.selectByExample(sysProjectExample);
         sysProjects.forEach(sysProject -> {
             LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_zhongjian =new LwbsVo.SelByUserIdToComProjectVo();
@@ -48,13 +51,15 @@ public class InputDocService implements IInputDocService {
         });
         //手动添加一个其他
         LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_qita =new LwbsVo.SelByUserIdToComProjectVo();
-        selByUserIdToComProjectVo_wode.setName("其他");
+        selByUserIdToComProjectVo_qita.setName("其他");
         selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_qita);
         return selByUserIdToComProjectVos;
     }
 
     @Override
     public List<LwbsVo.SelByProjectIdToTasksVo> selByProjectIdToTask(LwbsDto.SelByProjectIdToTaskDto param, Long userId) {
-        return null;
+        List<LwbsVo.SelByProjectIdToTasksVo> se= iInputDocDao.selectById(param,userId);
+
+        return se;
     }
 }

tall/src/main/java/com/ccsens/tall/web/LwbsController.java

@@ -27,6 +27,7 @@ import java.util.List;
 public class LwbsController {
     @Autowired
     private IInputDocService iInputDocService;
+
     @MustLogin
     @ApiOperation(value = "查询人下参加的所有的项目", notes = "1007:输出")
     @RequestMapping(value = "/selByUserIdToComProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})

tall/src/main/resources/mapper_dao/IInputDocDao.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.tall.persist.dao.IInputDocDao">
+
+    <select id="selectById" resultType="com.ccsens.tall.bean.vo.LwbsVo$SelByProjectIdToTasksVo">
+        SELECT
+        tptd.project_id AS id,
+        tptd.`name`,
+        tptd.description,
+        tptst.begin_time,
+        tptst.end_time,
+        ( tptst.end_time - tptst.begin_time ) / 1000 / 3600 AS cha,
+        tptd.milestone
+        FROM
+        t_pro_task_detail tptd,
+        t_pro_task_sub_time tptst
+        WHERE
+        tptd.`level` = 2
+        AND tptd.rec_status = 0
+        AND tptd.executor_role IN (
+        SELECT
+        tpmr.role_id
+        FROM
+        t_pro_member_role tpmr
+        WHERE
+        tpmr.rec_status = 0
+        AND tpmr.member_id IN ( SELECT id FROM t_pro_member tpm WHERE tpm.user_id = #{userId} AND tpm.rec_status = 0 )
+        )
+        AND tptst.task_detail_id = tptd.id
+        and tptst.begin_time=&lt; #{param.startTime}
+        and tptst.end_time &gt;= #{param.endTime}
+        <if test="param.id != null">
+           and tptd.project_id=#{id}
+        </if>
+    </select>
+</mapper>