优化代码

wuxw

2024-11-11 52d40ac575fe20f1c4d6b6984b37b3fca8907303

优化代码

 java110-bean/src/main/java/com/java110/dto/work/WorkPoolDto.java

@@ -56,6 +56,7 @@
    private String content;

    private String pathUrl;
    private String url;

    private String taskId;

@@ -381,4 +382,12 @@
    public void setStates(String[] states) {
        this.states = states;
    }

    public String getUrl() {
        return url;
    }

    public void setUrl(String url) {
        this.url = url;
    }
}

 java110-db/src/main/resources/mapper/oa/WorkTaskItemV1ServiceDaoImplMapper.xml

@@ -92,9 +92,7 @@
            , t.deduction_money= #{deductionMoney}
        </if>

        <if test="workId !=null and workId != ''">
            , t.work_id= #{workId}
        </if>

        <if test="deductionReason !=null and deductionReason != ''">
            , t.deduction_reason= #{deductionReason}
        </if>
@@ -119,6 +117,9 @@
        <if test="taskId !=null and taskId != ''">
            and t.task_id= #{taskId}
        </if>
        <if test="workId !=null and workId != ''">
            and t.work_id= #{workId}
        </if>

    </update>


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

@@ -12,6 +12,8 @@
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;
@@ -119,6 +121,17 @@
        }

        workPoolDtos.get(0).setPathUrl(workPoolFileDtos.get(0).getPathUrl());

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

        if (workPoolFileDtos.get(0).getPathUrl().startsWith("http")) {
            workPoolDtos.get(0).setUrl(workPoolFileDtos.get(0).getPathUrl());
            return;
        }

        workPoolDtos.get(0).setUrl(imgUrl + workPoolFileDtos.get(0).getPathUrl());


    }

    private void queryTaskAndCopy(List<WorkPoolDto> workPoolDtos) {

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

@@ -25,19 +25,10 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.user.UserDto;
import com.java110.dto.work.WorkCopyDto;
import com.java110.dto.work.WorkCycleDto;
import com.java110.dto.work.WorkPoolDto;
import com.java110.dto.work.WorkPoolFileDto;
import com.java110.dto.work.WorkTaskDto;
import com.java110.dto.work.*;
import com.java110.intf.oa.*;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.workPool.WorkCopyPo;
import com.java110.po.workPool.WorkCyclePo;
import com.java110.po.workPool.WorkPoolPo;
import com.java110.po.workPool.WorkPoolContentPo;
import com.java110.po.workPool.WorkPoolFilePo;
import com.java110.po.workPool.WorkTaskPo;
import com.java110.po.workPool.*;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
@@ -83,6 +74,9 @@

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;

    @Autowired
    private IWorkTaskItemV1InnerServiceSMO workTaskItemV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -195,10 +189,16 @@
        workTaskPo.setStoreId(workPoolPo.getStoreId());
        workTaskV1InnerServiceSMOImpl.deleteWorkTask(workTaskPo);

        WorkTaskItemPo workTaskItemPo = new WorkTaskItemPo();
        workTaskItemPo.setWorkId(workPoolPo.getWorkId());
        workTaskItemPo.setStoreId(workPoolPo.getStoreId());
        workTaskItemV1InnerServiceSMOImpl.deleteWorkTaskItem(workTaskItemPo);

        WorkPoolFilePo workPoolFilePo = new WorkPoolFilePo();
        workPoolFilePo.setWorkId(workPoolPo.getWorkId());
        workPoolFilePo.setStoreId(workPoolPo.getStoreId());
        workPoolFileV1InnerServiceSMOImpl.deleteWorkPoolFile(workPoolFilePo);
        JSONArray contents = reqJson.getJSONArray("contents");

        for (int staffIndex = 0; staffIndex < staffs.size(); staffIndex++) {
            workTaskPo = new WorkTaskPo();
@@ -218,6 +218,20 @@
            if (flag < 1) {
                throw new CmdException("保存数据失败");
            }
            JSONObject content = null;
            for (int cIndex = 0; cIndex < contents.size(); cIndex++) {
                content = contents.getJSONObject(cIndex);
                workTaskItemPo = new WorkTaskItemPo();
                workTaskItemPo.setDeductionMoney("0");
                workTaskItemPo.setContentId(content.getString("contentId"));
                workTaskItemPo.setStoreId(workPoolPo.getStoreId());
                workTaskItemPo.setWorkId(workPoolPo.getWorkId());
                workTaskItemPo.setItemId(GenerateCodeFactory.getGeneratorId("11"));
                workTaskItemPo.setState(WorkTaskDto.STATE_WAIT);
                workTaskItemPo.setCommunityId(workPoolPo.getCommunityId());
                workTaskItemPo.setTaskId(workTaskPo.getTaskId());
                workTaskItemV1InnerServiceSMOImpl.saveWorkTaskItem(workTaskItemPo);
            }

            if (StringUtil.isEmpty(reqJson.getString("pathUrl"))) {
                continue;