优化审核功能

wuxw

2020-02-29 ca45754a14606973f06b56b4003fc891831f06e8

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

@@ -167,10 +167,11 @@

        HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                .processDefinitionKey("complaint")
                .taskAssignee(user.getUserId())
                .orderByHistoricTaskInstanceStartTime();
                .taskAssignee(user.getUserId());
        if(!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())){
            historicTaskInstanceQuery.taskName("complaint");
        }else if(!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())){
            historicTaskInstanceQuery.taskName("complaitDealUser");
        }

        Query query = historicTaskInstanceQuery;
@@ -187,13 +188,14 @@

        HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                .processDefinitionKey("complaint")
                .taskAssignee(user.getUserId())
                .orderByHistoricTaskInstanceStartTime();
                .taskAssignee(user.getUserId()) ;
        if(!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())){
            historicTaskInstanceQuery.taskName("complaint");
        }else if(!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())){
            historicTaskInstanceQuery.taskName("complaitDealUser");
        }

        Query query = historicTaskInstanceQuery.desc();
        Query query = historicTaskInstanceQuery.orderByHistoricTaskInstanceStartTime().desc();

        List<HistoricTaskInstance> list = null;
        if (user.getPage() != PageDto.DEFAULT_PAGE) {