From 4e2be858f4ccbb7490b59ed584fd1c829eb4d556 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期二, 01 四月 2025 15:22:47 +0800 Subject: [PATCH] 修改审签问题 --- lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/HisWorkTaskServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/HisWorkTaskServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/HisWorkTaskServiceImpl.java index 32fc6b0..87fa156 100644 --- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/HisWorkTaskServiceImpl.java +++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/HisWorkTaskServiceImpl.java @@ -1,19 +1,22 @@ package org.jeecg.modules.flowable.service.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.ibatis.annotations.Param; +import org.flowable.engine.HistoryService; import org.jeecg.modules.flowable.domain.vo.FlowHistoricalVo; import org.jeecg.modules.flowable.domain.vo.HisWorkTask; import org.jeecg.modules.flowable.mapper.IHisWorkTaskMapper; import org.jeecg.modules.flowable.service.IHisWorkTaskService; import org.jeecg.modules.flowable.util.TimeUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service public class HisWorkTaskServiceImpl extends ServiceImpl<IHisWorkTaskMapper,HisWorkTask> implements IHisWorkTaskService { + @Autowired + private HistoryService historyService; @Override public List<HisWorkTask> queryHisTaskList(String drapprovedataId) { return baseMapper.queryHisTaskList(drapprovedataId); @@ -30,8 +33,8 @@ List<FlowHistoricalVo> flowHistoricalVoList=baseMapper.queryHisTaskByProcInstId(procInstId); flowHistoricalVoList.forEach(flowHistoricalVo->{ //璁$畻鏃堕棿 - if (StrUtil.isNotEmpty(flowHistoricalVo.getDuration())){ - flowHistoricalVo.setDuration(TimeUtil.howLongByMillis(Long.parseLong(flowHistoricalVo.getDuration()),2)); + if (flowHistoricalVo.getActStartTime()!=null && flowHistoricalVo.getActEndTime()!=null){ + flowHistoricalVo.setDuration(TimeUtil.howLong(flowHistoricalVo.getActStartTime(),flowHistoricalVo.getActEndTime(),2)); } }); return flowHistoricalVoList; -- Gitblit v1.9.3