工作单支持多图片

wuxw

2025-03-30 becc16e36e8fdad39eb32661acb73375c6cbdfb4

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

@@ -21,10 +21,7 @@
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.workPoolContent.WorkPoolContentDto;
import com.java110.dto.workPoolFile.WorkPoolFileDto;
import com.java110.dto.workTask.WorkTaskDto;
import com.java110.dto.work.*;
import com.java110.intf.oa.*;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
@@ -33,7 +30,6 @@
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import com.java110.dto.workPool.WorkPoolDto;

import java.util.List;
import java.util.ArrayList;
@@ -76,6 +72,7 @@
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
        super.validateProperty(cmdDataFlowContext);
        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
        reqJson.put("storeId", storeId);
    }
@@ -142,9 +139,18 @@
            return;
        }

        List<String> pathUrls = null;
        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");

        workPoolDtos.get(0).setPathUrl(imgUrl + workPoolFileDtos.get(0).getPathUrl());
        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) {
@@ -162,14 +168,16 @@
        List<WorkTaskDto> workTaskDtos = workTaskV1InnerServiceSMOImpl.queryWorkTasks(workTaskDto);

        String curStaffName = "";
        String staffName;
        for (WorkPoolDto workPoolDto : workPoolDtos) {
            curStaffName = "";
            staffName = "";
            for (WorkTaskDto tmpWorkTaskDto : workTaskDtos) {
                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkTaskDto.getState())) {
                if (!workPoolDto.getWorkId().equals(tmpWorkTaskDto.getWorkId())) {
                    continue;
                }

                if (!workPoolDto.getWorkId().equals(tmpWorkTaskDto.getWorkId())) {
                staffName = tmpWorkTaskDto.getStaffName();
                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkTaskDto.getState())) {
                    continue;
                }

@@ -181,6 +189,7 @@
            }

            workPoolDto.setCurStaffName(curStaffName);
            workPoolDto.setStaffName(staffName);
        }

        WorkCopyDto workCopyDto = new WorkCopyDto();
@@ -188,14 +197,18 @@
        List<WorkCopyDto> workCopyDtos = workCopyV1InnerServiceSMOImpl.queryWorkCopys(workCopyDto);

        String curCopyName = "";
        String copyName;
        for (WorkPoolDto workPoolDto : workPoolDtos) {
            curCopyName = "";
            copyName = "";
            for (WorkCopyDto tmpWorkCopyDto : workCopyDtos) {
                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkCopyDto.getState())) {
                    continue;
                }


                if (!workPoolDto.getWorkId().equals(tmpWorkCopyDto.getWorkId())) {
                    continue;
                }
                copyName = tmpWorkCopyDto.getStaffName();
                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkCopyDto.getState())) {
                    continue;
                }

@@ -207,6 +220,7 @@
            }

            workPoolDto.setCurCopyName(curCopyName);
            workPoolDto.setCopyName(copyName);
        }

    }