suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 筹备列表 开店时间错误，导出也是

Browse Source
This commit is contained in:
shuo.wang
2024-11-14 19:06:18 +08:00
parent 9e1e02aac1
commit 486d33323f
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
View File

@@ -130,11 +130,11 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
dto1.setCurrentProgress(dto.getCompletionColumn().toString() + "/" + dto.getTotalColumn().toString());
if ( openActivityStageMap.containsKey(x.getId())) {
Date openActivity = DateUtils.strToDate(openActivityStageMap.get(x.getId()).getActualCompleteTime(), YYYY_MM_DD_HH_MM_SS);
long between = ChronoUnit.SECONDS.between(openActivity.toInstant(), x.getCreateTime().toInstant());
long between = ChronoUnit.SECONDS.between( x.getCreateTime().toInstant(),openActivity.toInstant());
double days = (double) between / (24 * 60 * 60);
dto1.setDays(String.format("%.1f", days));
}else{
long between = ChronoUnit.SECONDS.between(new Date().toInstant(), x.getCreateTime().toInstant());
long between = ChronoUnit.SECONDS.between( x.getCreateTime().toInstant(),new Date().toInstant());
double days = (double) between / (24 * 60 * 60);
dto1.setDays(String.format("%.1f", days));
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java
View File

@@ -83,8 +83,6 @@ public class PreparationServiceImpl implements PreparationService {
request.setRegionIds(regionService.getSubRegionIdsByRegionIds(request.getRegionIds()));
}
}
List<String> subRegionIdsByRegionIds = regionService.getSubRegionIdsByRegionIds(request.getRegionIds());
request.setRegionIds(subRegionIdsByRegionIds);
PageHelper.startPage(request.getPageNum(), request.getPageSize());
//开业进度数据
List<PreparationDTO> preparationDTOS = shopInfoDAO.ListByCondition(request);