工作单支持多图片

wuxw

2025-03-30 becc16e36e8fdad39eb32661acb73375c6cbdfb4

 service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java

@@ -6,12 +6,14 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.workCopy.WorkCopyDto;
import com.java110.dto.workPool.WorkPoolDto;
import com.java110.dto.workPoolContent.WorkPoolContentDto;
import com.java110.dto.workPoolFile.WorkPoolFileDto;
import com.java110.dto.workTask.WorkTaskDto;
import com.java110.dto.work.WorkCopyDto;
import com.java110.dto.work.WorkPoolDto;
import com.java110.dto.work.WorkPoolContentDto;
import com.java110.dto.work.WorkPoolFileDto;
import com.java110.dto.work.WorkTaskDto;
import com.java110.intf.oa.*;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.ListUtil;
@@ -58,7 +60,7 @@
        WorkPoolDto workPoolDto = BeanConvertUtil.covertBean(reqJson, WorkPoolDto.class);

        String userId = CmdContextUtils.getUserId(context);
        workPoolDto.setCreateUserId(userId);
        //workPoolDto.setCreateUserId(userId);

        int count = workPoolV1InnerServiceSMOImpl.queryWorkPoolsCount(workPoolDto);

@@ -107,6 +109,7 @@
        }

        workPoolDtos.get(0).setContent(workPoolContentDtos.get(0).getContent());
        workPoolDtos.get(0).setContents(workPoolContentDtos);

        WorkPoolFileDto workPoolFileDto = new WorkPoolFileDto();
        workPoolFileDto.setWorkId(workPoolDtos.get(0).getWorkId());
@@ -116,8 +119,20 @@
        if (ListUtil.isNull(workPoolFileDtos)) {
            return;
        }
        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");

        workPoolDtos.get(0).setPathUrl(workPoolFileDtos.get(0).getPathUrl());
        List<String> pathUrls = new ArrayList<>();
        for (WorkPoolFileDto tWorkPoolFileDto : workPoolFileDtos) {
           if (tWorkPoolFileDto.getPathUrl().startsWith("http")) {
               pathUrls.add(tWorkPoolFileDto.getPathUrl());
           }else{
               pathUrls.add(imgUrl + tWorkPoolFileDto.getPathUrl());
           }
        }

        workPoolDtos.get(0).setPathUrls(pathUrls);


    }

    private void queryTaskAndCopy(List<WorkPoolDto> workPoolDtos) {