From ee8bb5a4de974c53aef8a37d49b6ee32b3c8e3a1 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Tue, 14 Nov 2023 19:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=94=B5=E9=87=8F=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/fill/service/impl/GenerateServiceImpl.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java
index 5c7e1d6..80db3af 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java
@@ -78,6 +78,11 @@ public class GenerateServiceImpl extends BaseServiceImpl<GenerateMapper, Generat
         GenerateEntity history = this.getOne(new LambdaQueryWrapper<GenerateEntity>(){{
             eq(GenerateEntity::getStationCode, entity.getStationCode());
             eq(GenerateEntity::getFillDate,entity.getFillDate());
+            eq(GenerateEntity::getIsDeleted,0);
+            if (ObjectUtil.isNotEmpty(entity.getId())){
+                eq(GenerateEntity::getFillDate,entity.getFillDate());
+            }
+            last("limit 1");
         }});
         if(ObjectUtil.isNotEmpty(history) && (ObjectUtil.isEmpty(entity.getId()) || !entity.getId().equals(history.getId()))){
             throw new ServiceException("日期已经存在填报数据！");