a

youxiw2000
1 parent a2bd1e6c
Showing 19 changed files with 683 additions and 30 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/myTaskServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/myTaskService.java
trash-common/src/main/java/com/trash/common/core/domain/entity/SysUser.java
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-system/src/main/java/com/trash/system/domain/SysUserPost.java
trash-system/src/main/java/com/trash/system/domain/SysUserRole.java
trash-system/src/main/java/com/trash/system/service/impl/SysUserServiceImpl.java
trash-ui/src/router/index.js
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-ui/src/views/business/threestep/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
trash-workFlow/src/main/java/com/trash/business/mapper/SupervisionThreestepMapper.java
trash-workFlow/src/main/java/com/trash/business/service/ISupervisionThreestepService.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
-
 package com.trash.activiti.service.impl;
  
 import java.text.ParseException;
@@ -46,6 +45,7 @@ import com.trash.activiti.domain.dto.ActWorkflowFormDataDTO;
 import com.trash.activiti.mapper.ActReDeploymentMapper;
 import com.trash.activiti.service.IActTaskService;
 import com.trash.activiti.service.IActWorkflowFormDataService;
+import com.trash.activiti.service.myTaskService;
 import com.trash.common.core.page.PageDomain;
 import com.trash.common.utils.SecurityUtils;
  
@@ -56,7 +56,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 	private RepositoryService repositoryService;
  
 	@Autowired
-	private TaskRuntime taskRuntime;
+	private myTaskService taskRuntime;
  
 	@Autowired
 	private TaskService taskService;
