diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java index 295c8adf..a55d650a 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java @@ -1,7 +1,9 @@ package com.ccsens.tall.persist.dao; +import com.ccsens.tall.bean.dto.LwbsDto; import com.ccsens.tall.bean.po.SysProject; import com.ccsens.tall.bean.vo.ChartVo; +import com.ccsens.tall.bean.vo.LwbsVo; import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.persist.mapper.SysProjectMapper; @@ -52,4 +54,13 @@ public interface SysProjectDao extends SysProjectMapper{ * @return */ List queryProjectByParentIdAndNotOwn(@Param("parentId")Long parentId, @Param("projectId")Long projectId); + + /** + * 查找当前用户规定时间段内的所有项目 + * @param startTime + * @param endTime + * @param userId + * @return + */ + List queryByUserId(@Param("startTime")Long startTime,@Param("endTime")Long endTime, @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 6dc7c191..d297e7af 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -42,7 +42,7 @@ public class InputDocService implements IInputDocService { @Resource public ProMemberMapper proMemberMapper; @Resource - public SysProjectMapper sysProjectMapper; + public SysProjectDao sysProjectDao; @Resource private IInputDocDao iInputDocDao; @Resource @@ -76,13 +76,14 @@ public class InputDocService implements IInputDocService { public List selBylwbs(LwbsDto.SelByUserIdToComProject param, Long userId) { List selByUserIdToComProjectVos =new ArrayList(); //手动添加一个我的 - LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_wode =new LwbsVo.SelByUserIdToComProjectVo(); - selByUserIdToComProjectVo_wode.setName("我的"); - selByUserIdToComProjectVo_wode.setType(0); - selByUserIdToComProjectVo_wode.setId(userId); - selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_wode); - - + LwbsVo.SelByUserIdToComProjectVo mine =new LwbsVo.SelByUserIdToComProjectVo(); + mine.setName("我的"); + mine.setType(0); + mine.setId(userId); + selByUserIdToComProjectVos.add(mine); +// //查询普通项目 +// List projectVoList = sysProjectDao.queryByUserId(param.getStartTime(),param.getEndTime(),userId); +// selByUserIdToComProjectVos.addAll(projectVoList); //查询中间的项目 ProMemberExample proMemberExample=new ProMemberExample(); proMemberExample.createCriteria().andRecStatusEqualTo((byte) 0).andUserIdEqualTo(userId); @@ -93,7 +94,7 @@ public class InputDocService implements IInputDocService { }); SysProjectExample sysProjectExample=new SysProjectExample(); sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getEndTime()).andEndTimeGreaterThanOrEqualTo(param.getStartTime()); - List sysProjects = sysProjectMapper.selectByExample(sysProjectExample); + List sysProjects = sysProjectDao.selectByExample(sysProjectExample); sysProjects.forEach(sysProject -> { LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_zhongjian =new LwbsVo.SelByUserIdToComProjectVo(); selByUserIdToComProjectVo_zhongjian.setName(sysProject.getName()); @@ -102,10 +103,10 @@ public class InputDocService implements IInputDocService { selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_zhongjian); }); //手动添加一个其他 - LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_qita =new LwbsVo.SelByUserIdToComProjectVo(); - selByUserIdToComProjectVo_qita.setName("其他"); - selByUserIdToComProjectVo_qita.setType(2); - selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_qita); + LwbsVo.SelByUserIdToComProjectVo other =new LwbsVo.SelByUserIdToComProjectVo(); + other.setName("其他"); + other.setType(2); + selByUserIdToComProjectVos.add(other); return selByUserIdToComProjectVos; } diff --git a/tall/src/main/java/com/ccsens/tall/service/LwbsService.java b/tall/src/main/java/com/ccsens/tall/service/LwbsService.java index 19ae1f88..4a60b2a3 100644 --- a/tall/src/main/java/com/ccsens/tall/service/LwbsService.java +++ b/tall/src/main/java/com/ccsens/tall/service/LwbsService.java @@ -31,6 +31,7 @@ public class LwbsService implements ILwbsService{ if(ObjectUtil.isNotNull(param.getId())){ //如果项目id为空。则查询所有 + }else { //项目id不为空。查询单个项目 diff --git a/tall/src/main/resources/mapper_dao/IInputDocDao.xml b/tall/src/main/resources/mapper_dao/IInputDocDao.xml index 19c5b0d0..c5cb1bfa 100644 --- a/tall/src/main/resources/mapper_dao/IInputDocDao.xml +++ b/tall/src/main/resources/mapper_dao/IInputDocDao.xml @@ -9,8 +9,10 @@ + + + - @@ -27,6 +29,8 @@ SELECT tsp.id AS pId, tsp.`name` AS pName, + tsp.id AS pId, + tsp.`name` AS pName, tsp.description AS pDescription, tsp.begin_time as pBeginTime, tsp.end_time as pEndTime, diff --git a/tall/src/main/resources/mapper_dao/SysProjectDao.xml b/tall/src/main/resources/mapper_dao/SysProjectDao.xml index cad47a89..b7829b03 100644 --- a/tall/src/main/resources/mapper_dao/SysProjectDao.xml +++ b/tall/src/main/resources/mapper_dao/SysProjectDao.xml @@ -569,4 +569,17 @@ id != #{projectId} and rec_status = 0 + \ No newline at end of file