From 41861190d4c1be917e8612e44eb5a1806eee7773 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 20 May 2022 16:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=BD=AC=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E6=8C=87=E6=B4=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcUserDemandRecServiceImpl.java | 16 ++++++++++++++++
 .../java/com/epmet/dto/form/IcDemandFormDTO.java | 12 ++++++++++++
 .../db/migration/V0.0.23__add_ic_event.sql       |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index ac44e6559a..003485d8d9 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -1396,6 +1396,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         Date now = new Date();
         DemandRecId resultDto = new DemandRecId();
         resultDto.setDemandRecId(formDTO.getDemandRecId());
+        String demandRecId = "";
         if (StringUtils.isNotBlank(formDTO.getDemandRecId())) {
             //修改需求
             IcUserDemandRecEntity origin = baseDao.selectById(formDTO.getDemandRecId());
@@ -1427,6 +1428,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             insertEntity.setGridPids(gridInfoRes.getData().getPids());
             insertEntity.setDemandUserType(UserDemandConstant.MINI_RESI);
             insertEntity.setStatus(UserDemandConstant.PENDING);
+            if("ic_event".equals(formDTO.getOrigin())){
+                insertEntity.setStatus(UserDemandConstant.ASSIGNED);
+            }
             insertEntity.setEvaluateFlag(false);
             //设置上报人消息
             insertEntity.setReportType(UserDemandConstant.SELF_HELP_REPORT);
@@ -1441,6 +1445,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             }
             baseDao.insert(insertEntity);
             resultDto.setDemandRecId(insertEntity.getId());
+            demandRecId = insertEntity.getId();
         }
         //插入操作日志
         IcUserDemandOperateLogEntity logEntity = new IcUserDemandOperateLogEntity();
@@ -1452,6 +1457,17 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         logEntity.setOperateTime(now);
         operateLogDao.insert(logEntity);
 
+        //来源事件管理的需求增加指派记录
+        if("ic_event".equals(formDTO.getOrigin())){
+            IcUserDemandServiceEntity serviceEntity = ConvertUtils.sourceToTarget(formDTO, IcUserDemandServiceEntity.class);
+            serviceEntity.setDemandRecId(demandRecId);
+            String serviceName = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
+            if (StringUtils.isBlank(serviceName)) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
+            }
+            serviceEntity.setServerName(serviceName);
+            demandServiceDao.insert(serviceEntity);
+        }
         return resultDto;
     }
 
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcDemandFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcDemandFormDTO.java
index 98ad8b1bb1..50d659f799 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcDemandFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcDemandFormDTO.java
@@ -153,5 +153,17 @@ public class IcDemandFormDTO implements Serializable {
      * 来源Id[目前只有来源事件管理的有值]
      */
     private String originId;
+    /**
+     * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+     */
+    private String serviceType;
+    /**
+     * 志愿者：居民端爱心互助的志愿者userId；
+     */
+    private String serverId;
+    /**
+     * 服务方名称
+     */
+    private String serverName;
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.23__add_ic_event.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.23__add_ic_event.sql
index a2cc8bed1d..b5720f74b9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.23__add_ic_event.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.23__add_ic_event.sql
@@ -119,7 +119,7 @@ CREATE TABLE `ic_event_reply` (
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
   `IC_EVENT_ID` varchar(64) NOT NULL COMMENT '事件Id',
   `FROM_USER_ID` varchar(64) NOT NULL COMMENT '回复人用户Id[工作人员ID]',
-  `CONTENT` varchar(255) NOT NULL COMMENT '内容',
+  `CONTENT` varchar(1024) NOT NULL COMMENT '内容',
   `USER_SHOW_NAME` varchar(64) NOT NULL COMMENT '报事人：组织-人名',
   `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除',
   `REVISION` int(11) NOT NULL COMMENT '乐观锁',