@@ -81,8 +81,13 @@ public class ActTaskServiceImpl implements IActTaskService {
 	public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) {
 		Page<ActTaskDTO> list = new Page<ActTaskDTO>();
  
-//		tasks(pageable,TaskPayloadBuilder.tasks().withAssignee(authenticatedUserId).withGroups(userGroups).build());
-		
+//		List<String> posts = new ArrayList<>();
+//		posts.add("4");
+//		SecurityUtils.getLoginUser().getUser().setPostIds(posts);
+//		List<String> roles = new ArrayList<>();
+//		posts.add("7");
+//		SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
+		        
 		org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
 		List<Task> tasks = pageTasks.getContent();
 		int totalItems = pageTasks.getTotalItems();
+package com.trash.activiti.service.impl;
+
+import org.activiti.api.model.shared.model.VariableInstance;
+import org.activiti.api.runtime.shared.NotFoundException;
+import org.activiti.api.runtime.shared.identity.UserGroupManager;
+import org.activiti.api.runtime.shared.query.Page;
+import org.activiti.api.runtime.shared.query.Pageable;
+import org.activiti.api.runtime.shared.security.SecurityManager;
+import org.activiti.api.task.model.Task;
+import org.activiti.api.task.model.builders.TaskPayloadBuilder;
+import org.activiti.api.task.model.impl.TaskImpl;
+import org.activiti.api.task.model.payloads.CandidateGroupsPayload;
+import org.activiti.api.task.model.payloads.CandidateUsersPayload;
+import org.activiti.api.task.model.payloads.ClaimTaskPayload;
+import org.activiti.api.task.model.payloads.CompleteTaskPayload;
+import org.activiti.api.task.model.payloads.CreateTaskPayload;
+import org.activiti.api.task.model.payloads.CreateTaskVariablePayload;
+import org.activiti.api.task.model.payloads.DeleteTaskPayload;
+import org.activiti.api.task.model.payloads.GetTaskVariablesPayload;
+import org.activiti.api.task.model.payloads.GetTasksPayload;
+import org.activiti.api.task.model.payloads.ReleaseTaskPayload;
+import org.activiti.api.task.model.payloads.SaveTaskPayload;
+import org.activiti.api.task.model.payloads.UpdateTaskPayload;
+import org.activiti.api.task.model.payloads.UpdateTaskVariablePayload;
+import org.activiti.api.task.runtime.TaskRuntime;
+import org.activiti.api.task.runtime.conf.TaskRuntimeConfiguration;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.task.IdentityLink;
+import org.activiti.engine.task.IdentityLinkType;
+import org.activiti.engine.task.TaskQuery;
+import org.activiti.runtime.api.impl.TaskRuntimeHelper;
+import org.activiti.runtime.api.model.impl.APITaskConverter;
+import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter;
+import org.activiti.runtime.api.query.impl.PageImpl;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Service;
+
+import com.trash.activiti.service.myTaskService;
+import com.trash.common.utils.SecurityUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@PreAuthorize("hasRole('ACTIVITI_USER')")
+@Service
+public class myTaskServiceImpl implements myTaskService {
+
+    private final TaskService taskService;
+
+    private final APITaskConverter taskConverter;
+
+    private final APIVariableInstanceConverter variableInstanceConverter;
+
+    private final TaskRuntimeConfiguration configuration;
+
+    private final UserGroupManager userGroupManager;
+
+    private final SecurityManager securityManager;
+
+    private final TaskRuntimeHelper taskRuntimeHelper;
+
+    public myTaskServiceImpl(TaskService taskService,
+                           UserGroupManager userGroupManager,
+                           SecurityManager securityManager,
+                           APITaskConverter taskConverter,
+                           APIVariableInstanceConverter variableInstanceConverter,
+                           TaskRuntimeConfiguration configuration,
+                           TaskRuntimeHelper taskRuntimeHelper) {
+        this.taskService = taskService;
+        this.userGroupManager = userGroupManager;
+        this.securityManager = securityManager;
+        this.taskConverter = taskConverter;
+        this.variableInstanceConverter = variableInstanceConverter;
+        this.configuration = configuration;
+        this.taskRuntimeHelper = taskRuntimeHelper;
+    }
+
+    @Override
+    public TaskRuntimeConfiguration configuration() {
+        return configuration;
+    }
+
+    @Override
+    public Task task(String taskId) {
+    	
+    	org.activiti.engine.task.Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+    	
+        if (task == null) {
+            throw new NotFoundException("未找到审批任务 id: " + taskId);
+        }
+    	
+    	
+        return taskConverter.from(task);
+    }
+
+    @Override
+    public Page<Task> tasks(Pageable pageable) {
+            return tasks(pageable,null);
+    }
+
+    @Override
+    public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload) {
+        TaskQuery taskQuery = taskService.createTaskQuery();
+        if (getTasksPayload == null) {
+            getTasksPayload = TaskPayloadBuilder.tasks().build();
+        }
+        
+        if(SecurityUtils.getLoginUser().getUser().getPostIds() == null && SecurityUtils.getLoginUser().getUser().getRoleIds() == null){
+        	taskQuery.taskCandidateOrAssigned(SecurityUtils.getUsername());
+        }else{
+        	   if( SecurityUtils.getLoginUser().getUser().getPostIds() != null && SecurityUtils.getLoginUser().getUser().getRoleIds() != null){
+               	taskQuery.or().taskCandidateGroupIn(SecurityUtils.getLoginUser().getUser().getPostIds());
+               	 for(String role : SecurityUtils.getLoginUser().getUser().getRoleIds()){
+        	        	taskQuery.taskCandidateUser(role);
+        	        }
+                   taskQuery.endOr();
+               }else{
+                   if(SecurityUtils.getLoginUser().getUser().getPostIds() != null){
+                  	 taskQuery.taskCandidateGroupIn(SecurityUtils.getLoginUser().getUser().getPostIds());
+                  }
+
+                  if(SecurityUtils.getLoginUser().getUser().getRoleIds() != null){
+          	        for(String role : SecurityUtils.getLoginUser().getUser().getRoleIds()){
+          	        	taskQuery.taskCandidateUser(role);
+          	        }
+                  }
+               }
+        }
+        
+        List<org.activiti.engine.task.Task> tt =  taskQuery.list();
+        
+
+        if (getTasksPayload.getProcessInstanceId() != null) {
+            taskQuery = taskQuery.processInstanceId(getTasksPayload.getProcessInstanceId());
+        }
+        if (getTasksPayload.getParentTaskId() != null) {
+            taskQuery = taskQuery.taskParentTaskId(getTasksPayload.getParentTaskId());
+        }
+        List<Task> tasks = taskConverter.from(taskQuery.listPage(pageable.getStartIndex(),
+                pageable.getMaxItems()));
+        return new PageImpl<>(tasks,
+                Math.toIntExact(taskQuery.count()));
+    }
+
+    @Override
+    public Task complete(CompleteTaskPayload completeTaskPayload) {
+        //@TODO: not the most efficient way to return the just completed task, improve
+        //      we might need to create an empty shell with the task ID and Status only
+        Task task;
+        String authenticatedUserId = securityManager.getAuthenticatedUserId();
+        try {
+            task = task(completeTaskPayload.getTaskId());
+        } catch (IllegalStateException ex) {
+            throw new IllegalStateException("The authenticated user cannot complete task" + completeTaskPayload.getTaskId() + " due he/she cannot access to the task");
+        }
+        // validate the the task does have an assignee
+        if (task.getAssignee() == null || task.getAssignee().isEmpty()) {
+            throw new IllegalStateException("The task needs to be claimed before trying to complete it");
+        }
+        if (!task.getAssignee().equals(authenticatedUserId)) {
+            throw new IllegalStateException("You cannot complete the task if you are not assigned to it");
+        }
+
+        taskService.complete(completeTaskPayload.getTaskId(),
+                completeTaskPayload.getVariables(), true);
+
+
+        ((TaskImpl) task).setStatus(Task.TaskStatus.COMPLETED);
+
+        return task;
+    }
+
+    @Override
+    public Task claim(ClaimTaskPayload claimTaskPayload) {
+        // Validate that the task is visible by the currently authorized user
+        Task task;
+        try {
+            task = task(claimTaskPayload.getTaskId());
+        } catch (IllegalStateException ex) {
+            throw new IllegalStateException("The authenticated user cannot claim task" + claimTaskPayload.getTaskId() + " due it is not a candidate for it");
+        }
+        // validate the the task doesn't have an assignee
+        if (task.getAssignee() != null && !task.getAssignee().isEmpty()) {
+            throw new IllegalStateException("The task was already claimed, the assignee of this task needs to release it first for you to claim it");
+        }
+
+        String authenticatedUserId = securityManager.getAuthenticatedUserId();
+        claimTaskPayload.setAssignee(authenticatedUserId);
+        taskService.claim(claimTaskPayload.getTaskId(),
+                claimTaskPayload.getAssignee());
+
+        return task(claimTaskPayload.getTaskId());
+    }
+
+    @Override
+    public Task release(ReleaseTaskPayload releaseTaskPayload) {
+        // Validate that the task is visible by the currently authorized user
+        Task task;
+        try {
+            task = task(releaseTaskPayload.getTaskId());
+        } catch (IllegalStateException ex) {
+            throw new IllegalStateException("The authenticated user cannot claim task" + releaseTaskPayload.getTaskId() + " due it is not a candidate for it");
+        }
+        // validate the the task doesn't have an assignee
+        if (task.getAssignee() == null || task.getAssignee().isEmpty()) {
+            throw new IllegalStateException("You cannot release a task that is not claimed");
+        }
+        String authenticatedUserId = securityManager.getAuthenticatedUserId();
+        // validate that you are trying to release task where you are the assignee
+        if (!task.getAssignee().equals(authenticatedUserId)) {
+            throw new IllegalStateException("You cannot release a task where you are not the assignee");
+        }
+
+        taskService.unclaim(releaseTaskPayload.getTaskId());
+        return task(releaseTaskPayload.getTaskId());
+    }
+
+    @Override
+    public Task update(UpdateTaskPayload updateTaskPayload) {
+        return taskRuntimeHelper.applyUpdateTaskPayload(false, updateTaskPayload);
+    }
+
+    @Override
+    public Task delete(DeleteTaskPayload deleteTaskPayload) {
+        //@TODO: not the most efficient way to return the just deleted task, improve
+        //      we might need to create an empty shell with the task ID and Status only
+        Task task;
+        try {
+            task = task(deleteTaskPayload.getTaskId());
+        } catch (IllegalStateException ex) {
+            throw new IllegalStateException("The authenticated user cannot delete the task" + deleteTaskPayload.getTaskId() + " due it is not the current assignee");
+        }
+        String authenticatedUserId = securityManager.getAuthenticatedUserId();
+        // validate that you are trying to delete task where you are the assignee or the owner
+        if ((task.getAssignee() == null || task.getAssignee().isEmpty() || !task.getAssignee().equals(authenticatedUserId)) &&
+                (task.getOwner() == null || task.getOwner().isEmpty() || !task.getOwner().equals(authenticatedUserId))) {
+            throw new IllegalStateException("You cannot delete a task where you are not the assignee/owner");
+        }
+        TaskImpl deletedTaskData = new TaskImpl(task.getId(),
+                task.getName(),
+                Task.TaskStatus.CANCELLED);
+        if (!deleteTaskPayload.hasReason()) {
+            deleteTaskPayload.setReason("Task deleted by " + authenticatedUserId);
+        }
+        taskService.deleteTask(deleteTaskPayload.getTaskId(),
+                deleteTaskPayload.getReason(),
+                true);
+        return deletedTaskData;
+    }
+
+    @Override
+    public Task create(CreateTaskPayload createTaskPayload) {
+        if (createTaskPayload.getName() == null || createTaskPayload.getName().isEmpty()) {
+            throw new IllegalStateException("You cannot create a task without name");
+        }
+
+        org.activiti.engine.task.Task task = taskService.newTask();
+        task.setName(createTaskPayload.getName());
+        task.setDescription(createTaskPayload.getDescription());
+        task.setDueDate(createTaskPayload.getDueDate());
+        task.setPriority(createTaskPayload.getPriority());
+        if (createTaskPayload.getAssignee() != null && !createTaskPayload.getAssignee().isEmpty()) {
+            task.setAssignee(createTaskPayload.getAssignee());
+        }
+        task.setParentTaskId(createTaskPayload.getParentTaskId());
+        task.setFormKey(createTaskPayload.getFormKey());
+        task.setOwner(securityManager.getAuthenticatedUserId());
+        taskService.saveTask(task);
+        taskService.addCandidateUser(task.getId(),
+                securityManager.getAuthenticatedUserId());
+        if (createTaskPayload.getCandidateGroups() != null && !createTaskPayload.getCandidateGroups().isEmpty()) {
+            for ( String g : createTaskPayload.getCandidateGroups() ) {
+                taskService.addCandidateGroup(task.getId(),
+                        g);
+            }
+        }
+
+        if (createTaskPayload.getCandidateUsers() != null && !createTaskPayload.getCandidateUsers().isEmpty()) {
+            for ( String u : createTaskPayload.getCandidateUsers() ) {
+                taskService.addCandidateUser(task.getId(),
+                        u);
+            }
+        }
+
+        return taskConverter.from(task);
+    }
+
+    @Override
+    public void addCandidateUsers(CandidateUsersPayload candidateUsersPayload) {
+        org.activiti.engine.task.Task internalTask;
+        try {
+            internalTask = taskRuntimeHelper.getInternalTaskWithChecks(candidateUsersPayload.getTaskId());
+
+        } catch (IllegalStateException ex) {
+            throw new IllegalStateException("The authenticated user cannot update the task" + candidateUsersPayload.getTaskId() + " due it is not the current assignee");
+        }
+
+        String authenticatedUserId = securityManager.getAuthenticatedUserId();
+
+        // validate that you are trying to add CandidateUsers to the task where you are the assignee
+        if (!Objects.equals(internalTask.getAssignee(), authenticatedUserId)) {
+            throw new IllegalStateException("You cannot update a task where you are not the assignee");
+        }
+
+
+        if (candidateUsersPayload.getCandidateUsers() != null && !candidateUsersPayload.getCandidateUsers().isEmpty()) {
+            for ( String u : candidateUsersPayload.getCandidateUsers() ) {
+                taskService.addCandidateUser(internalTask.getId(),
+                        u);
+            }
+        }
+    }
+
+    @Override
+    public void deleteCandidateUsers(CandidateUsersPayload candidateUsersPayload) {
+        org.activiti.engine.task.Task internalTask;
+        try {
+            internalTask = taskRuntimeHelper.getInternalTaskWithChecks(candidateUsersPayload.getTaskId());
+
+        } catch (IllegalStateException ex) {
+            throw new IllegalStateException("The authenticated user cannot update the task" + candidateUsersPayload.getTaskId() + " due it is not the current assignee");
+        }
+
+        String authenticatedUserId = securityManager.getAuthenticatedUserId();
+
+        // validate that you are trying to add CandidateUsers to the task where you are the assignee
+        if (!Objects.equals(internalTask.getAssignee(), authenticatedUserId)) {
+            throw new IllegalStateException("You cannot update a task where you are not the assignee");
+        }
+
+
+        if (candidateUsersPayload.getCandidateUsers() != null && !candidateUsersPayload.getCandidateUsers().isEmpty()) {
+            for ( String u : candidateUsersPayload.getCandidateUsers() ) {
+                taskService.deleteCandidateUser(internalTask.getId(),
+                        u);
+            }
+        }
+    }
+
+    @Override
+    public void addCandidateGroups(CandidateGroupsPayload candidateGroupsPayload) {
+        org.activiti.engine.task.Task internalTask;
+        try {
+            internalTask = taskRuntimeHelper.getInternalTaskWithChecks(candidateGroupsPayload.getTaskId());
+
+        } catch (IllegalStateException ex) {
+            throw new IllegalStateException("The authenticated user cannot update the task" + candidateGroupsPayload.getTaskId() + " due it is not the current assignee");
+        }
+
+        String authenticatedUserId = securityManager.getAuthenticatedUserId();
+        // validate that you are trying to add CandidateGroups to the task where you are the assignee
+        if (!Objects.equals(internalTask.getAssignee(), authenticatedUserId)) {
+            throw new IllegalStateException("You cannot update a task where you are not the assignee");
+        }
+
+
+        if (candidateGroupsPayload.getCandidateGroups() != null && !candidateGroupsPayload.getCandidateGroups().isEmpty()) {
+            for ( String g : candidateGroupsPayload.getCandidateGroups() ) {
+                taskService.addCandidateGroup(internalTask.getId(),
+                        g);
+            }
+        }
+    }
+
+    @Override
+    public void deleteCandidateGroups(CandidateGroupsPayload candidateGroupsPayload) {
+        org.activiti.engine.task.Task internalTask;
+        try {
+            internalTask = taskRuntimeHelper.getInternalTaskWithChecks(candidateGroupsPayload.getTaskId());
+
+        } catch (IllegalStateException ex) {
+            throw new IllegalStateException("The authenticated user cannot update the task" + candidateGroupsPayload.getTaskId() + " due it is not the current assignee");
+        }
+
+        String authenticatedUserId = securityManager.getAuthenticatedUserId();
+        // validate that you are trying to add CandidateGroups to the task where you are the assignee
+        if (!Objects.equals(internalTask.getAssignee(), authenticatedUserId)) {
+            throw new IllegalStateException("You cannot update a task where you are not the assignee");
+        }
+
+
+        if (candidateGroupsPayload.getCandidateGroups() != null && !candidateGroupsPayload.getCandidateGroups().isEmpty()) {
+            for ( String g : candidateGroupsPayload.getCandidateGroups() ) {
+                taskService.deleteCandidateGroup(internalTask.getId(),
+                        g);
+            }
+        }
+    }
+
+    @Override
+    public List<String> userCandidates(String taskId) {
+        List<IdentityLink> identityLinks = getIdentityLinks(taskId);
+        List<String> userCandidates = new ArrayList<>();
+        if (identityLinks != null) {
+            for ( IdentityLink i : identityLinks ) {
+                if (i.getUserId() != null) {
+                    if (i.getType().equals(IdentityLinkType.CANDIDATE)) {
+                        userCandidates.add(i.getUserId());
+                    }
+                }
+            }
+
+        }
+        return userCandidates;
+    }
+
+    @Override
+    public List<String> groupCandidates(String taskId) {
+        List<IdentityLink> identityLinks = getIdentityLinks(taskId);
+        List<String> groupCandidates = new ArrayList<>();
+        if (identityLinks != null) {
+            for ( IdentityLink i : identityLinks ) {
+                if (i.getGroupId() != null) {
+                    if (i.getType().equals(IdentityLinkType.CANDIDATE)) {
+                        groupCandidates.add(i.getGroupId());
+                    }
+                }
+            }
+
+        }
+        return groupCandidates;
+    }
+
+    @Override
+    public List<VariableInstance> variables(GetTaskVariablesPayload getTaskVariablesPayload) {
+        taskRuntimeHelper.assertHasAccessToTask(getTaskVariablesPayload.getTaskId());
+        return variableInstanceConverter.from(taskRuntimeHelper.getInternalTaskVariables(getTaskVariablesPayload.getTaskId()).values());
+    }
+
+    @Override
+    public void createVariable(CreateTaskVariablePayload createTaskVariablePayload) {
+        taskRuntimeHelper.createVariable(false, createTaskVariablePayload);
+    }
+
+    @Override
+    public void updateVariable(UpdateTaskVariablePayload updateTaskVariablePayload) {
+        taskRuntimeHelper.updateVariable(false, updateTaskVariablePayload);
+    }
+
+    private List<IdentityLink> getIdentityLinks(String taskId) {
+        String authenticatedUserId = securityManager.getAuthenticatedUserId();
+        if (authenticatedUserId != null && !authenticatedUserId.isEmpty()) {
+            List<String> userRoles = userGroupManager.getUserRoles(authenticatedUserId);
+            List<String> userGroups = userGroupManager.getUserGroups(authenticatedUserId);
+            org.activiti.engine.task.Task internalTask = taskService.createTaskQuery().taskCandidateOrAssigned(authenticatedUserId,
+                    userGroups).taskId(taskId).singleResult();
+            if (internalTask == null) {
+                throw new NotFoundException("Unable to find task for the given id: " + taskId + " for user: " + authenticatedUserId + " (with groups: " + userGroups + " & with roles: " + userRoles + ")");
+            }
+            return taskService.getIdentityLinksForTask(taskId);
+        }
+        throw new IllegalStateException("There is no authenticated user, we need a user authenticated to find tasks");
+    }
+
+    @Override
+    public void save(SaveTaskPayload saveTaskPayload) {
+        taskRuntimeHelper.assertHasAccessToTask(saveTaskPayload.getTaskId());
+
+        taskService.setVariablesLocal(saveTaskPayload.getTaskId(),
+                saveTaskPayload.getVariables());
+    }
+
+}
+package com.trash.activiti.service;
+import java.util.List;
+
+import org.activiti.api.model.shared.model.VariableInstance;
+import org.activiti.api.runtime.shared.query.Page;
+import org.activiti.api.runtime.shared.query.Pageable;
+import org.activiti.api.task.model.Task;
+import org.activiti.api.task.model.payloads.CandidateGroupsPayload;
+import org.activiti.api.task.model.payloads.CandidateUsersPayload;
+import org.activiti.api.task.model.payloads.ClaimTaskPayload;
+import org.activiti.api.task.model.payloads.CompleteTaskPayload;
+import org.activiti.api.task.model.payloads.CreateTaskPayload;
+import org.activiti.api.task.model.payloads.CreateTaskVariablePayload;
+import org.activiti.api.task.model.payloads.DeleteTaskPayload;
+import org.activiti.api.task.model.payloads.GetTaskVariablesPayload;
+import org.activiti.api.task.model.payloads.GetTasksPayload;
+import org.activiti.api.task.model.payloads.ReleaseTaskPayload;
+import org.activiti.api.task.model.payloads.SaveTaskPayload;
+import org.activiti.api.task.model.payloads.UpdateTaskPayload;
+import org.activiti.api.task.model.payloads.UpdateTaskVariablePayload;
+import org.activiti.api.task.runtime.conf.TaskRuntimeConfiguration;
+
+public interface myTaskService {
+
+
+
+	    TaskRuntimeConfiguration configuration();
+
+	    /**
+	     * Get task by id if the authenticated user:
+	     *  - is the assignee or
+	     *  - is in a group with is assigned to the task or
+	     *  - has admin role
+	     */
+	    Task task(String taskId);
+
+	    /**
+	     * Get all tasks where
+	     *  - the authenticated user is the actual assignee
+	     *  - the user belongs to a group that is a candidate for the task
+	     */
+	    Page<Task> tasks(Pageable pageable);
+
+	    /**
+	     * Get all tasks where applying the filters in the Payload
+	     *  - the authenticated user is the actual assignee
+	     *  - the user belongs to a group that is a candidate for the task
+	     */
+	    Page<Task> tasks(Pageable pageable,
+	                     GetTasksPayload getTasksPayload);
+
+	    /**
+	     * Creates a task based on the following rules
+	     *  - If an assignee is provided it creates and assign the task to the provided user
+	     *  - If there is no assignee the task is not assigned, just created
+	     *  - The owner of the task is the currently authenticated user (which is automatically added as a candidate)
+	     *  - If a group or list of groups is provided those groups are added as candidates for claiming the task
+	     */
+	    Task create(CreateTaskPayload createTaskPayload);
+
+	    /**
+	     * Claim a task with the currently authenticated user
+	     *  - If there is no authenticated user throw an IllegalStateException
+	     *  - If the currently authenticated user is not a candidate throw an IllegalStateException
+	     *  - The current approach doesn't support impersonation, it will always take the currently authenticated user
+	     *  - after the claim the task should be in assigned status
+	     */
+	    Task claim(ClaimTaskPayload claimTaskPayload);
+
+	    /**
+	     * Release a previously claimed task
+	     * - The authenticated user needs to be the assignee in order to release it
+	     */
+	    Task release(ReleaseTaskPayload releaseTaskPayload);
+
+	    /**
+	     * Completes the selected task with the variables set in the payload
+	     * - This method checks that the task is visible by the authenticated user
+	     * - This method also check that the task is assigned to the currently authenticated user before complete
+	     * - This method return a shallow Task object with the basic information needed to validate that the task was completed
+	     */
+	    Task complete(CompleteTaskPayload completeTaskPayload);
+
+	    /**
+	     * Saves the selected task with the variables set in the payload in the task scope
+	     * - This method checks that the task is visible by the authenticated user
+	     * - This method also check that the task is assigned to the currently authenticated user
+	     */
+	    void save(SaveTaskPayload saveTaskPayload);
+	    
+	    /**
+	     * Updates details of a task
+	     * - The authenticated user should be able to see the task in order to update its details
+	     * - The authenticated user needs to be the assignee of the task to update its details, if not he/she will need to claim the task first
+	     */
+	    Task update(UpdateTaskPayload updateTaskPayload);
+
+	    /**
+	     * Deletes a task
+	     * - The authenticated user should be able to see the task in order to delete it
+	     * - The authenticated user needs to be the assignee of the task in order to delete it
+	     * - this method returns a shallow Task with the necessary information to validate that the task was deleted
+	     */
+	    Task delete(DeleteTaskPayload deleteTaskPayload);
+	    
+	    void createVariable(CreateTaskVariablePayload createTaskVariablePayload);
+	    void updateVariable(UpdateTaskVariablePayload updateTaskVariablePayload);
+	    List<VariableInstance> variables(GetTaskVariablesPayload getTaskVariablesPayload);
+	    
+	    void addCandidateUsers(CandidateUsersPayload candidateUsersPayload);
+	    void deleteCandidateUsers(CandidateUsersPayload candidateUsersPayload);
+	    
+	    void addCandidateGroups(CandidateGroupsPayload candidateGroupsPayload);
+	    void deleteCandidateGroups(CandidateGroupsPayload candidateGroupsPayload);
+	    
+	    List<String> userCandidates(String taskId);
+	    List<String> groupCandidates(String taskId);
+
+}
@@ -88,10 +88,10 @@ public class SysUser extends BaseEntity
     private List<SysRole> roles;
  
     /** 角色组 */
