From 3fca3eed63c8eeb0c21f151cf3378218a145e0be Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Fri, 17 Feb 2023 10:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=81=E4=B8=9A=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0+=E7=BC=96=E5=8F=B7=E6=98=AF=E5=90=A6=E6=98=AF?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarBussionessStandController.java    |  2 +-
 .../service/Impl/SarPublicIdeaServiceImpl.java      | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
index a42e4eec..e332ab5a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
@@ -374,7 +374,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
                 .eq(null!=sarBussionessStand.getStandNumber(),"STAND_NUMBER",sarBussionessStand.getStandNumber());
         Integer s=sarBussionessStandEOService.count(wrapper);
         if (s>0){
-            return Result.error("当前标准编号和中文名称已存在");
+            return Result.error("当前企业编号和中文名称已存在");
         }else {
             return Result.success();
         }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
index d6213731..2900d02a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandIdea.service.Impl;
 
 
+import com.adc.da.person.entity.TsPersonCollect;
 import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaDao;
 
 import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea;
@@ -96,6 +97,18 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
         IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
         System.out.println("总条数" + userIPage.getTotal());
         System.out.println("总页数" + userIPage.getPages());
+        //三天以内收藏的 标题名称后面加 new 一小时3600000  一天时间戳 为 86400000 三天259,200,000
+        long newTime = 259200000;
+        Date date = new Date();
+        long time = date.getTime();
+        for (SarPublicIdea data : userIPage.getRecords()){
+            long creationTime = data.getEndTime().getTime();
+            if(creationTime + newTime == time || creationTime + newTime > time){
+                StringBuffer sb = new StringBuffer();
+                sb.append("<span style=\'color:red\'>"+"(new)"+"</span>").append(data.getCid());
+                data.setCid(sb.toString());
+            }
+        }
         return userIPage;
     }