Merge remote-tracking branch 'origin/master'

Lius

2025-04-10 2be0d59a05f526ced8f0401126015deeea486663

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java

@@ -14,7 +14,6 @@
import org.jeecg.modules.flowable.util.TimeUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
@@ -58,13 +57,10 @@
        return null;
    }

    @Transactional(isolation = Isolation.READ_COMMITTED)    // 降低隔离级别
    @Transactional   // 降低隔离级别
    public FlowMyBusiness getByDataId(String dataId) {
        LambdaQueryWrapper<FlowMyBusiness> flowMyBusinessLambdaQueryWrapper = new LambdaQueryWrapper<>();
        flowMyBusinessLambdaQueryWrapper.eq(FlowMyBusiness::getDataId,dataId)
        ;
        //如果保存数据前未调用必调的FlowCommonService.initActBusiness方法，就会有问题
        FlowMyBusiness business = this.getOne(flowMyBusinessLambdaQueryWrapper);
        FlowMyBusiness business = flowMyBusinessMapper.selectByDataId(dataId);
        return business;
    }

@@ -81,11 +77,10 @@
    /**
     * 流程-我的已办
     * @param flowMyBusinessDto
     * @param page
     * @return
     */
    public IPage<FlowTaskDto> getPageListMyBusiness(Page page, FlowMyBusinessDto flowMyBusinessDto){
        return flowMyBusinessMapper.PageListMyBusiness(page,flowMyBusinessDto);
    public List<FlowTaskDto> ListMyBusiness(FlowMyBusinessDto flowMyBusinessDto){
        return flowMyBusinessMapper.ListMyBusiness(flowMyBusinessDto);
    }

    /**
@@ -102,23 +97,30 @@
                    item.setPreNode(historicActivityInstance.getActivityName());
                }
            }
                if (item.getDoneUsers() == null){
                    item.setDoneUsers("");
                }else {
                    //去除[]
                    item.setDoneUsers(item.getDoneUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
                    item.setDoneUsers(item.getDoneUsers().replaceAll("\"", ""));
                }
                //计算处理时长
                Date kssj=item.getStartTime();
                Date jssj;
                if (item.getEndTime() != null){
                    jssj=item.getEndTime();
                }else {
                    jssj=new Date();
                }
                item.setDuration(TimeUtil.howLong(kssj, jssj,2));
            if (item.getTodoUsers() == null){
                item.setTodoUsers("");
            }else {
                //去除[]
                item.setTodoUsers(item.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
                item.setTodoUsers(item.getTodoUsers().replaceAll("\"", ""));
            }

            if (item.getDoneUsers() == null){
                item.setDoneUsers("");
            }else {
                //去除[]
                item.setDoneUsers(item.getDoneUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
                item.setDoneUsers(item.getDoneUsers().replaceAll("\"", ""));
            }
            //计算处理时长
            Date kssj=item.getStartTime();
            Date jssj;
            if (item.getEndTime() != null){
                jssj=item.getEndTime();
            }else {
                jssj=new Date();
            }
            item.setDuration(TimeUtil.howLong(kssj, jssj,2));
        });
        return flowMyBusinessDtoIPage;
    }