From 62d73f9d161d98354b3ac803c31074f91df9bfdc Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Thu, 16 Jan 2025 13:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=AF=89=E6=B1=82?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=88=A0=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/item/service/impl/ItemServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/item/ItemDao.xml              | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 69d20bba7..6e6fbd442 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -6241,7 +6241,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         appealFormDTO.setFiles(appealAuditFormDTO.getFiles());
         appealFormDTO.setJjqk(appealAuditFormDTO.getJjqk());
         appealFormDTO.setPjjg(appealAuditFormDTO.getPjjg());
-        appealFormDTO.setShjg(appealAuditFormDTO.getShjg());
+        appealFormDTO.setShjg("01");
         appealFormDTO.setSqid(appealAuditFormDTO.getSqid());
         appealFormDTO.setSsyy(appealAuditFormDTO.getSsyy());
         String appeal = pushToCityGridServiceImpl.appeal(appealFormDTO);
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index dd52c78e3..02ae122cb 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -4354,12 +4354,18 @@
         <if test="endTime != null and endTime != ''">
             and i.CREATED_TIME &lt;= #{endTime}
         </if>
+        <if test="endTime != null and endTime != ''">
+            and i.CREATED_TIME &lt;= #{endTime}
+        </if>
         <if test="deptId != null and deptId != ''">
             AND find_in_set(#{deptId},i.ALL_DEPT_IDS)
         </if>
         <if test="appealSource != null and appealSource != ''">
             and i.APPEAL_SOURCE = #{appealSource}
         </if>
+        <if test='isExamine != null and isExamine != "" and isExamine == "1"'>
+          and  i.STREET_APPEAL_FLAG = '1' and i.APPEAL_FLAG=0
+        </if>
         ORDER BY
         i.UPDATED_TIME DESC
     </select>