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 BaseController0){ - 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 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(""+"(new)"+"").append(data.getCid()); + data.setCid(sb.toString()); + } + } return userIPage; }