优化审核功能

Api/src/main/java/com/java110/api/listener/auditOrder/ListAuditHistoryComplaintsListener.java

@@ -10,6 +10,7 @@ import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeAuditUserConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.api.complaint.ApiComplaintDataVo;
 import com.java110.vo.api.complaint.ApiComplaintVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,8 +77,8 @@ public class ListAuditHistoryComplaintsListener extends AbstractServiceApiListen
         auditUser.setPage(reqJson.getInteger("page"));
         auditUser.setRow(reqJson.getInteger("row"));
 
-        if(reqJson.containsKey("start")&& reqJson.getBoolean("start")){
-            auditUser.setAuditLink("START");
+        if(reqJson.containsKey("process")&& !StringUtil.isEmpty(reqJson.getString("process"))){
+            auditUser.setAuditLink(reqJson.getString("process"));
         }
 
         long count = complaintUserInnerServiceSMOImpl.getUserHistoryTaskCount(auditUser);

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

@@ -167,10 +167,11 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
 
         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 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
 
         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) {