From d48e605979f4e74fe5bdfce04c9fac1f8e3e7200 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Fri, 9 Aug 2024 15:39:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/item/form/UpdateAppealSendDTO.java |  2 +-
 .../service/impl/ItemHotlineServiceImpl.java    | 17 +++++++++++++----
 .../item/service/impl/ItemServiceImpl.java      |  3 +--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/UpdateAppealSendDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/UpdateAppealSendDTO.java
index b6e12a657..f6b5a12b6 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/UpdateAppealSendDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/UpdateAppealSendDTO.java
@@ -14,5 +14,5 @@ import java.util.Date;
 public class UpdateAppealSendDTO {
     private String sqid;
     // 7月31 新增诉求处理截止日期  先默认推后工作日5天
-    private Date jzrq;
+    private String jzrq;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java
index 19f30f8fa..ff0128cd3 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java
@@ -48,12 +48,14 @@ import com.elink.esua.epdc.modules.events.service.ItemHotlineService;
 import com.elink.esua.epdc.modules.feign.OssFeignClient;
 import com.elink.esua.epdc.modules.item.entity.ItemEntity;
 import com.elink.esua.epdc.modules.item.service.impl.PushToCityGridServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.helper.DataUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -68,6 +70,7 @@ import java.util.*;
  * @since v1.0.0 2024-06-26
  */
 @Service
+@Slf4j
 public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, ItemHotlineEntity> implements ItemHotlineService {
 
     @Autowired
@@ -143,6 +146,7 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
         for (CenterData item : centerHotLine) {
             ItemHotlineEntity itemHotlineEntity = ConvertUtils.sourceToTarget(item, ItemHotlineEntity.class);
             itemHotlineEntity.setDjrxm("12345热线：" + itemHotlineEntity.getDjrxm());
+            itemHotlineEntity.setSjnr("登记时间："+item.getDjsj()+"内容："+item.getSjnr());
             // 存入12345表
             baseDao.insert(itemHotlineEntity);
             //  存入之后 告知市里
@@ -177,12 +181,11 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
 
 
 
-    public Date getData(){
+    public String getData(){
         // 获取今天的日期
         LocalDate today = LocalDate.now();
-
         // 初始化一个计数器，用于记录工作日的天数
-        int workingDaysToAdd = 5;
+        int workingDaysToAdd = 6;
 
         // 从今天开始依次计算下一个工作日
         LocalDate futureDate = today;
@@ -195,8 +198,14 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
                 workingDaysToAdd--;
             }
         }
+        log.info("4444444444"+futureDate);
         Date date = Date.from(futureDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
-        return date;
+
+        // 创建 SimpleDateFormat 对象，指定输出格式
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        // 格式化 Date 对象
+        String formattedDate = formatter.format(date);
+        return formattedDate;
     }
 
 
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 b0170178c..a549f82cf 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
@@ -7237,8 +7237,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         String id = dto.getId();
         ItemEntity itemEntity = baseDao.selectById(id);
         dto.setSqid(itemEntity.getSqid());
-        itemEntity.setDelFlag("1");
-        baseDao.updateById(itemEntity);
+        baseDao.deleteById(itemEntity.getId());
         itemHotlineService.bcckItem(dto);
     }
 }