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

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/ScheduleController.java

@@ -20,7 +20,7 @@ public class ScheduleController {
 
 	@GetMapping("/schedule/overview")
 	public Result<?> getScheduleOverview(@RequestParam long page, @RequestParam long size, @RequestParam String date,
-										 @RequestParam String levelType, @RequestParam("levelId") List<String> levelIds) {
+										 @RequestParam String levelType, @RequestParam("levelValue") List<String> levelIds) {
 		Result<?> res = null;
 		try{
 			res = scheduleService.getScheduleOverview(page, size, date, levelType, levelIds);

project-order/src/main/java/com/alibaba/cloud/integration/order/dao/OrgTeamEngineerMPDao.java

+package com.alibaba.cloud.integration.order.dao;
+
+import com.alibaba.cloud.integration.order.entity.OrgTeamEngineer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OrgTeamEngineerMPDao extends BaseMapper<OrgTeamEngineer> {
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/dao/OrgTeamMPDao.java

+package com.alibaba.cloud.integration.order.dao;
+
+import com.alibaba.cloud.integration.order.entity.OrgTeam;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OrgTeamMPDao extends BaseMapper<OrgTeam> {
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/ScheduleEngineerOverviewResp.java

+package com.alibaba.cloud.integration.order.dto;
+
+import lombok.Data;
+
+@Data
+public class ScheduleEngineerOverviewResp {
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/ScheduleOverviewResp.java

+package com.alibaba.cloud.integration.order.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ScheduleOverviewResp {
+	private long total;
+
+	private long pages;
+
+	private long pageCurrent;
+
+	private long pageSize;
+
+	private List<Team> content;
+
+	@Data
+	public static class Team{
+		private String name;
+		private String value;
+		private String level;
+		private String orderDesc;
+		private String distanceDes;
+		private OrderSum order;
+		private List<Item> children;
+	}
+
+	@Data
+	public static class Item{
+		private String name;
+		private String value;
+		private String level;
+		private String orderDesc;
+		private String distanceDes;
+		private OrderSum order;
+	}
+
+	@Data
+	public static class OrderSum {
+		private Integer total;
+		private Integer installNum;
+		private Integer fixNum;
+		private Integer designNum;
+		private Integer cleanNum;
+	}
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/OrgTeam.java

+package com.alibaba.cloud.integration.order.entity;
+
+import lombok.Data;
+
+import java.sql.Time;
+import java.sql.Timestamp;
+
+@Data
+public class OrgTeam {
+	private long id;
+	private String teamId;
+	private String teamName;
+	private String teamType;
+	private String clusterId;
+	private String branchId;
+	private String groupId;
+	private String warehouseId;
+	private String workdays;
+	private String memo;
+	private Timestamp createTime;
+	private Timestamp updateTime;
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/OrgTeamEngineer.java

+package com.alibaba.cloud.integration.order.entity;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class OrgTeamEngineer {
+	private long id;
+	private String teamId;
+	private String engineerCode;
+	private Integer status;
+	private String memo;
+	private Timestamp createTime;
+	private Timestamp updateTime;
+}
\ No newline at end of file

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/ScheduleServiceImpl.java

 package com.alibaba.cloud.integration.order.service.impl;
 
 import com.alibaba.cloud.integration.common.Result;
+import com.alibaba.cloud.integration.order.dao.OrderAppointmentMPDao;
+import com.alibaba.cloud.integration.order.dao.OrderRequestMPDao;
+import com.alibaba.cloud.integration.order.dao.OrgTeamEngineerMPDao;
+import com.alibaba.cloud.integration.order.dao.OrgTeamMPDao;
+import com.alibaba.cloud.integration.order.dto.ScheduleOverviewResp;
+import com.alibaba.cloud.integration.order.entity.OrderAppointment;
+import com.alibaba.cloud.integration.order.entity.OrderRequest;
+import com.alibaba.cloud.integration.order.entity.OrgTeam;
+import com.alibaba.cloud.integration.order.entity.OrgTeamEngineer;
 import com.alibaba.cloud.integration.order.service.ScheduleService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class ScheduleServiceImpl implements ScheduleService {
 
+	@Autowired
+	private OrgTeamMPDao orgTeamMPDao;
+
+	@Autowired
+	private OrgTeamEngineerMPDao orgTeamEngineerMPDao;
+
+	@Autowired
+	private OrderRequestMPDao orderRequestMPDao;
+
+	@Autowired
+	private OrderAppointmentMPDao orderAppointmentMPDao;
+
 	@Override
 	public Result<?> getScheduleOverview(long page, long size, String date, String levelType, List<String> levelIds) {
-		return null;
+
+		// 获取team列表
+		IPage<OrgTeam> pg = this.queryOrgTeams(page, size, levelType, levelIds);
+		List<OrgTeam> orgTeams = pg.getRecords();
+
+		List<ScheduleOverviewResp.Team> items = new ArrayList<>();
+
+		// 获取工单列表
+		for (OrgTeam t : orgTeams) {
+			ScheduleOverviewResp.Team item = new ScheduleOverviewResp.Team();
+			item.setName(t.getTeamName());
+			item.setValue(t.getTeamId());
+			item.setLevel("team");
+
+			// 获取改team订单列表
+			List<OrderRequest> orders = this.queryOrderRequests(t.getTeamId(), date);
+			item.setOrder(this.getTeamOrderSum(orders));
+
+			// 获取team技术员列表
+			List<OrgTeamEngineer> teamEngineers = this.queryOrgTeamEngineers(t.getTeamId());
+
+			// 获取技术员对应的订单
+			List<String> orderRequestIds = orders.stream().map(OrderRequest::getOrderId).collect(Collectors.toList());
+			List<OrderAppointment> orderAppointments = this.queryOrderAppointments(orderRequestIds, date);
+			Map<String, List<OrderAppointment>> engineerOrders = orderAppointments.stream().collect(Collectors.groupingBy(OrderAppointment::getEngineerCode));
+
+			List<ScheduleOverviewResp.Item> children = new ArrayList<>();
+			for (Map.Entry<String, List<OrderAppointment>> entry : engineerOrders.entrySet()) {
+				ScheduleOverviewResp.Item child = new ScheduleOverviewResp.Item();
+
+				String engineerCode = entry.getKey();
+				List<String> orderIds = entry.getValue().stream().map(OrderAppointment::getOrderId).collect(Collectors.toList());
+
+				List<OrderRequest> orders2 = new ArrayList<>();
+				for (OrderRequest o : orders) {
+					if (orderIds.contains(o.getOrderId())) {
+						orders.add(o);
+					}
+				}
+				child.setName("");
+				child.setValue(engineerCode);
+				child.setLevel("engineer");
+				child.setOrder(this.getTeamOrderSum(orders2));
+				child.setOrderDesc(Integer.toString(orders2.size()));
+				child.setDistanceDes("");
+				children.add(child);
+			}
+			item.setChildren(children);
+
+			item.setOrderDesc(String.format("人均:%d", orders.size() / teamEngineers.size()));
+			item.setDistanceDes("");
+		}
+
+		ScheduleOverviewResp res = new ScheduleOverviewResp();
+		res.setTotal(pg.getTotal());
+		res.setPages(pg.getPages());
+		res.setPageSize(pg.getSize());
+		res.setPageCurrent(pg.getCurrent());
+		res.setContent(items);
+		return Result.success(res);
 	}
 
 	@Override
 	public Result<?> getScheduleEngineerOverview(String date, String engineerCode) {
 		return null;
 	}
+
+	private IPage<OrgTeam> queryOrgTeams(long page, long size, String levelType, List<String> levelIds) {
+		IPage<OrgTeam> pg = new Page<>(page, size);
+
+		LambdaQueryWrapper<OrgTeam> lqw = new LambdaQueryWrapper<>();
+		lqw.in(levelType.equals("cluster"), OrgTeam::getClusterId, levelIds);
+		lqw.in(levelType.equals("branch"), OrgTeam::getBranchId, levelIds);
+		lqw.in(levelType.equals("group"), OrgTeam::getGroupId, levelIds);
+
+		lqw.orderByAsc(OrgTeam::getTeamId); // 根据teamId排序
+
+		orgTeamMPDao.selectPage(pg, lqw);
+
+		return pg;
+	}
+
+	private List<OrgTeamEngineer> queryOrgTeamEngineers(String teamId) {
+		LambdaQueryWrapper<OrgTeamEngineer> lqw = new LambdaQueryWrapper<>();
+		lqw.eq(OrgTeamEngineer::getTeamId, teamId);
+		lqw.eq(OrgTeamEngineer::getStatus, 1);
+		return orgTeamEngineerMPDao.selectList(lqw);
+	}
+
+	private List<OrderRequest> queryOrderRequests(String teamId, String date) {
+		LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
+		lqw.in(OrderRequest::getOrgTeamId, teamId);
+		lqw.eq(OrderRequest::getAppointmentStatus, "ASSIGNED");
+		lqw.gt(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(date, "00:00:00"));
+		lqw.lt(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(date, "23:59:59"));
+		return orderRequestMPDao.selectList(lqw);
+	}
+
+	private List<OrderAppointment> queryOrderAppointments(List<String> orderIds, String date) {
+		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
+		lqw.in(OrderAppointment::getOrderId, orderIds);
+		lqw.ge(OrderAppointment::getExpectStartTime, this.getTimestampFromDate(date, "00:00:00"));
+		return orderAppointmentMPDao.selectList(lqw);
+	}
+
+	private ScheduleOverviewResp.OrderSum getTeamOrderSum(List<OrderRequest> orders) {
+
+		ScheduleOverviewResp.OrderSum s = new ScheduleOverviewResp.OrderSum();
+
+		Map<String, List<OrderRequest>> cc = orders.stream().collect(Collectors.groupingBy(OrderRequest::getSkill));
+		List<OrderRequest> emtpy = new ArrayList<>();
+
+		s.setTotal(orders.size());
+		s.setInstallNum(cc.getOrDefault("安装", emtpy).size());
+		s.setFixNum(cc.getOrDefault("维修", emtpy).size());
+		s.setDesignNum(cc.getOrDefault("设计", emtpy).size());
+		s.setCleanNum(cc.getOrDefault("清洗", emtpy).size());
+		return s;
+	}
+
+	public Timestamp getTimestampFromDate(String date, String t) {
+		return Timestamp.valueOf(date + " " + t);
+	}
 }
\ No newline at end of file