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 8495bd74..ccfe11bb 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 @@ -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("任务等级") 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 b73867b1..f855d5f2 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 @@ -32,6 +32,8 @@ public class LwbsVo { private String description; @ApiModelProperty("标签 0否 1是 2普通任务 3关键任务") private Byte milestone; + @ApiModelProperty("时间差") + private Long cha; } diff --git a/tall/src/main/resources/mapper_dao/IInputDocDao.xml b/tall/src/main/resources/mapper_dao/IInputDocDao.xml index 1b8bd02c..4bee4226 100644 --- a/tall/src/main/resources/mapper_dao/IInputDocDao.xml +++ b/tall/src/main/resources/mapper_dao/IInputDocDao.xml @@ -1,14 +1,23 @@ - - SELECT tptd.project_id AS id, tptd.`name`, tptd.description, - tptst.begin_time, - tptst.end_time, + tptst.begin_time as beginTime, + 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=< #{param.startTime} + and tptst.begin_time<= #{param.startTime} and tptst.end_time >= #{param.endTime} - and tptd.project_id=#{id} + and tptd.project_id=#{param.id} \ No newline at end of file