添加事项清单导入

dataCenter-manager/src/main/java/com/mortals/xhx/modules/implementlist/listener/RybMatterImportListener.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.modules.implementlist.listener;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
+import com.mortals.xhx.common.utils.SnowFlakeUtil;
 import com.mortals.xhx.modules.implementlist.dao.RybMatterDao;
 import com.mortals.xhx.modules.implementlist.model.RybMatterListEntry;
 import lombok.SneakyThrows;
@@ -38,6 +39,7 @@ public class RybMatterImportListener extends AnalysisEventListener<RybMatterList
     @SneakyThrows
     @Override
     public void invoke(RybMatterListEntry rybMatterListEntry, AnalysisContext analysisContext) {
+        rybMatterListEntry.setId(SnowFlakeUtil.get().nextId());
         entityList.add(rybMatterListEntry);
         //达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
         if (entityList.size() >= BATCH_COUNT) {

dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/RybApplyAndAcceptInformationTaskImpl.java

@@ -65,9 +65,9 @@ public class RybApplyAndAcceptInformationTaskImpl implements ITaskExcuteService
     }
 
     private void applyAndAccept(List<InformationEntity> informationEntities) {
-        log.info("开始推送申请并受理理数据");
+        log.info("开始推送申请并受理数据");
         if(CollectionUtils.isEmpty(informationEntities)){
-            log.info("没有需要推送申请并受理理数据");
+            log.info("没有需要推送申请并受理数据");
             return;
         }
         List<InformationEntity> entities = informationEntities.parallelStream().map(e -> {

dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/RybSubmitLinkDataInformationTaskImpl.java

@@ -49,7 +49,7 @@ public class RybSubmitLinkDataInformationTaskImpl implements ITaskExcuteService
     }
 
     private void submitLinkData(List<InformationEntity> informationEntities) {
-        log.info("开始推送申请并受理理数据");
+        log.info("开始推送办件环节数据");
         if(CollectionUtils.isEmpty(informationEntities)){
             log.info("没有需要推送办件环节数据");
             return;

dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/web/InformationController.java

@@ -142,8 +142,4 @@ public class InformationController extends BaseCRUDJsonController<InformationSer
     }
 
 
-
-
-
-
 }
\ No newline at end of file

dataCenter-manager/src/main/resources/sqlmap/module/implementlist/rybMatter.xml

@@ -4,6 +4,7 @@
 
     <select id="findRyb" resultType="com.mortals.xhx.modules.implementlist.model.RybMatterListEntry">
         select
+            id,
             dept_code as deptCode,
             dept_name as deptName,
             matter_name as matterName,
@@ -17,7 +18,7 @@
     <select id="insertRyb" parameterType="collection">
         insert into values
         <foreach collection="collection" item="entry" index=",">
-            (#{entry.deptCode},#{entry.deptName},#{entry.matterName},#{entry.matterCode},#{entry.taskId},#{entry.matterType})
+            (#{entry.id},#{entry.deptCode},#{entry.deptName},#{entry.matterName},#{entry.matterCode},#{entry.taskId},#{entry.matterType})
         </foreach>
     </select>
 </mapper>
\ No newline at end of file

dataCenter-manager/src/main/resources/sqlmap/module/implementlist/rybWork.xml

@@ -4,6 +4,7 @@
 
     <select id="findRyb" resultType="com.mortals.xhx.modules.implementlist.model.RybWorkEntry">
         select
+            id,
             dept_code as deptCode,
             dept_name as deptName,
             receive_user_name as receiveUserName,
@@ -16,7 +17,7 @@
     <select id="insertRyb" parameterType="collection">
         insert into values
         <foreach collection="collection" item="entry" index=",">
-            (#{entry.deptCode},#{entry.deptName},#{entry.matterName},#{entry.receiveUserName},#{entry.receiveUserIdcard},#{entry.receiveUserPhone})
+            (#{entry.id},#{entry.deptCode},#{entry.deptName},#{entry.matterName},#{entry.receiveUserName},#{entry.receiveUserIdcard},#{entry.receiveUserPhone})
         </foreach>
     </select>
 </mapper>
\ No newline at end of file