Skip to content

Y
yd-product
Commit bb32f26e by zhangxingmin
Options

push

parent 4ab00f6c
Showing with 15 additions and 2 deletions
yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiAnnouncementCommissionRatioServiceImpl.java
...@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service; ...@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -42,6 +43,8 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen ...@@ -42,6 +43,8 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen
@Autowired @Autowired
private ApiAnnouncementSpeciesService apiAnnouncementSpeciesService; private ApiAnnouncementSpeciesService apiAnnouncementSpeciesService;
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
/** /**
* 分页列表查询-公告佣比率规格明细信息 * 分页列表查询-公告佣比率规格明细信息
* @param request * @param request
...@@ -456,8 +459,11 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen ...@@ -456,8 +459,11 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen
.append(dto.getStartPeriod()).append("~").append(dto.getEndPeriod()) .append(dto.getStartPeriod()).append("~").append(dto.getEndPeriod())
.append(" 与以下数据年限区间重叠："); .append(" 与以下数据年限区间重叠：");
} else { } else {
// 格式化有效时间
String startStr = dto.getEffectiveStart().format(DATE_FORMATTER);
String endStr = dto.getEffectiveEnd().format(DATE_FORMATTER);
sb.append("第").append(dataIndex + 1).append("行数据有效时间 ") sb.append("第").append(dataIndex + 1).append("行数据有效时间 ")
.append(dto.getEffectiveStart()).append("~").append(dto.getEffectiveEnd()) .append(startStr).append("~").append(endStr)
.append(" 与以下数据有效时间重叠："); .append(" 与以下数据有效时间重叠：");
} }
for (int overlapIndex : overlapIndices) { for (int overlapIndex : overlapIndices) {
......
yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiExpectedCommissionRatioServiceImpl.java
...@@ -9,6 +9,7 @@ import com.yd.common.utils.RandomStringGenerator; ...@@ -9,6 +9,7 @@ import com.yd.common.utils.RandomStringGenerator;
import com.yd.product.api.service.ApiExpectedCommissionRatioService; import com.yd.product.api.service.ApiExpectedCommissionRatioService;
import com.yd.product.api.service.ApiExpectedSpeciesService; import com.yd.product.api.service.ApiExpectedSpeciesService;
import com.yd.product.api.utils.ProductCommonUtils; import com.yd.product.api.utils.ProductCommonUtils;
import com.yd.product.feign.dto.ApiAnnouncementCommissionRatioBatchSaveDto;
import com.yd.product.feign.dto.ApiExpectedCommissionRatioBatchSaveDto; import com.yd.product.feign.dto.ApiExpectedCommissionRatioBatchSaveDto;
import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioAddRequest; import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioAddRequest;
import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioBatchSaveRequest; import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioBatchSaveRequest;
...@@ -25,6 +26,7 @@ import org.springframework.stereotype.Service; ...@@ -25,6 +26,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -38,6 +40,8 @@ public class ApiExpectedCommissionRatioServiceImpl implements ApiExpectedCommiss ...@@ -38,6 +40,8 @@ public class ApiExpectedCommissionRatioServiceImpl implements ApiExpectedCommiss
@Autowired @Autowired
private ApiExpectedSpeciesService apiExpectedSpeciesService; private ApiExpectedSpeciesService apiExpectedSpeciesService;
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
/** /**
* 分页列表查询-来佣比率规格明细信息 * 分页列表查询-来佣比率规格明细信息
* @param request * @param request
...@@ -371,8 +375,11 @@ public class ApiExpectedCommissionRatioServiceImpl implements ApiExpectedCommiss ...@@ -371,8 +375,11 @@ public class ApiExpectedCommissionRatioServiceImpl implements ApiExpectedCommiss
.append(dto.getStartPeriod()).append("~").append(dto.getEndPeriod()) .append(dto.getStartPeriod()).append("~").append(dto.getEndPeriod())
.append(" 与以下数据年限区间重叠："); .append(" 与以下数据年限区间重叠：");
} else { } else {
// 格式化有效时间
String startStr = dto.getEffectiveStart().format(DATE_FORMATTER);
String endStr = dto.getEffectiveEnd().format(DATE_FORMATTER);
sb.append("第").append(dataIndex + 1).append("行数据有效时间 ") sb.append("第").append(dataIndex + 1).append("行数据有效时间 ")
.append(dto.getEffectiveStart()).append("~").append(dto.getEffectiveEnd()) .append(startStr).append("~").append(endStr)
.append(" 与以下数据有效时间重叠："); .append(" 与以下数据有效时间重叠：");
} }
for (int overlapIndex : overlapIndices) { for (int overlapIndex : overlapIndices) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment