From e2f14ab9a59cbe892edcc170bcb4aabfc901fd18 Mon Sep 17 00:00:00 2001
From: HAHA <1824278510@qq.com>
Date: Tue, 27 Sep 2022 11:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PushToCityGridServiceImpl.java     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

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 8654a7ad5..d21bf806d 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
@@ -21,7 +21,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
-import com.elink.esua.epdc.commons.tools.constant.StrConstant;
 import com.elink.esua.epdc.commons.tools.enums.CityPushEnum;
 import com.elink.esua.epdc.commons.tools.enums.CityPushLinkEnum;
 import com.elink.esua.epdc.commons.tools.enums.CityPushStateEnum;
@@ -48,7 +47,6 @@ import com.elink.esua.epdc.modules.item.entity.ItemEntity;
 import com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity;
 import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity;
 import com.elink.esua.epdc.modules.item.entity.ItemReportInterfaceLogEntity;
-import com.elink.esua.epdc.modules.item.service.ItemGridPlatformService;
 import com.elink.esua.epdc.modules.item.service.ItemService;
 import com.elink.esua.epdc.modules.item.service.PushToCityGridService;
 import lombok.extern.slf4j.Slf4j;
@@ -60,9 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -471,8 +467,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             // 当前处理环节
             data.setDqclhj(CityPushLinkEnum.ZJYP.getCode());
 
-            // 操作人姓名 todo
-            dto.setXm("HAHA");
+            dto.setXm(SecurityUser.getUser().getUsername());
             // 操作人员唯一标识
             dto.setId(item.getCreatedBy());
 
@@ -484,11 +479,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(item.getHandlerDeptId());
             if (dtoResult.success() && null != dtoResult.getData()) {
                 SysDeptDTO sysDeptDTO = dtoResult.getData();
+                // 社区直接获取机构id
                 if(sysDeptDTO.getTypeKey().equals("community_party")) {
                     // 所属机构id
                     dto.setSsjgbm(sysDeptDTO.getDisCenterZoningCode());
-                    // todo
-                    dto.setSsjg("社区部门名称");
+                    // 所属机构名称
+                    dto.setSsjg(sysDeptDTO.getName());
+                    // 网格调接口获取机构id
                 }else if(sysDeptDTO.getTypeKey().equals("grid_party")) {
                     Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(item.getHandlerDeptId());
                     CompleteDeptDTO completeDeptDTO = completeDept.getData();