Merge branch 'dev_mp2jpa0803' into 'develop'

修改

See merge request !321

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

@@ -193,8 +193,8 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 		Long autoTotal = 0L;
 		Long autoTotal = 0L;
 		Long total = 0L;
 		Long total = 0L;
 		for (Map<String, Object> result : results) {
 		for (Map<String, Object> result : results) {
-			String method = (String) result.get("appointment_method");
-			String status = (String) result.get("appointment_status");
+			String method = (String) result.get("appointmentMethod");
+			String status = (String) result.get("appointmentStatus");
 			Long count = (long) result.get("count");
 			Long count = (long) result.get("count");
 
 
 			total += count;
 			total += count;
@@ -221,7 +221,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 		HashMap<String, Long> map = new HashMap<>();
 		HashMap<String, Long> map = new HashMap<>();
 
 
 		for (Map<String, Object> result : results) {
 		for (Map<String, Object> result : results) {
-			String status = (String) result.get("service_status");
+			String status = (String) result.get("serviceStatus");
 			Long count = (long) result.get("count");
 			Long count = (long) result.get("count");
 			map.put(status, count);
 			map.put(status, count);
 		}
 		}