-    private Long[] roleIds;
+    private List<String> roleIds;
  
     /** 岗位组 */
-    private Long[] postIds;
+    private List<String> postIds;
  
     public SysUser()
     {
@@ -281,22 +281,22 @@ public class SysUser extends BaseEntity
         this.roles = roles;
     }
  
-    public Long[] getRoleIds()
+    public List<String> getRoleIds()
     {
         return roleIds;
     }
  
-    public void setRoleIds(Long[] roleIds)
+    public void setRoleIds(List<String> roleIds)
     {
         this.roleIds = roleIds;
     }
  
-    public Long[] getPostIds()
+    public List<String> getPostIds()
     {
         return postIds;
     }
  
-    public void setPostIds(Long[] postIds)
+    public void setPostIds(List<String> postIds)
     {
         this.postIds = postIds;
     }
@@ -2,11 +2,13 @@ package com.trash.framework.web.service;
  
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
  
 import javax.annotation.Resource;
  
+import org.apache.commons.collections4.iterators.ArrayListIterator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -163,7 +165,24 @@ public class SysLoginService
         user.setNickName(userJson.getString("name")); 
         user.setPassword(userJson.getString("id"));
         SysDept dept = new SysDept();
-
+        
+        
+        List<String> poStrings = new ArrayList<String>();
+        
+        for(String str :userJson.getString("postType").split(",")){
+        	poStrings.add(str);
+        }
+        
+        List<String> rolStrings = new ArrayList<String>();
+        
+        for(String str :userJson.getString("departmentType").split(",")){
+        	rolStrings.add(str);
+        }
+        
+        user.setPostIds(poStrings);
+        
+        user.setRoleIds(rolStrings);
+        
         dept.setDeptName(userJson.getString("orgName"));
  
         user.setDept(dept);
