From 004bd561e2af80252cb15e73bc09bbf1ef9f1090 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 25 Aug 2022 10:58:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/item/service/impl/ItemDeptServiceImpl.java    | 2 +-
 .../epdc/modules/item/service/impl/ItemServiceImpl.java   | 1 +
 esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml  | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java
index c4a85a00a..0e9f58a06 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java
@@ -102,7 +102,7 @@ public class ItemDeptServiceImpl extends BaseServiceImpl<ItemDeptDao, ItemDeptEn
         entity.setItemId(item.getId());
         entity.setDeptId(item.getGridId());
         entity.setDeptName(item.getGrid());
-        entity.setCreatedDeptId(Long.parseLong(item.getId()));
+        entity.setCreatedDeptId(Long.parseLong(item.getGrid()));
         baseDao.insert(entity);
     }
 
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 6fda776f1..ab07e4fd6 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
@@ -1941,6 +1941,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         ItemEntity entity = ConvertUtils.sourceToTarget(formDto, ItemEntity.class);
         entity.setDistributeTime(new Date());
         entity.setItemState(0);//处理中
+        entity.setLastHandleTime(new Date());
         entity.setCategoryCode("13");
         entity.setCategoryFullName("其他");
         entity.setFirstCategoryCode("13");
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
index 36f74f79b..aeeda38b9 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -159,8 +159,8 @@
                 <dynamic.datasource.first.url>
                     <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/sb_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </dynamic.datasource.first.url>
-                <spring.datasource.druid.username>shibei_test</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <dynamic.datasource.first.username>shibei_test</dynamic.datasource.first.username>
+                <dynamic.datasource.first.password>Elink@833066</dynamic.datasource.first.password>
 
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
@@ -197,8 +197,8 @@
                 <dynamic.datasource.first.url>
                     <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/sb_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </dynamic.datasource.first.url>
-                <spring.datasource.druid.username>shibei_test</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <dynamic.datasource.first.username>shibei_test</dynamic.datasource.first.username>
+                <dynamic.datasource.first.password>Elink@833066</dynamic.datasource.first.password>
 
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>