优化代码

wuxw

2024-12-04 643cc3b396c1ea6f5a4f2c52e9d03f3d2db1d434

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

@@ -21,10 +21,10 @@
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.WorkCopyDto;
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;
@@ -33,7 +33,7 @@
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 com.java110.dto.work.WorkPoolDto;

import java.util.List;
import java.util.ArrayList;
@@ -116,7 +116,7 @@
            return;
        }

        if (workPoolDtos.size() != 1) {
        if (workPoolDtos.size() > 1) {
            return;
        }

@@ -131,6 +131,8 @@

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

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

        WorkPoolFileDto workPoolFileDto = new WorkPoolFileDto();
        workPoolFileDto.setWorkId(workPoolDtos.get(0).getWorkId());
        workPoolFileDto.setFileType(WorkPoolFileDto.FILE_TYPE_START);
@@ -142,7 +144,7 @@

        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");

        workPoolDtos.get(0).setPathUrl(imgUrl +workPoolFileDtos.get(0).getPathUrl());
        workPoolDtos.get(0).setPathUrl(imgUrl + workPoolFileDtos.get(0).getPathUrl());
    }

    private void queryTaskAndCopy(List<WorkPoolDto> workPoolDtos) {
@@ -160,14 +162,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;
                }

@@ -179,6 +183,7 @@
            }

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

        WorkCopyDto workCopyDto = new WorkCopyDto();
@@ -186,14 +191,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;
                }

@@ -205,6 +214,7 @@
            }

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

    }