diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemMeritsEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemMeritsEntity.java index 24f827ab..ec9ecb43 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemMeritsEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemMeritsEntity.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -342,5 +343,10 @@ public class OemMeritsEntity extends BaseEntity { */ @Schema(description = "清零问题-绩效得分") private Double qlwtNum; + /** + * 月份 + */ + @Schema(description = "月份") + private Date month; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemMeritsVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemMeritsVO.java index 98eaa99f..52d6cdda 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemMeritsVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemMeritsVO.java @@ -37,7 +37,10 @@ public class OemMeritsVO extends OemMeritsEntity { private String monthStr; public String getMonthStr() { - return DateTimeFormatter.ofPattern("yyyy-MM") - .format(this.getUpdateTime().toInstant().atZone(ZoneId.systemDefault())); + if (null != this.getMonth()) { + return DateTimeFormatter.ofPattern("yyyy-MM") + .format(this.getMonth().toInstant().atZone(ZoneId.systemDefault())); + } + return ""; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemMeritsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemMeritsMapper.xml index 1f5c5ecc..c5682f1e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemMeritsMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemMeritsMapper.xml @@ -58,6 +58,7 @@ + @@ -91,7 +92,7 @@ - AND TO_CHAR(om.update_time, 'YYYY-MM') = #{query.dateStr} + AND TO_CHAR(om.month, 'YYYY-MM') = #{query.dateStr} AND om.PRODUCE_STATUS IN diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemMeritsServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemMeritsServiceImpl.java index f901ab93..499a96c0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemMeritsServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemMeritsServiceImpl.java @@ -58,10 +58,10 @@ public class OemMeritsServiceImpl extends BaseServiceImpl saves = new ArrayList<>(); for (OemMeritsEntity entity : entities) { - entity.setUpdateTime(date); + entity.setMonth(date); entity.setOmStatus(OemMeritsEntity.NEW_DATA); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.apply("TO_CHAR(update_time, 'YYYY-MM') = TO_CHAR({0}, 'YYYY-MM')", date) + wrapper.apply("TO_CHAR(MONTH, 'YYYY-MM') = TO_CHAR({0}, 'YYYY-MM')", date) .eq(OemMeritsEntity::getCaId, entity.getCaId()) .eq(OemMeritsEntity::getOcId, entity.getOcId()); // .eq(OemMeritsEntity::getOmStatus, OemMeritsEntity.NEW_DATA); @@ -148,9 +148,9 @@ public class OemMeritsServiceImpl extends BaseServiceImpl monthSet = proofreadSave.getOemMeritsEntities().stream() .map(entity -> { - // 使用DateTimeFormatter将updateTime格式化为"yyyy-MM" + // 使用DateTimeFormatter将Month格式化为"yyyy-MM" return DateTimeFormatter.ofPattern("yyyy-MM") - .format(entity.getUpdateTime().toInstant().atZone(ZoneId.systemDefault())); + .format(entity.getMonth().toInstant().atZone(ZoneId.systemDefault())); }) .filter(Objects::nonNull) // 过滤掉可能的null值 .collect(Collectors.toSet()); @@ -192,9 +192,9 @@ public class OemMeritsServiceImpl extends BaseServiceImpl monthSet = oemMeritsEntities.stream() .map(entity -> { - // 使用DateTimeFormatter将updateTime格式化为"yyyy-MM" + // 使用DateTimeFormatter将Month格式化为"yyyy-MM" return DateTimeFormatter.ofPattern("yyyy-MM") - .format(entity.getUpdateTime().toInstant().atZone(ZoneId.systemDefault())); + .format(entity.getMonth().toInstant().atZone(ZoneId.systemDefault())); }) .filter(Objects::nonNull) // 过滤掉可能的null值 .collect(Collectors.toSet()); @@ -335,7 +335,7 @@ public class OemMeritsServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); // 按月份过滤:使用apply进行日期格式化匹配 - queryWrapper.apply("TO_CHAR(update_time, 'YYYY-MM') = {0}", targetMonth) + queryWrapper.apply("TO_CHAR(MONTH, 'YYYY-MM') = {0}", targetMonth) .eq(OemMeritsEntity::getProduceStatus, OemMeritsEntity.PRODUCT_OK) .eq(OemMeritsEntity::getQualityStatus, OemMeritsEntity.QUALITY_OK) .isNotNull(OemMeritsEntity::getEndScore) // 排除最终得分为空的数据