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 ccfe11bb..e060f9fc 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 @@ -14,13 +14,11 @@ public class LwbsDto { @ApiModel("查询lwbs的任务") public static class SelByUserIdToComProject{ @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; } @Data @ApiModel("查询lwbs的任务") 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 f855d5f2..2bcd1bca 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 @@ -46,5 +46,7 @@ public class LwbsVo { private String name; @ApiModelProperty("所有的任务") private List list; + + } } 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 2653f266..4ad032ed 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -41,7 +41,7 @@ public class InputDocService implements IInputDocService { longList.add(proMember.getProjectId()); }); SysProjectExample sysProjectExample=new SysProjectExample(); - sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getStartTime().getTime()).andEndTimeGreaterThanOrEqualTo(param.getEndTime().getTime()); + sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getStartTime()).andEndTimeGreaterThanOrEqualTo(param.getEndTime()); List sysProjects = sysProjectMapper.selectByExample(sysProjectExample); sysProjects.forEach(sysProject -> { LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_zhongjian =new LwbsVo.SelByUserIdToComProjectVo(); 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 faaf23be..5d6f3a58 100644 --- a/tall/src/main/java/com/ccsens/tall/web/LwbsController.java +++ b/tall/src/main/java/com/ccsens/tall/web/LwbsController.java @@ -29,7 +29,7 @@ public class LwbsController { @Autowired private IInputDocService iInputDocService; - @MustLogin + @MustLoginTall @ApiOperation(value = "查询人下参加的所有的项目", notes = "1007:输出") @RequestMapping(value = "/selByUserIdToComProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> selByUserIdToComProject(@ApiParam @Validated @RequestBody QueryDto params) {