|
|
@@ -10847,16 +10847,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
HttpRespMsg msg=new HttpRespMsg();
|
|
|
TokenVo tokenVo = JSON.parseObject(json, TokenVo.class);
|
|
|
String token = tokenVo.getToken();
|
|
|
- String startDate =tokenVo.getStartDate();
|
|
|
- String endDate = tokenVo.getEndDate();
|
|
|
- DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
- LocalDate openDate = LocalDate.parse(startDate, df);
|
|
|
- LocalDate closeDate = LocalDate.parse(endDate, df);
|
|
|
- if(Duration.between(openDate.atTime(LocalTime.now()),closeDate.atTime(LocalTime.now())).toDays()>31){
|
|
|
- //msg.setError("获取数据时间段不得超过一个月");
|
|
|
- msg.setError(MessageUtils.message("data.exceedMonthError"));
|
|
|
- return msg;
|
|
|
- }
|
|
|
List<ThirdPartyInterface> thirdPartyInterfaceList = thirdPartyInterfaceMapper.selectList(new QueryWrapper<ThirdPartyInterface>().eq("token", token));
|
|
|
if(thirdPartyInterfaceList.size()==0){
|
|
|
//msg.setError("token错误");
|
|
|
@@ -10870,7 +10860,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
return msg;
|
|
|
}
|
|
|
if(token.equals(thirdPartyInterface.getToken())){
|
|
|
- List<Project> projectList=projectMapper.selectList(new QueryWrapper<Project>().eq("company_id",thirdPartyInterface.getCompanyId()).between("create_date",startDate,endDate));
|
|
|
+ List<Project> projectList=projectMapper.selectList(new QueryWrapper<Project>().eq("company_id",thirdPartyInterface.getCompanyId()));
|
|
|
List<Integer> projectIds = projectList.stream().map(Project::getId).distinct().collect(Collectors.toList());
|
|
|
projectIds.add(-1);
|
|
|
List<SubProject> subProjectList = subProjectMapper.selectList(new QueryWrapper<SubProject>().eq("project_id", projectIds));
|
Min