首页看板数据异常数据和干签收、配送数据

blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java

@@ -55,8 +55,8 @@ public class IndexCountController {
 
 	@GetMapping("/get_Delivery_data")
 	@ApiOperation(value = "配送数据",tags = "配送数据")
-	public R<DeliveryDetailDataVo> getDeliveryData() {
-		DeliveryDetailDataVo deliveryData = indexCountService.getDeliveryData();
+	public R<DeliveryDataVo> getDeliveryData() {
+		DeliveryDataVo deliveryData = indexCountService.getDeliveryData();
 		return R.data(deliveryData);
 	}
 

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 @Mapper
@@ -78,6 +81,30 @@ public interface  InLibraryDeliverMapper  extends BaseMapper {
 	Integer getMainLineJob(@Param("warehouse") List<Long> warehouse);
 	Integer getMainLineEndCount(@Param("warehouse") List<Long> warehouse);
 
+	/*获取异常数据*/
+
+	Integer getAbnormalAll(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getAbnormalNotProcessed(@Param("warehouse") List<Long> warehouse, HashMap<String,Date> date);
+	BigDecimal getAbnormalApproximateRate(@Param("warehouse") List<Long> warehouse, HashMap<String,Date> date);
+
+	/*获取配送数据*/
+	Integer getDeliveryAll(@Param("warehouse") List<Long> warehouse,Integer type);
+	Integer getDeliveryAllCount(@Param("warehouse") List<Long> warehouse,Integer type);
+	Integer getDeliveryAllWeight(@Param("warehouse") List<Long> warehouse,Integer type);
+	Integer getDeliveryAllArea(@Param("warehouse") List<Long> warehouse,Integer type);
+	Integer getDeliveryOnTheWay(@Param("warehouse") List<Long> warehouse,Integer type);
+
+	/*获取签收数据*/
+
+	Integer getEndSign(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getNoSign(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	BigDecimal getApproximateRate(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getJobApproximateRate(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+
+	Integer getJobNoSign(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getTimeEndSign(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getTimeApproximateRate(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+
 }
 
 

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml

@@ -153,4 +153,28 @@
     <select id="getMainLineJob" resultType="java.lang.Integer"></select>
     <select id="getMainLineEndCount" resultType="java.lang.Integer"></select>
 
+    <!--异常数据-->
+    <select id="getAbnormalAll" resultType="java.lang.Integer"></select>
+    <select id="getAbnormalNotProcessed" resultType="java.lang.Integer"></select>
+    <select id="getAbnormalApproximateRate" resultType="java.math.BigDecimal"></select>
+
+
+    <!--配送数据-->
+    <select id="getDeliveryAll" resultType="java.lang.Integer"></select>
+    <select id="getDeliveryAllCount" resultType="java.lang.Integer"></select>
+    <select id="getDeliveryAllWeight" resultType="java.lang.Integer"></select>
+    <select id="getDeliveryAllArea" resultType="java.lang.Integer"></select>
+    <select id="getDeliveryOnTheWay" resultType="java.lang.Integer"></select>
+
+
+    <!--获取签收数据-->
+    <select id="getEndSign" resultType="java.lang.Integer"></select>
+    <select id="getNoSign" resultType="java.lang.Integer"></select>
+    <select id="getApproximateRate" resultType="java.math.BigDecimal"></select>
+    <select id="getJobApproximateRate" resultType="java.lang.Integer"></select>
+    <select id="getJobNoSign" resultType="java.lang.Integer"></select>
+    <select id="getTimeEndSign" resultType="java.lang.Integer"></select>
+    <select id="getTimeApproximateRate" resultType="java.lang.Integer"></select>
+
+
 </mapper>

blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java

@@ -4,6 +4,9 @@ package com.logpm.report.service;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -70,4 +73,34 @@ public interface InLibraryDeliverService {
 	Integer getMainLineJob(@Param("warehouse") List<Long> warehouse);
 	Integer getMainLineEndCount(@Param("warehouse") List<Long> warehouse);
 
+
+
+	/*获取异常数据*/
+
+	Integer getAbnormalAll(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getAbnormalNotProcessed(@Param("warehouse") List<Long> warehouse, HashMap<String,Date> date);
+	BigDecimal getAbnormalApproximateRate(@Param("warehouse") List<Long> warehouse, HashMap<String,Date> date);
+
+
+	/*获取配送数据*/
+
+	Integer getDeliveryAll(@Param("warehouse") List<Long> warehouse,Integer type);
+	Integer getDeliveryAllCount(@Param("warehouse") List<Long> warehouse,Integer type);
+	Integer getDeliveryAllWeight(@Param("warehouse") List<Long> warehouse,Integer type);
+	Integer getDeliveryAllArea(@Param("warehouse") List<Long> warehouse,Integer type);
+	Integer getDeliveryOnTheWay(@Param("warehouse") List<Long> warehouse,Integer type);
+
+
+	/*获取签收数据*/
+
+	Integer getEndSign(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getNoSign(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	BigDecimal getApproximateRate(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getJobApproximateRate(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+
+	Integer getJobNoSign(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getTimeEndSign(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+	Integer getTimeApproximateRate(@Param("warehouse") List<Long> warehouse, HashMap<String, Date> date);
+
+
 }

blade-service/logpm-report/src/main/java/com/logpm/report/service/IndexCountService.java

@@ -38,7 +38,7 @@ public interface IndexCountService {
 	 * 获取配送数据
 	 * @return
 	 */
-	DeliveryDetailDataVo getDeliveryData();
+	DeliveryDataVo getDeliveryData();
 
 	/**
 	 * 获取签收数据

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java

@@ -7,6 +7,9 @@ import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 @Service
@@ -130,5 +133,89 @@ public class InLibraryDeliverServiceImpl implements InLibraryDeliverService {
 		return inLibraryDeliverMapper.getMainLineStreet(warehouse);
 	}
 
+	/*异常数据*/
+
+	@Override
+	public Integer getAbnormalAll(List<Long> warehouse, HashMap<String, Date> date) {
+		return null;
+	}
+
+	@Override
+	public Integer getAbnormalNotProcessed(List<Long> warehouse, HashMap<String,Date> date) {
+		return null;
+	}
+
+	@Override
+	public BigDecimal getAbnormalApproximateRate(List<Long> warehouse, HashMap<String,Date> date) {
+		return null;
+	}
+
+
+	/*配送数据*/
+	@Override
+	public Integer getDeliveryAll(List<Long> warehouse, Integer type) {
+		return null;
+	}
+
+	@Override
+	public Integer getDeliveryAllCount(List<Long> warehouse, Integer type) {
+		return null;
+	}
+
+	@Override
+	public Integer getDeliveryAllWeight(List<Long> warehouse, Integer type) {
+		return null;
+	}
+
+	@Override
+	public Integer getDeliveryAllArea(List<Long> warehouse, Integer type) {
+		return null;
+	}
+
+	@Override
+	public Integer getDeliveryOnTheWay(List<Long> warehouse, Integer type) {
+		return null;
+	}
+
+
+
+	/*签收数据*/
+
+	@Override
+	public Integer getEndSign(List<Long> warehouse, HashMap<String, Date> date) {
+		return null;
+	}
+
+	@Override
+	public Integer getNoSign(List<Long> warehouse, HashMap<String, Date> date) {
+		return null;
+	}
+
+	@Override
+	public BigDecimal getApproximateRate(List<Long> warehouse, HashMap<String, Date> date) {
+		return null;
+	}
+
+	@Override
+	public Integer getJobApproximateRate(List<Long> warehouse, HashMap<String, Date> date) {
+		return null;
+	}
+
+
+	@Override
+	public Integer getJobNoSign(List<Long> warehouse, HashMap<String, Date> date) {
+		return null;
+	}
+
+	@Override
+	public Integer getTimeEndSign(List<Long> warehouse, HashMap<String, Date> date) {
+		return null;
+	}
+
+	@Override
+	public Integer getTimeApproximateRate(List<Long> warehouse, HashMap<String, Date> date) {
+		return null;
+	}
+
 
 }

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java

@@ -6,6 +6,8 @@ import com.logpm.report.service.IndexCountService;
 import com.logpm.report.vo.IndexCountVO;
 import com.logpm.report.vo.indexCount.*;
 import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.checkerframework.checker.units.qual.A;
 import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.stockup.StockupTypeConstant;
@@ -90,16 +92,44 @@ public class IndexCountServiceImpl implements IndexCountService {
 	 */
 	@Override
 	public AbnormalDataVo getAbnormalData() {
-		return null;
+		AbnormalDataVo abnormalDataVo = new AbnormalDataVo();
+		abnormalDataVo.setMoon(getAbnormalDataDetail("2"));
+		abnormalDataVo.setDay(getAbnormalDataDetail("3"));
+		return abnormalDataVo;
+	}
+
+	public AbnormalDetailDataVo getAbnormalDataDetail(String type){
+		AbnormalDetailDataVo abnormalDetailDataVo = new AbnormalDetailDataVo();
+		List<Long> warehouse = billingService.getWarehouse();
+		abnormalDetailDataVo.setAll(inLibraryDeliverService.getAbnormalAll(warehouse,billingService.getOtherTime(type)));
+		abnormalDetailDataVo.setNotProcessed(inLibraryDeliverService.getAbnormalNotProcessed(warehouse,billingService.getOtherTime(type)));
+		abnormalDetailDataVo.setApproximateRate(inLibraryDeliverService.getAbnormalApproximateRate(warehouse,billingService.getOtherTime(type)));
+		return abnormalDetailDataVo;
 	}
 
 	/**
-	 * 获取配送数据
+	 * 获取配送数据 type 1 市配 2商配
 	 * @return
 	 */
 	@Override
-	public DeliveryDetailDataVo getDeliveryData() {
-		return null;
+	public DeliveryDataVo getDeliveryData() {
+		DeliveryDataVo deliveryDataVo = new DeliveryDataVo();
+		deliveryDataVo.setCity(getDeliveryData(1));
+		deliveryDataVo.setShopp(getDeliveryData(2));
+		return  deliveryDataVo;
+
+	}
+
+
+	public DeliveryDetailDataVo getDeliveryData(Integer type){
+		DeliveryDetailDataVo deliveryDetailDataVo = new DeliveryDetailDataVo();
+		List<Long> warehouse = billingService.getWarehouse();
+		deliveryDetailDataVo.setAll(inLibraryDeliverService.getDeliveryAll(warehouse,type));
+		deliveryDetailDataVo.setAllCount(inLibraryDeliverService.getDeliveryAllCount(warehouse,type));
+		deliveryDetailDataVo.setAllWeight(inLibraryDeliverService.getDeliveryAllWeight(warehouse,type));
+		deliveryDetailDataVo.setAllArea(inLibraryDeliverService.getDeliveryAllArea(warehouse,type));
+		deliveryDetailDataVo.setOnTheWay(inLibraryDeliverService.getDeliveryOnTheWay(warehouse,type));
+ 		return deliveryDetailDataVo;
 	}
 
 	/**
@@ -108,7 +138,23 @@ public class IndexCountServiceImpl implements IndexCountService {
 	 */
 	@Override
 	public SignDataVo getSignData() {
-		return null;
+		SignDataVo signDataVo = new SignDataVo();
+		signDataVo.setMoon(signDataDetail("2"));
+		signDataVo.setMoon(signDataDetail("3"));
+		return signDataVo;
+	}
+
+	public SignDetailDataVo signDataDetail(String type){
+		SignDetailDataVo signDetailDataVo = new SignDetailDataVo();
+		List<Long> warehouse = billingService.getWarehouse();
+		signDetailDataVo.setEndSign(inLibraryDeliverService.getEndSign(warehouse,billingService.getOtherTime(type)));
+		signDetailDataVo.setNoSign(inLibraryDeliverService.getNoSign(warehouse,billingService.getOtherTime(type)));
+		signDetailDataVo.setTimeEndSign(inLibraryDeliverService.getTimeEndSign(warehouse,billingService.getOtherTime(type)));
+		signDetailDataVo.setJobNoSign(inLibraryDeliverService.getJobNoSign(warehouse,billingService.getOtherTime(type)));
+		signDetailDataVo.setJobApproximateRate(inLibraryDeliverService.getJobApproximateRate(warehouse,billingService.getOtherTime(type)));
+		signDetailDataVo.setTimeApproximateRate(inLibraryDeliverService.getTimeApproximateRate(warehouse,billingService.getOtherTime(type)));
+		signDetailDataVo.setApproximateRate(inLibraryDeliverService.getApproximateRate(warehouse,billingService.getOtherTime(type)));
+		return signDetailDataVo;
 	}
 
 	/**