加入费用项处理页面

wuxw

2020-01-30 8936415a62627e4552dc600e26d92039b26cedfa

 CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java

@@ -4,7 +4,6 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
import com.java110.core.smo.complaintUser.IComplaintUserInnerServiceSMO;
import com.java110.dto.FeeDto;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
import com.java110.dto.complaint.ComplaintDto;
@@ -14,7 +13,6 @@
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
import org.activiti.engine.history.HistoricActivityInstance;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.impl.identity.Authentication;
@@ -166,6 +164,7 @@
                .taskAssignee(user.getUserId());
        return query.count();
    }

    /**
     * 获取用户审批的任务
     *
@@ -174,10 +173,10 @@
    public List<ComplaintDto> getUserHistoryTasks(@RequestBody AuditUser user) {
        HistoryService historyService = processEngine.getHistoryService();
        Query query = historyService.createHistoricTaskInstanceQuery()
                                                .processDefinitionKey("complaint")
                                                .taskAssignee(user.getUserId())
                                                .orderByHistoricTaskInstanceStartTime()
                                                .desc();
                .processDefinitionKey("complaint")
                .taskAssignee(user.getUserId())
                .orderByHistoricTaskInstanceStartTime()
                .desc();

        List<HistoricTaskInstance> list = null;
        if (user.getPage() != PageDto.DEFAULT_PAGE) {
@@ -214,8 +213,10 @@
        taskService.addComment(complaintDto.getTaskId(), processInstanceId, complaintDto.getAuditMessage());
        Map<String, Object> variables = new HashMap<String, Object>();
        variables.put("auditCode", complaintDto.getAuditCode());
        //variables.put("userId", complaintDto.getCurrentUserId());
        taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
        variables.put("currentUserId", complaintDto.getCurrentUserId());
        //taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
        //taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
        //taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
        taskService.complete(complaintDto.getTaskId(), variables);

        ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();