tijiao

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

@@ -31,7 +31,6 @@ public class LwbsDto {
         @ApiModelProperty("开始时间")
         private Long startTime;
         @NotNull
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
         @ApiModelProperty("结束时间")
         private Long endTime;
         @ApiModelProperty("任务等级")

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

@@ -32,6 +32,8 @@ public class LwbsVo {
         private String description;
         @ApiModelProperty("标签 0否 1是 2普通任务 3关键任务")
         private Byte milestone;
+        @ApiModelProperty("时间差")
+        private Long cha;
 
     }
 

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

@@ -1,14 +1,23 @@
 <?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">
-
+    <resultMap id="ii" type="com.ccsens.tall.bean.vo.LwbsVo$SelByProjectIdToTasksVo">
-    <select id="selectById" resultType="com.ccsens.tall.bean.vo.LwbsVo$SelByProjectIdToTasksVo">
+        <id property="id" column="id"/>
+        <result property="name" column="name"/>
+        <collection property="list" ofType="com.ccsens.tall.bean.vo.LwbsVo$SelByProjectIdToTaskVo">
+            <result column="beginTime" property="startTime"/>
+            <result column="endTime" property="endTime"/>
+            <result column="cha" property="cha"/>
+            <result column="milestone" property="milestone"/>
+        </collection>
+    </resultMap>
+    <select id="selectById" resultMap="ii">
         SELECT
         tptd.project_id AS id,
         tptd.`name`,
         tptd.description,
-        tptst.begin_time,
+        tptst.begin_time as beginTime,
-        tptst.end_time,
+        tptst.end_time as endTime,
         ( tptst.end_time - tptst.begin_time ) / 1000 / 3600 AS cha,
         tptd.milestone
         FROM
@@ -27,10 +36,10 @@
         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.begin_time&lt;= #{param.startTime}
         and tptst.end_time &gt;= #{param.endTime}
         <if test="param.id != null">
-           and tptd.project_id=#{id}
+           and tptd.project_id=#{param.id}
         </if>
     </select>
 </mapper>