20210416v1.4

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<PluginVo.ReportProject> queryProjectByParentIdAndNotOwn(@Param("parentId")Long parentId, @Param("projectId")Long projectId);
+
+    /**
+     * 查找当前用户规定时间段内的所有项目
+     * @param startTime
+     * @param endTime
+     * @param userId
+     * @return
+     */
+    List<LwbsVo.SelByUserIdToComProjectVo> queryByUserId(@Param("startTime")Long startTime,@Param("endTime")Long endTime, @Param("userId")Long userId);
 }

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<LwbsVo.SelByUserIdToComProjectVo> selBylwbs(LwbsDto.SelByUserIdToComProject param, Long userId) {
         List<LwbsVo.SelByUserIdToComProjectVo> selByUserIdToComProjectVos =new ArrayList<LwbsVo.SelByUserIdToComProjectVo>();
         //手动添加一个我的
-        LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_wode =new LwbsVo.SelByUserIdToComProjectVo();
+        LwbsVo.SelByUserIdToComProjectVo mine =new LwbsVo.SelByUserIdToComProjectVo();
-        selByUserIdToComProjectVo_wode.setName("我的");
+        mine.setName("我的");
-        selByUserIdToComProjectVo_wode.setType(0);
+        mine.setType(0);
-        selByUserIdToComProjectVo_wode.setId(userId);
+        mine.setId(userId);
-        selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_wode);
+        selByUserIdToComProjectVos.add(mine);
-
+//        //查询普通项目
-
+//        List<LwbsVo.SelByUserIdToComProjectVo> 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<SysProject> sysProjects = sysProjectMapper.selectByExample(sysProjectExample);
+        List<SysProject> 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();
+        LwbsVo.SelByUserIdToComProjectVo other =new LwbsVo.SelByUserIdToComProjectVo();
-        selByUserIdToComProjectVo_qita.setName("其他");
+        other.setName("其他");
-        selByUserIdToComProjectVo_qita.setType(2);
+        other.setType(2);
-        selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_qita);
+        selByUserIdToComProjectVos.add(other);
 
         return selByUserIdToComProjectVos;
     }

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不为空。查询单个项目
 

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

@@ -9,8 +9,10 @@
         <result property="endTime" column="pEndTime"/>
         <result property="duration" column="pDuration"/>
         <collection property="secondTasks" ofType="com.ccsens.tall.bean.vo.TaskVo$NormalTask">
+            <id property="id" column="times_id"/>
+            <result property="projectId" column="pId"/>
+            <result property="projectName" column="pName"/>
             <result property="detailId" column="task_id"/>
-            <result property="id" column="times_id"/>
             <result property="name" column="name"/>
             <result property="description" column="description"/>
             <result property="beginTime" column="begin_time_sub_time"/>
@@ -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,

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

@@ -569,4 +569,17 @@
 		id != #{projectId}
 	and rec_status = 0
     </select>
+    <select id="queryByUserId" resultType="com.ccsens.tall.bean.vo.LwbsVo$SelByUserIdToComProjectVo">
+      SELECT
+      p.`name`,
+      p.id
+      FROM
+      t_sys_project p
+      LEFT JOIN t_sys_user_attention a on p.id = a.project_id and a.rec_status = 0
+      WHERE
+      a.user_id = #{userId}
+      and p.rec_status = 0
+      and p.end_time &gt; #{startTime}
+      and p.begin_time &lt; #{endTime}
+    </select>
 </mapper>