优化采购代码

java110

2023-08-28 5ec5d7c9ee2e24b302ab8de3aae71154835c3e8c

 service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java

@@ -6,17 +6,17 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto;
import com.java110.dto.audit.AuditMessageDto;
import com.java110.dto.oaWorkflow.OaWorkflowDataDto;
import com.java110.dto.oaWorkflow.OaWorkflowXmlDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.entity.audit.AuditUser;
import com.java110.dto.oaWorkflow.WorkflowDto;
import com.java110.dto.audit.AuditUser;
import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
import com.java110.po.oaWorkflow.OaWorkflowDataPo;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -284,8 +284,8 @@
     *
     * @param user 用户信息{
     *             processDefinitionKeys:[],
     *
     * }
     *             <p>
     *             }
     */
    public List<JSONObject> getDefinitionKeysUserTasks(@RequestBody AuditUser user) {
        TaskService taskService = processEngine.getTaskService();
@@ -427,6 +427,7 @@
        oaWorkflowDataDto.setBusinessKey(reqJson.getString("id"));
        oaWorkflowDataDto.setPage(1);
        oaWorkflowDataDto.setRow(1);
        oaWorkflowDataDto.setHis("N");
        List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);

        if (oaWorkflowDataDtos == null || oaWorkflowDataDtos.size() < 1) {
@@ -713,6 +714,30 @@

    }

    /**
     * 获取当前节点信息
     *
     * @param reqJson{ taskId:'',
     *                 startUserId:''
     *                 }
     * @return
     */
    public JSONObject getCurrentNodeTask(@RequestBody JSONObject reqJson) {
        JSONObject curNode = new JSONObject();
        TaskService taskService = processEngine.getTaskService();
        Task task = taskService.createTaskQuery().taskId(reqJson.getString("taskId")).singleResult();
        if (task == null) {
            throw new IllegalArgumentException("任务已处理");
        }
        BpmnModel bpmnModel = repositoryService.getBpmnModel(task.getProcessDefinitionId());

        FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey());
        flowNode.getName();

        curNode.put("curTaskName",flowNode.getName());
        return curNode;
    }

    @Override
    public List<JSONObject> nextAllNodeTaskList(@RequestBody JSONObject reqJson) {
        List<JSONObject> tasks = new ArrayList<>();