From 878500afec6c7daa644b9573fd56e9903cf5d39f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 13 十月 2022 13:51:39 +0800
Subject: [PATCH] 修改添加办事指南,名称需要做判重bug

---
 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java |   56 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
index a92723e..56fdd6c 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -38,32 +38,35 @@
     @Override
     public TransactionEvent selectConfigData(String Id,SysUser sysUser) {
         TransactionEvent transactionEvent = baseMapper.selectConfigData(Id);
-        LocalDateTime startTime = LocalDate.now().atTime(0, 0, 0);
-        LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);
-        AutomessageTransactionEventInterview automessageTransactionEventInterview = automessageTransactionEventInterviewMapper.selectOne(new QueryWrapper<AutomessageTransactionEventInterview>()
+        //如果当前没有登录用户则不增加浏览次数
+        if (sysUser!=null){
+            LocalDateTime startTime = LocalDate.now().atTime(0, 0, 0);
+            LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);
+            AutomessageTransactionEventInterview automessageTransactionEventInterview = automessageTransactionEventInterviewMapper.selectOne(new QueryWrapper<AutomessageTransactionEventInterview>()
                 .lambda().eq(AutomessageTransactionEventInterview::getTransactionEventId, Id)
                 .eq(AutomessageTransactionEventInterview::getUserId, sysUser.getUserId())
                 .orderByDesc(AutomessageTransactionEventInterview::getInterviewTime)
                 .last("limit 1"));
-        transactionEvent.setQueryTime(LocalDateTime.now());
-        //判断上次访问时间是不是今天 如果
-        if (automessageTransactionEventInterview==null||(!(transactionEvent.getQueryTime().isAfter(startTime)&&transactionEvent.getQueryTime().isBefore(endTime)))) {
-            transactionEvent.setBrowseNum(transactionEvent.getBrowseNum()+1);
-            baseMapper.updateById(transactionEvent);
-            AutomessageTransactionEventInterview automessageTransactionEventInterviewNew =
+            transactionEvent.setQueryTime(LocalDateTime.now());
+            //判断上次访问时间是不是今天 如果是今天不增加浏览次数
+            if (automessageTransactionEventInterview==null||(!(transactionEvent.getQueryTime().isAfter(startTime)&&transactionEvent.getQueryTime().isBefore(endTime)))) {
+               transactionEvent.setBrowseNum(transactionEvent.getBrowseNum()+1);
+               baseMapper.updateById(transactionEvent);
+               AutomessageTransactionEventInterview automessageTransactionEventInterviewNew =
                     new AutomessageTransactionEventInterview();
-            automessageTransactionEventInterviewNew.setTransactionEventId(Integer.valueOf(Id));
-            automessageTransactionEventInterviewNew.setUserId(new Long(sysUser.getUserId()));
-            automessageTransactionEventInterviewNew.setInterviewTime(LocalDateTime.now());
-            automessageTransactionEventInterviewMapper.insert(automessageTransactionEventInterviewNew);
+               automessageTransactionEventInterviewNew.setTransactionEventId(Integer.valueOf(Id));
+               automessageTransactionEventInterviewNew.setUserId(new Long(sysUser.getUserId()));
+               automessageTransactionEventInterviewNew.setInterviewTime(LocalDateTime.now());
+               automessageTransactionEventInterviewMapper.insert(automessageTransactionEventInterviewNew);
+          }
         }
         return transactionEvent;
     }
 
     @Override
     public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
-                                                   String matterAndUser, String classifyGrade) {
-        return baseMapper.selectConfigList(page,  state, matterAndUser, classifyGrade);
+                                                   String matterAndUser, String classifyGrade,List<String> ids) {
+        return baseMapper.selectConfigList(page,  state, matterAndUser, classifyGrade,ids);
     }
 
     @Override
@@ -82,8 +85,8 @@
     }
 
     @Override
-    public int countNum(String matterAndUser,String classifyGrade) {
-        return baseMapper.countNum( matterAndUser, classifyGrade);
+    public int countNum(String matterAndUser,String classifyGrade,List<String> ids) {
+        return baseMapper.countNum( matterAndUser, classifyGrade, ids);
     }
 
     @Override
@@ -117,13 +120,14 @@
         List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord);
         recommendResult.setTransactionEventList(transactionEventEntities);
         for (TransactionEvent transactionEvent: transactionEventEntities) {
-            String[] associateNames = transactionEvent.getAssociateNames().split(",");
-            for (String  associateName: associateNames) {
-                KeywordEntity keywordEntity = new KeywordEntity();
-                keywordEntity.setName(associateName);
-                keywordEntityList.add(keywordEntity);
+            if (transactionEvent.getAssociateNames()!=null) {
+                String[] associateNames = transactionEvent.getAssociateNames().split(",");
+                for (String associateName : associateNames) {
+                    KeywordEntity keywordEntity = new KeywordEntity();
+                    keywordEntity.setName(associateName);
+                    keywordEntityList.add(keywordEntity);
+                }
             }
-
         }
         recommendResult.setKeywordEntityList(keywordEntityList);
         List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByKeyWord(keyWord);
@@ -132,6 +136,12 @@
     }
 
     @Override
+    public String selectDataIfExist(String departmentId, String matterName) {
+        return baseMapper.selectDataIfExist(departmentId,matterName);
+    }
+
+
+    @Override
     public int countNumByMatterName(String matterName) {
         return baseMapper.countNumByMatterName(matterName);
     }

--
Gitblit v1.7.1