From 825f1b84c56732488b83d2813c7824d05e3238cc Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Tue, 20 Aug 2024 14:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=8F=91=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../events/service/impl/ItemHotlineServiceImpl.java    |  7 +++++--
 .../modules/item/service/impl/ItemServiceImpl.java     | 10 +++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

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 2b2fbeb22..fb181df6b 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
@@ -261,16 +261,19 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             // 格式化 Date 对象
             String formattedDate = formatter.format(item.getDjsj());
-            itemHotlineEntity.setSjnr("登记时间："+formattedDate+"内容："+item.getSjnr());
+            itemHotlineEntity.setSjnr("登记时间："+formattedDate+ "重办原因:"+item.getOption()+"内容：" +item.getSjnr());
             // 查询下 sqid去库里查一下，没有就当新件，sqid不变，也不能重复
 //            QueryWrapper<ItemHotlineEntity> wrapper = new QueryWrapper<>();
 //            wrapper.eq("sqid", item.getSqid());
 //            wrapper.eq("del_flag", "0");
 ////            wrapper.isNotNull("type").ne("type","");
 //            ItemHotlineEntity oldEntity = baseDao.selectOne(wrapper);
+
+
+
             //注：0办理：原来由别的区市办理，现在由当前区市办理  插入 2：退件不通过，需要继续办理  这个得更新。不能插入
             //4：办理结果不符合要求，需要重新办理   就是对处理结果不满意的 。插入一个新件出去处理
-
+            // 改为都插入 等分发的时候在做处理
             itemHotlineEntity.setCbFlag("1");
 
             // 存入12345表
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 fa15b9e2c..b0360eb96 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
@@ -6385,8 +6385,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             lambdaQueryWrapper.and(wrap->wrap.ne(ItemHotlineEntity::getBackFlag,"1").or().isNull(ItemHotlineEntity::getBackFlag));
             // 新增筛选 是否是市里驳回重办件
             lambdaQueryWrapper.eq(ItemHotlineEntity::getCbFlag,params.get("cbFlag"));
-            lambdaQueryWrapper
-                    .groupBy(ItemHotlineEntity::getSqid);
+//            lambdaQueryWrapper
+//                    .groupBy(ItemHotlineEntity::getSqid);
             lambdaQueryWrapper.orderByDesc(ItemHotlineEntity::getDjsj);
             IPage<ItemHotlineEntity> page = getPage(params);
             IPage<ItemHotlineEntity> itemHotlineEntityIPage = itemHotlineDao.selectPage(page, lambdaQueryWrapper);
@@ -6409,10 +6409,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 //                throw new Exception("此id找不到12345热线数据"+dto.getId());
 //            }
 
+//        if("2".equals(itemHotlineEntity.getType())){
+//
+//        }
         if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())){
             LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
             itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getSqid())
-                    .eq(ItemEntity::getAppealSource,NumConstant.THREE_STR);
+                    .eq(ItemEntity::getAppealSource,NumConstant.THREE_STR)
+                    .eq(ItemEntity::getDelFlag,"0");
             if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){
                 return true;
             }