From d2a326a073f9340292955e08097910b48815d9b9 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 26 Dec 2019 17:30:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=BC=80=E5=A7=8B=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=AE=A1=E6=A0=B8=E5=B7=B2=E6=8A=A5=E5=90=8D=E7=9A=84?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ActUserRelationServiceImpl.java | 24 ++++++++++++------- .../elink/esua/epdc/dao/ScheduleJobDao.java | 7 +++++- .../esua/epdc/service/ScheduleJobService.java | 6 ++++- .../service/impl/ScheduleJobServiceImpl.java | 6 +++++ .../activity/AutoAuditActUserTaskImpl.java | 14 ++++++++++- .../main/resources/mapper/ScheduleJobDao.xml | 4 ++++ 6 files changed, 49 insertions(+), 12 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java index c6e7162ed..5df92bb6b 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java @@ -19,13 +19,11 @@ package com.elink.esua.epdc.modules.activity.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.activity.ActUserLogDTO; -import com.elink.esua.epdc.activity.ActUserRelationDTO; +import com.elink.esua.epdc.activity.*; import com.elink.esua.epdc.activity.form.ActUserRelationAuditFormDTO; import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO; import com.elink.esua.epdc.activity.result.ActUserClockResultDTO; import com.elink.esua.epdc.activity.result.ActUserRelationResultDTO; -import com.elink.esua.epdc.activity.*; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -35,6 +33,7 @@ import com.elink.esua.epdc.constant.ActStateConstant; import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao; import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity; import com.elink.esua.epdc.modules.activity.redis.ActUserRelationRedis; +import com.elink.esua.epdc.modules.activity.service.ActInfoService; import com.elink.esua.epdc.modules.activity.service.ActUserLogService; import com.elink.esua.epdc.modules.activity.service.ActUserRelationService; import org.apache.commons.lang3.StringUtils; @@ -59,6 +58,9 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -266,25 +268,29 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl data = baseDao.selectListActUserInfo(actId); if(data != null && data.size() > 0){ for(int i = 0 ; i < data.size() ; i++){ - //更新人员活动关系表 + // 更新人员活动关系表 ActUserRelationDTO actUserRelationDTO = data.get(i); - actUserRelationDTO.setStatus("1");//审核通过 + actUserRelationDTO.setStatus(actUserDefaultState);// 默认状态 ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class); updateById(entity); - //存储活动日志表 + // 存储活动日志表 ActUserLogDTO actUserLogDTO = new ActUserLogDTO(); actUserLogDTO.setActId(actUserRelationDTO.getActId()); actUserLogDTO.setUserId(actUserRelationDTO.getUserId()); - actUserLogDTO.setOperationType("1");//审核通过 + actUserLogDTO.setOperationType(actUserDefaultState);// 默认状态 actUserLogDTO.setOperationTime(new Date()); actUserLogService.save(actUserLogDTO); } }else{ - return new Result().error("该活动暂时没有未审核的志愿者"); + return new Result().ok("该活动暂时没有未审核的志愿者"); } return new Result().ok("该活动对已报名的志愿者自动审核成功"); diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java index e537a63db..4d5e139ff 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java @@ -8,10 +8,10 @@ package com.elink.esua.epdc.dao; -import com.elink.esua.epdc.entity.ScheduleJobEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.ScheduleJobEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -27,4 +27,9 @@ public interface ScheduleJobDao extends BaseDao { * 批量更新状态 */ int updateBatch(Map map); + + /** + * 根据params删除某一个定时任务 + */ + void deleteJobByParams(@Param("params")String params); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobService.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobService.java index 66b96fff4..a8ff4a1c9 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobService.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobService.java @@ -8,7 +8,6 @@ package com.elink.esua.epdc.service; -import com.elink.esua.epdc.entity.ScheduleJobEntity; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.ScheduleJobDTO; @@ -61,4 +60,9 @@ public interface ScheduleJobService extends BaseService { * 恢复运行 */ void resume(Long[] ids); + + /** + * 根据params删除某一个定时任务 + */ + void deleteJobByParams(String params); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java index 6ca410703..5e31f78e8 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java @@ -130,4 +130,10 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl + + delete from schedule_job where params = #{params} + +