@@ -184,9 +203,9 @@ public class SysLoginService
  
         user.setRoles(roles);
  
-        loginUser.setPermissions(set);
-        
         token = token.replace("Bearer ", "").replace("auth:token:", "");
+
+        loginUser.setPermissions(set);
  
         loginUser.setToken(token);
         tokenService.refreshToken(loginUser);
@@ -14,7 +14,7 @@ public class SysUserPost
     private String userId;
  
     /** 岗位ID */
-    private Long postId;
+    private String postId;
  
     public String getUserId()
     {
@@ -26,12 +26,12 @@ public class SysUserPost
         this.userId = userId;
     }
  
-    public Long getPostId()
+    public String getPostId()
     {
         return postId;
     }
  
-    public void setPostId(Long postId)
+    public void setPostId(String postId)
     {
         this.postId = postId;
     }
@@ -14,7 +14,7 @@ public class SysUserRole
     private String userId;
  
     /** 角色ID */
-    private Long roleId;
+    private String roleId;
  
     public String getUserId()
     {
@@ -26,12 +26,12 @@ public class SysUserRole
         this.userId = userId;
     }
  
-    public Long getRoleId()
+    public String getRoleId()
     {
         return roleId;
     }
  
-    public void setRoleId(Long roleId)
+    public void setRoleId(String roleId)
     {
         this.roleId = roleId;
     }
