From e4ec18cd5d73b9d1c9dda133516dce423b7818da Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 25 May 2023 15:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=EF=BC=9A=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=B3=BB=E7=BB=9F=E8=AF=84=E4=BB=B7=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/modules/item/entity/ItemEntity.java | 5 +++++
 .../epdc/modules/item/service/impl/ItemServiceImpl.java     | 2 ++
 .../item/service/impl/PushToCityGridServiceImpl.java        | 6 +++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
index 678e5b189..4fb341aeb 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
@@ -299,4 +299,9 @@ public class ItemEntity extends BaseEpdcEntity {
      */
     private String appealSource;
 
+    /**
+     * 是否为系统评价
+     */
+    private Integer evaluationSystemFlag;
+
 }
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 c35e63210..0aab65f79 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
@@ -4920,6 +4920,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             entity.setEvaluationTime(new Date());
             //2023-04新增  解决情况01 解决 02 基本解决 03 未解决
             entity.setSolutionInfo("02");
+            // 是否系统默认评价
+            entity.setEvaluationSystemFlag(1);
         }
         entity.setEvaluationState("0");
         updateById(entity);
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
index 11e230a04..9436d77b1 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
@@ -1056,7 +1056,11 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             //评价人员
             EvaluationResultDTO.CzrBean czr = new EvaluationResultDTO.CzrBean();
             czr.setId(item.getUserId());
-            czr.setXm(item.getNickName());
+            if (item.getEvaluationSystemFlag() == 1){
+                czr.setXm("系统评价人员");
+            }else {
+                czr.setXm(item.getNickName());
+            }
             czr.setSsbmbm(item.getGridId().toString());
             czr.setSsbm(item.getGrid());
             czr.setSsjgbm(getJgbm(item.getGridId(), NumConstant.ZERO_STR));