Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java

@@ -131,9 +131,9 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 				autoTotal += count;
 				autoTotal += count;
 			}
 			}
 
 
-			if (method.equals("MANUAL") && status.equals("NOT_ASSIGNED")) {
+			if (method.equals("MANUAL") && status.equals("INIT")) {
 				map.put("manualDealing", count);
 				map.put("manualDealing", count);
-			} else if (method.equals("AUTO_") && status.equals("NOT_ASSIGNED")) {
+			} else if (method.equals("AUTO_") && status.equals("INIT")) {
 				map.put("autoDealing", count);
 				map.put("autoDealing", count);
 			}
 			}
 		}
 		}