Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 8b5888a0 by 王力
Options

Merge branch 'dev_schedule_summary' into 'develop' 

修改

See merge request !213
2 parents dc3385e2 2a7ea8b9
Inline Side-by-side
Showing with 12 additions and 12 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
...@@ -303,9 +303,9 @@ public class ScheduleServiceImpl implements ScheduleService { ...@@ -303,9 +303,9 @@ public class ScheduleServiceImpl implements ScheduleService {
wrapper.select("skill, COUNT(*) as count") wrapper.select("skill, COUNT(*) as count")
.lambda() .lambda()
.eq(OrderRequest::getDt, date) .eq(OrderRequest::getDt, date)
.eq(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue) .in(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue)
.eq(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue) .in(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue)
.eq(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue) .in(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue)
.groupBy(OrderRequest::getSkill); .groupBy(OrderRequest::getSkill);
List<Map<String, Object>> results = orderRequestMPDao.selectMaps(wrapper); List<Map<String, Object>> results = orderRequestMPDao.selectMaps(wrapper);
for (Map<String, Object> result : results) { for (Map<String, Object> result : results) {
...@@ -329,9 +329,9 @@ public class ScheduleServiceImpl implements ScheduleService { ...@@ -329,9 +329,9 @@ public class ScheduleServiceImpl implements ScheduleService {
wrapper.select("org_group_id, COUNT(*) as count") wrapper.select("org_group_id, COUNT(*) as count")
.lambda() .lambda()
.eq(OrderRequest::getDt, date) .eq(OrderRequest::getDt, date)
.eq(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue) .in(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue)
.eq(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue) .in(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue)
.eq(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue) .in(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue)
.groupBy(OrderRequest::getOrgGroupId); .groupBy(OrderRequest::getOrgGroupId);
List<Map<String, Object>> results = orderRequestMPDao.selectMaps(wrapper); List<Map<String, Object>> results = orderRequestMPDao.selectMaps(wrapper);
for (Map<String, Object> result : results) { for (Map<String, Object> result : results) {
...@@ -352,9 +352,9 @@ public class ScheduleServiceImpl implements ScheduleService { ...@@ -352,9 +352,9 @@ public class ScheduleServiceImpl implements ScheduleService {
wrapper.select("appointment_method, appointment_status, COUNT(*) as count") wrapper.select("appointment_method, appointment_status, COUNT(*) as count")
.lambda() .lambda()
.eq(OrderRequest::getDt, date) .eq(OrderRequest::getDt, date)
.eq(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue) .in(levelType.equals("cluster"), OrderRequest::getOrgClusterId, levelValue)
.eq(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue) .in(levelType.equals("branch"), OrderRequest::getOrgBranchId, levelValue)
.eq(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue) .in(levelType.equals("group"), OrderRequest::getOrgGroupId, levelValue)
.groupBy(OrderRequest::getAppointmentMethod, OrderRequest::getAppointmentStatus); .groupBy(OrderRequest::getAppointmentMethod, OrderRequest::getAppointmentStatus);
List<Map<String, Object>> results = orderRequestMPDao.selectMaps(wrapper); List<Map<String, Object>> results = orderRequestMPDao.selectMaps(wrapper);
...@@ -401,9 +401,9 @@ public class ScheduleServiceImpl implements ScheduleService { ...@@ -401,9 +401,9 @@ public class ScheduleServiceImpl implements ScheduleService {
HashMap<String, Integer> map = new HashMap<>(); HashMap<String, Integer> map = new HashMap<>();
LambdaQueryWrapper<OrgGroup> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrgGroup> lqw = new LambdaQueryWrapper<>();
lqw.select(OrgGroup::getGroupId, OrgGroup::getCategory); lqw.select(OrgGroup::getGroupId, OrgGroup::getCategory);
lqw.eq(levelType.equals("cluster"), OrgGroup::getClusterId, levelValue); lqw.in(levelType.equals("cluster"), OrgGroup::getClusterId, levelValue);
lqw.eq(levelType.equals("branch"), OrgGroup::getBranchId, levelValue); lqw.in(levelType.equals("branch"), OrgGroup::getBranchId, levelValue);
lqw.eq(levelType.equals("group"), OrgGroup::getGroupId, levelValue); lqw.in(levelType.equals("group"), OrgGroup::getGroupId, levelValue);
List<OrgGroup> groups = orgGroupMPDao.selectList(lqw); List<OrgGroup> groups = orgGroupMPDao.selectList(lqw);
for (OrgGroup g : groups) { for (OrgGroup g : groups) {
map.put(g.getGroupId(), g.getCategory()); map.put(g.getGroupId(), g.getCategory());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!