Merge branch 'dev_schedule_summary' into 'develop'

修改

See merge request !213

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

@@ -303,9 +303,9 @@ public class ScheduleServiceImpl implements ScheduleService {
 		wrapper.select("skill, COUNT(*) as count")
 				.lambda()
 				.eq(OrderRequest::getDt, date)
-				.eq(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue)
-				.eq(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue)
-				.eq(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue)
+				.in(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue)
+				.in(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue)
+				.in(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue)
 				.groupBy(OrderRequest::getSkill);
 		List<Map<String, Object>> results = orderRequestMPDao.selectMaps(wrapper);
 		for (Map<String, Object> result : results) {
@@ -329,9 +329,9 @@ public class ScheduleServiceImpl implements ScheduleService {
 		wrapper.select("org_group_id, COUNT(*) as count")
 				.lambda()
 				.eq(OrderRequest::getDt, date)
-				.eq(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue)
-				.eq(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue)
-				.eq(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue)
+				.in(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue)
+				.in(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue)
+				.in(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue)
 				.groupBy(OrderRequest::getOrgGroupId);
 		List<Map<String, Object>> results = orderRequestMPDao.selectMaps(wrapper);
 		for (Map<String, Object> result : results) {
@@ -352,9 +352,9 @@ public class ScheduleServiceImpl implements ScheduleService {
 		wrapper.select("appointment_method, appointment_status, COUNT(*) as count")
 				.lambda()
 				.eq(OrderRequest::getDt, date)
-				.eq(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue)
-				.eq(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue)
-				.eq(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue)
+				.in(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue)
+				.in(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue)
+				.in(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue)
 				.groupBy(OrderRequest::getAppointmentMethod, OrderRequest::getAppointmentStatus);
 		List<Map<String, Object>> results = orderRequestMPDao.selectMaps(wrapper);
 
@@ -401,9 +401,9 @@ public class ScheduleServiceImpl implements ScheduleService {
 		HashMap<String, Integer> map = new HashMap<>();
 		LambdaQueryWrapper<OrgGroup> lqw = new LambdaQueryWrapper<>();
 		lqw.select(OrgGroup::getGroupId, OrgGroup::getCategory);
-		lqw.eq(levelType.equals("cluster"), OrgGroup::getClusterId, levelValue);
-		lqw.eq(levelType.equals("branch"), OrgGroup::getBranchId, levelValue);
-		lqw.eq(levelType.equals("group"), OrgGroup::getGroupId, levelValue);
+		lqw.in(levelType.equals("cluster"), OrgGroup::getClusterId, levelValue);
+		lqw.in(levelType.equals("branch"), OrgGroup::getBranchId, levelValue);
+		lqw.in(levelType.equals("group"), OrgGroup::getGroupId, levelValue);
 		List<OrgGroup> groups = orgGroupMPDao.selectList(lqw);
 		for (OrgGroup g : groups) {
 			map.put(g.getGroupId(), g.getCategory());