Merge remote-tracking branch 'origin/master'

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;
+
 }

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);

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,15 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             //评价人员
             EvaluationResultDTO.CzrBean czr = new EvaluationResultDTO.CzrBean();
             czr.setId(item.getUserId());
-            czr.setXm(item.getNickName());
+            if (item.getEvaluationSystemFlag()!=null){
+                if (item.getEvaluationSystemFlag() == 1){
+                    czr.setXm("系统评价人员");
+                }else {
+                    czr.setXm(item.getNickName());
+                }
+            }else{
+                czr.setXm(item.getNickName());
+            }
             czr.setSsbmbm(item.getGridId().toString());
             czr.setSsbm(item.getGrid());
             czr.setSsjgbm(getJgbm(item.getGridId(), NumConstant.ZERO_STR));
@@ -1427,7 +1435,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             return;
         }
 
-        LambdaQueryWrapper<ItemHandleProcessEntity> entityLambdaQueryWrapper = new LambdaQueryWrapper<ItemHandleProcessEntity>().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,1111);
+        LambdaQueryWrapper<ItemHandleProcessEntity> entityLambdaQueryWrapper = new LambdaQueryWrapper<ItemHandleProcessEntity>().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue());
         List<ItemHandleProcessEntity> list = itemHandleProcessDao.selectList(entityLambdaQueryWrapper);
 
         if (list.size()>0){
@@ -1461,8 +1469,11 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         saveLog(item.getItemId(), item.getId(), "响应接收", PushToCityGridConstant.RECEIVE, JSONObject.toJSONString(dto), result);
 
         item.setId(null);
-        item.setState(1111);
+        item.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue());
+        item.setHandleAdvice("诉求已响应接收。");
+        item.setOutHandleAdvice("诉求已响应接收。");
         item.setCreatedTime(date);
+        item.setUpdatedTime(date);
         itemHandleProcessDao.insert(item);
 
     }