From 2a0ddb202b816ba0e05240b210ad8231a70edffa Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期五, 20 九月 2024 14:28:45 +0800 Subject: [PATCH] 花城 新增社区活动 新双争双评需求问题清单自动更新未签退时间4 --- springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java index c75bfb5..e6af48c 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java @@ -4,6 +4,7 @@ import com.panzhihua.common.model.dtos.partybuilding.NeedProblemClaimDTO; import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO; import com.panzhihua.common.model.vos.R; +import com.panzhihua.common.model.vos.community.ComActActRegistVO; import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_dangjian.dao.NeedProblemClaimDAO; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -232,15 +234,33 @@ { NeedProblemInventoryDTO comActActivityDO=baseMapper.getActivityEndTime(aId); - if(comActActivityDO.getNeedEndTime().getTime()<new Date().getTime()) + if(comActActivityDO!=null) { - List<String> timeList=baseMapper.getNotTimeId(aId); - for (String user:timeList) + if(comActActivityDO.getNeedEndTime().getTime()<new Date().getTime()) { - long time=comActActivityDO.getNeedEndTime().getTime()-comActActivityDO.getNeedStartTime().getTime(); - baseMapper.updateEndTime(user,time+"",comActActivityDO.getNeedEndTime()); + List<NeedProblemClaimDTO> timeList=baseMapper.getNotTimeId(aId); + for (NeedProblemClaimDTO user:timeList) + { + long time=comActActivityDO.getNeedEndTime().getTime()-comActActivityDO.getNeedStartTime().getTime(); + baseMapper.updateEndTime(user.getId(),time+"",comActActivityDO.getNeedEndTime()); + } } } + else + { + List<NeedProblemClaimDTO> timeList=baseMapper.getNotTimeId(aId); + for (NeedProblemClaimDTO user:timeList) + { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(user.getPunchStartTime()); + calendar.add(Calendar.HOUR_OF_DAY, 3); // 加3小时 + Date newDate = calendar.getTime(); + long time=newDate.getTime()-user.getPunchStartTime().getTime(); + + baseMapper.updateEndTime(user.getId(),time+"",newDate); + } + } + } } -- Gitblit v1.7.1