@@ -315,12 +315,12 @@ public class SysUserServiceImpl implements ISysUserService
      */
     public void insertUserRole(SysUser user)
     {
-        Long[] roles = user.getRoleIds();
+    	List<String> roles = user.getRoleIds();
         if (StringUtils.isNotNull(roles))
         {
             // 新增用户与角色管理
             List<SysUserRole> list = new ArrayList<SysUserRole>();
-            for (Long roleId : roles)
+            for (String roleId : roles)
             {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(user.getUserId());
@@ -341,12 +341,12 @@ public class SysUserServiceImpl implements ISysUserService
      */
     public void insertUserPost(SysUser user)
     {
-        Long[] posts = user.getPostIds();
+        List<String> posts = user.getPostIds();
         if (StringUtils.isNotNull(posts))
         {
             // 新增用户与岗位管理
             List<SysUserPost> list = new ArrayList<SysUserPost>();
-            for (Long postId : posts)
+            for (String postId : posts)
             {
                 SysUserPost up = new SysUserPost();
                 up.setUserId(user.getUserId());
@@ -184,7 +184,7 @@ export const constantRoutes = [
         name: '工作报表',
         meta: { title: '工作报表' }
       }, {
-        path: 'Weeklys/day',
+        path: 'weeklys/day',
         component: (resolve) => require(['@/views/daily/report/day'], resolve),
         name: '工作日报',
         meta: { title: '工作日报' }
@@ -397,6 +397,7 @@
               });
             });
           }
+          return;
         }
  
  
@@ -132,6 +132,7 @@
         projectTypes:null,
         earthsitesTypes:null,
  
+        outside:["长沙县","望城区","浏阳市","宁乡市","株洲市","湘潭市","汩罗市","湘阴县"],
       };
     },
     created() {
@@ -179,13 +180,10 @@
           dayWorkList(this.queryParams).then(response => {
             this.threestepList = response.rows;
  
-
-
             getArea().then(res => {
               this.areas = res.result;
               for(let i =0;i< this.threestepList.length;i++){
                 this.threestepList[i].place = this.getAreaName(this.threestepList[i].place);
-
                 if(this.outside.indexOf(this.threestepList[i].place) > -1){
                   if(this.threestepList[i].status == 1){
                     this.threestepList[i].estatus = "开工";
@@ -829,7 +829,14 @@
         getThreestep(row.id).then(res=>{
             this.form = res.data;
             this.form.type = this.form.type + "";
-
+            this.form.place = Number(this.form.place);
+            this.bindname = res.data.earthsitesName;
+            if(res.data.companys){
+              this.form.companys = res.data.companys.split(",");
+            }
+            if(res.data.companyTrucks){
+              this.form.companyTrucks = res.data.companyTrucks.split(",");
+            }
             for (let i = 0; i < 13; i++) {
               if (this.form["img" + i]) {
                 this.form["img" + i] = this.form["img" + i].split(",");
@@ -69,6 +69,17 @@ public class SupervisionThreestepController extends BaseController
         return getDataTable(list);
     }
  
+
+    /**
+     * 查询三查机制列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:threestep:list')")
+    @PostMapping("/dayWorkList")
+    public AjaxResult days(@RequestBody SupervisionThreestep supervisionThreestep)
+    {        
+        return AjaxResult.success(supervisionThreestepService.selectDayWorkListByType(supervisionThreestep));
+    }
+    
     /**
      * 导出三查机制列表
      */
@@ -72,6 +72,8 @@ public class SupervisionThreestep extends BaseEntity
     /** 运输车辆 */
     @Excel(name = "运输车辆")
     private String companyTrucks;
+    
+    private String params;
  
     private String img0;
  
@@ -66,4 +66,6 @@ public interface SupervisionThreestepMapper
 	public SupervisionThreestep selectTodayData(SupervisionThreestep supervisionThreestep);
  
 	public List<String> getNames(SupervisionThreestep supervisionThreestep);
+
+	public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep);
 }
@@ -70,4 +70,6 @@ public interface ISupervisionThreestepService
 	public int activeSupervisionThreestep(SupervisionThreestep supervisionThreestep);
  
 	public List<String> getNames(SupervisionThreestep supervisionThreestep);
+
+	public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep);
 }
@@ -213,7 +213,16 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
  
 		return list;
 	}
+	
+
+	@Override
+	public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep) {
+
+		return supervisionThreestepMapper.selectDayWorkListByType(supervisionThreestep);
  
+	}
+	
+	
 	/**
 	 * 新增三查机制
 	 * 
@@ -410,4 +419,5 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		}
 		return null;
 	}
+
 }
@@ -185,7 +185,6 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	                .build());
  
 //		    	List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
-//		    	
 //		    	for(Task task : tasks){ //测试 当前用户为审批用户
 //			    	task.setAssignee(SecurityUtils.getUsername());
 //			    	taskService.saveTask(task);
@@ -63,7 +63,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </resultMap>
  
     <sql id="selectSupervisionThreestepVo">
-        select id, name, type, place, self_check_time, object_id, earthsites_id, create_time, check_time, earthsites_name,check_end_time, contract, companys, company_trucks, img0, img1, img2, img3, img4, img5, img6, img7, img8, img9, img10, img11, img12, sub_img0, sub_img1, sub_img2, sub_img3, sub_img4, sub_img5, sub_img6, sub_img7, sub_img8, sub_img9, sub_img10, sub_img11, sub_img12, person, phone,status,create_by,sub_reason,earth_pip_person,enforce_person,sub_sub_reason,attch_item1,attch_item2,attch_item3 from supervision_threestep
+        select id, name, type, place, self_check_time, object_id, earthsites_id, create_time, check_time, earthsites_name,check_end_time, contract, 
+        companys, company_trucks, img0, img1, img2, img3, img4, img5, img6, img7, img8, img9, img10, img11, img12, sub_img0, sub_img1, 
+        sub_img2, sub_img3, sub_img4, sub_img5, sub_img6, sub_img7, sub_img8, sub_img9, sub_img10, sub_img11, sub_img12, 
+        person, phone,status,create_by,sub_reason,earth_pip_person,enforce_person,sub_sub_reason,attch_item1,attch_item2,attch_item3 from supervision_threestep
     </sql>
  
     <select id="selectSupervisionThreestepList" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
@@ -148,6 +151,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			ORDER BY a.create_time DESC
     </select>
  
+    
+    <select id="selectDayWorkListByType" parameterType="SupervisionThreestep" resultType="java.util.HashMap">
+        select object_id id,name,earthsites_id relationSiteId from supervision_threestep 
+	        where type = #{type} 
+	        and DATE_FORMAT(self_check_time,("%y%m%d")) = DATE_FORMAT(NOW(),("%y%m%d")) 
+	        and status = 1 
+	        ORDER BY self_check_time DESC
+    </select>
+    
+    
+    
     <select id="selectSupervisionThreestepById" parameterType="Long" resultMap="SupervisionThreestepResult">
         <include refid="selectSupervisionThreestepVo"/>
         where id = #{id}