diff --git a/src/main/java/com/chinaweal/youfool/prj/modules/evidence/transfer/service/impl/ClueTransferServiceImpl.java b/src/main/java/com/chinaweal/youfool/prj/modules/evidence/transfer/service/impl/ClueTransferServiceImpl.java index 2001cda..db04845 100644 --- a/src/main/java/com/chinaweal/youfool/prj/modules/evidence/transfer/service/impl/ClueTransferServiceImpl.java +++ b/src/main/java/com/chinaweal/youfool/prj/modules/evidence/transfer/service/impl/ClueTransferServiceImpl.java @@ -73,14 +73,22 @@ public class ClueTransferServiceImpl extends ServiceImpl entityPage = this.page(page, wrapper); + // 批量查询关联线索 + List clueIds = entityPage.getRecords().stream() + .map(ClueTransferRecordEntity::getClueId) + .distinct() + .collect(Collectors.toList()); + Map clueMap = clueIds.isEmpty() ? Map.of() + : monitoringClueMapper.selectBatchIds(clueIds).stream() + .collect(Collectors.toMap(MonitoringClueEntity::getId, c -> c)); + // 转换为VO Page voPage = new Page<>(entityPage.getCurrent(), entityPage.getSize(), entityPage.getTotal()); List voList = entityPage.getRecords().stream().map(entity -> { ClueTransferDetailVO vo = new ClueTransferDetailVO(); BeanUtils.copyProperties(entity, vo); - // 补充线索编码 - MonitoringClueEntity clue = monitoringClueMapper.selectById(entity.getClueId()); + MonitoringClueEntity clue = clueMap.get(entity.getClueId()); if (clue != null) { vo.setClueCode(clue.getClueCode()); } diff --git a/src/main/java/com/chinaweal/youfool/prj/modules/law/entity/LawClauseEntity.java b/src/main/java/com/chinaweal/youfool/prj/modules/law/entity/LawClauseEntity.java index 03022e1..4121705 100644 --- a/src/main/java/com/chinaweal/youfool/prj/modules/law/entity/LawClauseEntity.java +++ b/src/main/java/com/chinaweal/youfool/prj/modules/law/entity/LawClauseEntity.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.dynamic.datasource.annotation.DS; import com.chinaweal.youfool.framework.springboot.mybatis.plus.SuperEntity; +import com.chinaweal.youfool.framework.springboot.common.util.DateUtil; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -49,7 +50,7 @@ public class LawClauseEntity extends SuperEntity { @TableField("effective_status") private Integer effectiveStatus; - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = DateUtil.DATE_DEFAULT_FORMAT, timezone = "GMT+8") @TableField("publish_date") private LocalDate publishDate; } diff --git a/src/main/java/com/chinaweal/youfool/prj/modules/law/entity/req/LawClauseSaveReq.java b/src/main/java/com/chinaweal/youfool/prj/modules/law/entity/req/LawClauseSaveReq.java index 5e0e19a..0e8ffa6 100644 --- a/src/main/java/com/chinaweal/youfool/prj/modules/law/entity/req/LawClauseSaveReq.java +++ b/src/main/java/com/chinaweal/youfool/prj/modules/law/entity/req/LawClauseSaveReq.java @@ -1,5 +1,6 @@ package com.chinaweal.youfool.prj.modules.law.entity.req; +import com.chinaweal.youfool.framework.springboot.common.util.DateUtil; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; @@ -54,6 +55,6 @@ public class LawClauseSaveReq { /** * 发布日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = DateUtil.DATE_DEFAULT_FORMAT, timezone = "GMT+8") private LocalDate publishDate; }