diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/resources/application-flow.yml b/jeecg-boot-module/jeecg-module-flow/src/main/resources/application-flow.yml index dc72fdd..77f666a 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/resources/application-flow.yml +++ b/jeecg-boot-module/jeecg-module-flow/src/main/resources/application-flow.yml @@ -12,7 +12,7 @@ flow-biz: business-key: "business_id" dept-worker-key: "subApproveUser" xi-speak-fb-flowcode: "process_1778315114392" - form-url: "bg/xispeak/components/BgXiSpeakBPMForm" + form-url: "bg/xispeak/components/BgXiSpeakBPMForm?showFeedbackInfo=1&showJiJianFields=1" tem-impl-worker-key: "tem_impl_worker" tem-impl-leader-key: "tem_impl_leader" tem-bg-leader-key: "tem_bg_leader" diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java index 3156842..ebd3408 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.bg.xispeak.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.HistoryService; import org.flowable.engine.RuntimeService; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; @@ -10,6 +11,8 @@ import org.jeecg.common.system.vo.SelectTreeModel; import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.extbpm.process.entity.ExtActTaskCc; +import org.jeecg.modules.extbpm.process.service.IExtActTaskCcService; import org.jeecg.modules.bg.xispeak.mapper.BgXiSpeakMapper; import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; @@ -40,7 +43,9 @@ public class BgXiSpeakServiceImpl extends ServiceImpl() .eq(TaskApprovalOpinion::getProcessInstId, procId)); + + // 删除抄送记录 + extActTaskCcService.remove( + new LambdaQueryWrapper() + .eq(ExtActTaskCc::getProcInstId, procId)); } // 4. 重新创建一个干净的 Wrapper,绝不能带 for update! diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/TaskJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/TaskJob.java index 57aa655..9b0a7cc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/TaskJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/TaskJob.java @@ -45,14 +45,15 @@ public class TaskJob implements Job { long startTime = System.currentTimeMillis(); LocalDateTime startDateTime = LocalDateTime.now(); -// 1. 查询建议:只查询必要的字段,避免 select * + // 1. 查询建议:只查询必要的字段,避免 select * List executeTaskTaskList = taskTaskServiceImpl .lambdaQuery() .select(TaskTask::getId, TaskTask::getFlowCode, TaskTask::getJsonData, TaskTask::getFormUrl, TaskTask::getCreateBy) .eq(TaskTask::getBpmStatus, 1) .eq(TaskTask::getTriggerType, FlowConstants.Strategy.RECURRING_ONLY) - .lt(TaskTask::getStartTime, startDateTime) + .ge(TaskTask::getStartTime, startDateTime.toLocalDate().atStartOfDay()) + .lt(TaskTask::getStartTime, startDateTime.toLocalDate().plusDays(1).atStartOfDay()) .list(); // 2. 集合判空实践