Merge branch 'dev_workbench_summary' into 'develop'

Dev workbench summary

See merge request !153

project-order/src/main/java/com/dituhui/pea/order/controller/WorkbenchController.java

@@ -9,8 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import java.time.LocalDate;
+
 @Slf4j
 @Slf4j
 @RestController
 @RestController
 @RequestMapping("/pea-order")
 @RequestMapping("/pea-order")
@@ -29,4 +32,15 @@ public class WorkbenchController {
         }
         }
         return res;
         return res;
     }
     }
+
+    @GetMapping("/workbench/summary")
+    public Result<?> workbenchSummary(@RequestParam String levelType, @RequestParam String levelValue, @RequestParam LocalDate date) {
+        Result<?> res = null;
+        try{
+            res = workbenchService.getWorkbenchSummary(levelType, levelValue, date);
+        } catch (BusinessException e) {
+            return Result.failed(e.getMessage());
+        }
+        return res;
+    }
 }
 }

project-order/src/main/java/com/dituhui/pea/order/dto/WorkbenchSummaryResp.java

+package com.dituhui.pea.order.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WorkbenchSummaryResp {
+
+	private List<ItemDTO> summary;
+
+	@Data
+	public static class ItemDTO {
+		private String type;
+		private List<ValueDTO> rows;
+	}
+
+	@Data
+	@JsonInclude(JsonInclude.Include.NON_NULL)
+	public static class ValueDTO {
+		private String title;
+		private String value;
+		private String total;
+		private String valueColor;
+		private String url;
+
+		public ValueDTO(String title, String value, String total, String valueColor, String url){
+			this.title = title;
+			this.value = value;
+			this.total = total;
+			this.valueColor = valueColor;
+			this.url = url;
+		}
+	}
+}
\ No newline at end of file

project-order/src/main/java/com/dituhui/pea/order/entity/OrderAppointment.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 
 
 @Data
 @Data
 public class OrderAppointment {
 public class OrderAppointment {
@@ -15,6 +16,7 @@ public class OrderAppointment {
 	private String engineerPhone;
 	private String engineerPhone;
 	private Integer engineerAge;
 	private Integer engineerAge;
 	private Integer isWorkshop;
 	private Integer isWorkshop;
+	private LocalDate dt;
 	private Timestamp expectStartTime;
 	private Timestamp expectStartTime;
 	private Timestamp expectEndTime;
 	private Timestamp expectEndTime;
 	private Timestamp actualTime;
 	private Timestamp actualTime;

project-order/src/main/java/com/dituhui/pea/order/entity/OrderRequest.java

 package com.dituhui.pea.order.entity;
 package com.dituhui.pea.order.entity;
 
 
 import lombok.Data;
 import lombok.Data;
+
 import java.sql.Timestamp;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 
 
 @Data
 @Data
 public class OrderRequest {
 public class OrderRequest {
@@ -21,6 +23,7 @@ public class OrderRequest {
 	private String skill;
 	private String skill;
 	private String applyNote;
 	private String applyNote;
 	private String faultDescribe;
 	private String faultDescribe;
+	private LocalDate dt;
 	private Timestamp expectTimeBegin;
 	private Timestamp expectTimeBegin;
 	private Timestamp expectTimeEnd;
 	private Timestamp expectTimeEnd;
 	private String expectTimeDesc;
 	private String expectTimeDesc;

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

@@ -4,6 +4,10 @@ import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.dto.EngineersGanttReqDTO;
 import com.dituhui.pea.order.dto.EngineersGanttReqDTO;
 import com.dituhui.pea.order.dto.OrderChangeListReqDTO;
 import com.dituhui.pea.order.dto.OrderChangeListReqDTO;
 
 
+import java.time.LocalDate;
+
 public interface WorkbenchService {
 public interface WorkbenchService {
     Result<?> getOrderChangeList(OrderChangeListReqDTO orderChangeListReqDTO);
     Result<?> getOrderChangeList(OrderChangeListReqDTO orderChangeListReqDTO);
+
+    Result<?> getWorkbenchSummary(String levelType, String levelValue, LocalDate dt);
 }
 }