查询状态优化

src/main/java/cn/quantgroup/customer/rest/ThirdWorkOrderRest.java

 package cn.quantgroup.customer.rest;
 
-import cn.quantgroup.customer.model.workorder.WorkOrderStatus;
 import cn.quantgroup.customer.rest.param.thirdworkorder.WorkOrderParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.service.IThirdWorkOrderService;
-import cn.quantgroup.customer.service.IWorkOrderService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/cn/quantgroup/customer/rest/param/thirdworkorder/WorkOrderParam.java

 package cn.quantgroup.customer.rest.param.thirdworkorder;
 
+import java.util.List;
 import lombok.Data;
 
 /**
@@ -17,6 +18,6 @@ public class WorkOrderParam {
     private String createUser;
     private String acceptUser;
     private String priority;
-    private String status;
+    private List<String> statusList;
 
 }

src/main/java/cn/quantgroup/customer/service/impl/ThirdWorkOrderServiceImpl.java

@@ -16,6 +16,8 @@ import javax.annotation.Resource;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -64,7 +66,7 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
             conditionSql.append("and lc.id="+param.getId());
         }
         if (StringUtils.isNotBlank(param.getOrderId())){
-            conditionSql.append("and lc.field10="+param.getOrderId());
+            conditionSql.append("and lc.field10='"+param.getOrderId()+"'");
         }
         if (StringUtils.isNotBlank(param.getProcessInstanceId())){
             conditionSql.append("and lwpi.process_instance_id='"+param.getProcessInstanceId()+"'");
@@ -72,8 +74,12 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
         if (StringUtils.isNotBlank(param.getPriority())){
             conditionSql.append("and lwpi.priority='"+param.getPriority()+"'");
         }
-        if (StringUtils.isNotBlank(param.getStatus())){
-            conditionSql.append("and lwpi.global_state='"+param.getStatus()+"'");
+        if (CollectionUtils.isNotEmpty(param.getStatusList())){
+            StringBuffer statusSb  = new StringBuffer();
+            for (String s : param.getStatusList()){
+                statusSb.append(",'"+s+"'");
+            }
+            conditionSql.append("and lwpi.global_state in ("+statusSb.substring(1)+") ");
         }
         if (StringUtils.isNotBlank(param.getCreateUser())){
             conditionSql.append("and lc.create_user='"+param.getCreateUser()+"'");