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 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 @@ and i.CREATED_TIME <= #{endTime} + + and i.CREATED_TIME <= #{endTime} + AND find_in_set(#{deptId},i.ALL_DEPT_IDS) and i.APPEAL_SOURCE = #{appealSource} + + and i.STREET_APPEAL_FLAG = '1' and i.APPEAL_FLAG=0 + ORDER BY i.UPDATED_TIME DESC