fix 导出字段错误
This commit is contained in:
@@ -10,11 +10,6 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author suzhuhong
|
||||
* @Date 2024/4/26 15:00
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@ContentStyle(horizontalAlignment = HorizontalAlignment.LEFT,wrapped = true)
|
||||
public class PreparationScheduleDTO {
|
||||
@@ -37,7 +32,7 @@ public class PreparationScheduleDTO {
|
||||
@ExcelProperty("门店编号")
|
||||
@ColumnWidth(30)
|
||||
@ApiModelProperty("门店编码")
|
||||
private String storeNum;
|
||||
private String shopCode;
|
||||
|
||||
|
||||
@ExcelProperty("当前进度")
|
||||
|
||||
@@ -115,7 +115,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
|
||||
dto1.setUsername(x.getUsername());
|
||||
dto1.setShopName(x.getShopName());
|
||||
dto1.setPlanOpenTime(DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, x.getPlanOpenTime()));
|
||||
dto1.setStoreNum(x.getStoreNum());
|
||||
dto1.setShopCode(x.getShopCode());
|
||||
dto1.setSupervisionName(userInfoMap.getOrDefault(x.getSupervisorUserId(), new EnterpriseUserDO()).getName());
|
||||
dto1.setInvestmentManagerName(userInfoMap.getOrDefault(x.getInvestmentManager(), new EnterpriseUserDO()).getName());
|
||||
dto1.setRegionNodeName(regionNameMap.getOrDefault(x.getRegionId(), ""));
|
||||
|
||||
@@ -81,7 +81,7 @@ public class ExportServiceImpl implements ExportService {
|
||||
request.setRegionIds(regionService.getSubRegionIdsByRegionIds(request.getRegionIds()));
|
||||
}
|
||||
}
|
||||
//开业进度数据
|
||||
//进度数据
|
||||
List<PreparationDTO> preparationDTOS = shopInfoDAO.ListByCondition(request);
|
||||
if (CollectionUtils.isEmpty(preparationDTOS)) {
|
||||
throw new ServiceException(ErrorCodeEnum.NO_DATA);
|
||||
|
||||
Reference in New Issue
Block a user