From ebd4fb25816011cf6ea5a81ff58df63555cbf338 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 22 Mar 2021 18:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/tall/bean/dto/LwbsDto.java | 7 ++-- .../java/com/ccsens/tall/bean/vo/LwbsVo.java | 8 ++--- .../ccsens/tall/persist/dao/IInputDocDao.java | 14 ++++++++ .../ccsens/tall/service/InputDocService.java | 13 ++++--- .../com/ccsens/tall/web/LwbsController.java | 1 + .../resources/mapper_dao/IInputDocDao.xml | 36 +++++++++++++++++++ 6 files changed, 66 insertions(+), 13 deletions(-) create mode 100644 tall/src/main/java/com/ccsens/tall/persist/dao/IInputDocDao.java create mode 100644 tall/src/main/resources/mapper_dao/IInputDocDao.xml diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java index 5d78b7bc..8495bd74 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java +++ b/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; } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java index af56218f..b73867b1 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java +++ b/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; - @NotNull - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Long startTime; @ApiModelProperty("结束时间") - private Date endTime; + private Long endTime; @ApiModelProperty("详情") private String description; @ApiModelProperty("标签 0否 1是 2普通任务 3关键任务") diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/IInputDocDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/IInputDocDao.java new file mode 100644 index 00000000..62f22a41 --- /dev/null +++ b/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 selectById(@Param("param") LwbsDto.SelByProjectIdToTaskDto param, @Param("userId") Long userId); +} diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java index e7649048..2653f266 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/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 selBylwbs(LwbsDto.SelByUserIdToComProject param, Long userId) { List selByUserIdToComProjectVos =new ArrayList(); @@ -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 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 selByProjectIdToTask(LwbsDto.SelByProjectIdToTaskDto param, Long userId) { - return null; + List se= iInputDocDao.selectById(param,userId); + + return se; } } diff --git a/tall/src/main/java/com/ccsens/tall/web/LwbsController.java b/tall/src/main/java/com/ccsens/tall/web/LwbsController.java index 4564c7fe..bb2da721 100644 --- a/tall/src/main/java/com/ccsens/tall/web/LwbsController.java +++ b/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"}) diff --git a/tall/src/main/resources/mapper_dao/IInputDocDao.xml b/tall/src/main/resources/mapper_dao/IInputDocDao.xml new file mode 100644 index 00000000..1b8bd02c --- /dev/null +++ b/tall/src/main/resources/mapper_dao/IInputDocDao.xml @@ -0,0 +1,36 @@ + + + + + + \ No newline at end of file