From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 25 六月 2025 11:51:38 +0800 Subject: [PATCH] Merge branch 'mdc_hyjs_master' --- lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/HisWorkTaskServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 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 new file mode 100644 index 0000000..87fa156 --- /dev/null +++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/HisWorkTaskServiceImpl.java @@ -0,0 +1,42 @@ +package org.jeecg.modules.flowable.service.impl; + +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); + } + + + /** + * 閫氳繃娴佺▼瀹炰緥id鏌ヨ鍘嗗彶浠诲姟銆� + * @param procInstId + * @return + */ + @Override + public List<FlowHistoricalVo> queryHisTaskByProcInstId(@Param("procInstId") String procInstId){ + List<FlowHistoricalVo> flowHistoricalVoList=baseMapper.queryHisTaskByProcInstId(procInstId); + flowHistoricalVoList.forEach(flowHistoricalVo->{ + //璁$畻鏃堕棿 + if (flowHistoricalVo.getActStartTime()!=null && flowHistoricalVo.getActEndTime()!=null){ + flowHistoricalVo.setDuration(TimeUtil.howLong(flowHistoricalVo.getActStartTime(),flowHistoricalVo.getActEndTime(),2)); + } + }); + return flowHistoricalVoList; + } +} -- Gitblit v1.9.3