kimi
2020-05-18 c8aee7b9bfd79cfd741d7e5692520f4f51a31a86
src/main/java/com/highdatas/mdm/service/impl/ActivitiServiceImpl.java
@@ -6,12 +6,10 @@
import com.highdatas.mdm.entity.Maintain;
import com.highdatas.mdm.entity.MaintainDetail;
import com.highdatas.mdm.entity.TUser;
import com.highdatas.mdm.pojo.ActivitiBusinessType;
import com.highdatas.mdm.pojo.ActivitiStatus;
import com.highdatas.mdm.pojo.Page;
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.pojo.*;
import com.highdatas.mdm.service.*;
import com.highdatas.mdm.service.act.*;
import com.highdatas.mdm.util.DbUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,8 +40,6 @@
    @Autowired
    IFlowsService flowsService;
    @Autowired
    ITUserService userService;
    @Autowired
    HistoryService historyService;
@@ -60,6 +56,11 @@
    @Override
    public Flows start(String key, HttpSession session, String maintainId, ActivitiBusinessType type) {
        return start(key, session, maintainId, type, null);
    }
        @Override
    public Flows start(String key, HttpSession session, String maintainId, ActivitiBusinessType type, Map<String, Object> params) {
        identityService.setSession( session);
        Flows flows = new Flows();
@@ -69,7 +70,10 @@
        flows.setBusinessType(type);
        flows.setStatus(ActivitiStatus.working);
        HashMap<String, Object> variableMap = new HashMap<>();
        variableMap.put("reasson", "申请审批");
        if (params != null) {
            variableMap.putAll(params);
        }
        variableMap.put("reason", "申请审批");
        String workflowId = identityService.startProcess(id, key, null, variableMap);
        flows.setWorkflowId(workflowId);
@@ -99,7 +103,7 @@
        taskService.setSession(session);
        List<String> todoTask = taskService.getTodoTask();
        if (todoTask.size() == 0) {
            return Result.success(null);
            return Result.success(CodeMsg.SUCCESS);
        }
        Wrapper<Flows> flowsWrapper = new EntityWrapper<Flows>().in("workflow_id", todoTask).ne("business_type", ActivitiBusinessType.exists);
@@ -134,7 +138,7 @@
        for (Flows flow : records) {
            String userId = flow.getUserId();
            TUser user = userService.selectOne(new EntityWrapper<TUser>().eq("user_id", userId));
            TUser user = DbUtils.getUserById(userId);
            if (user == null) {
                continue;
            }