Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDiggingController.java

+package cn.wise.sc.acquisition.business.controller;
+
+
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TEquipmentRunQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesDiggingQuery;
+import cn.wise.sc.acquisition.business.service.ITProcessesDiggingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-28
+ */
+@Api(tags = "生产工序-装车工序")
+@RestController
+@RequestMapping("/business/t-processes-digging")
+@Validated
+public class TProcessesDiggingController {
+
+	@Autowired
+	private ITProcessesDiggingService processesDiggingService;
+
+	@ApiOperation(value = "装车工序-今日数量统计", notes = "digDate 如果不传默认查询当天数据")
+	@GetMapping("/getTodayData")
+	public R getTodayData(String digDate) {
+		return processesDiggingService.getTodayData(digDate);
+	}
+
+
+	@ApiOperation(value = "装车工序分页")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "digDate", value = "装车时间", paramType = "query", dataType = "String")
+	})
+	@GetMapping("/getPage")
+	public R getPage(PageQuery pageQuery, String digDate) {
+		return processesDiggingService.getPage(pageQuery, digDate);
+	}
+
+
+	@ApiOperation(value = "保存装车工序")
+	@PostMapping("/save")
+	public R save(@RequestBody TProcessesDiggingQuery query) {
+		return processesDiggingService.save(query);
+	}
+
+	@ApiOperation(value = "修改装车工序")
+	@PostMapping("/update")
+	public R update(@RequestBody TProcessesDiggingQuery query) {
+		return processesDiggingService.update(query);
+	}
+
+	@ApiOperation(value = "装车工序详情")
+	@GetMapping("/getDetail/{Uid}")
+	public R getDetail(@PathVariable @NotBlank String Uid) {
+		return processesDiggingService.getDetail(Uid);
+	}
+
+
+
+
+}
+

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesTruckController.java

 package cn.wise.sc.acquisition.business.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesDiggingQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesTruckQuery;
+import cn.wise.sc.acquisition.business.service.ITProcessesDiggingService;
+import cn.wise.sc.acquisition.business.service.ITProcessesTruckService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.validation.constraints.NotBlank;
 
 /**
  * <p>
@@ -13,9 +25,54 @@ import org.springframework.web.bind.annotation.RestController;
  * @author ztw
  * @since 2021-04-26
  */
+@Api(tags = "生产工序-运输工序")
 @RestController
 @RequestMapping("/business/t-processes-truck")
+@Validated
 public class TProcessesTruckController {
 
+	@Autowired
+	private ITProcessesTruckService processesTruckService;
+
+
+	@ApiOperation(value = "运输工序-今日数量统计", notes = "deliveryDate 如果不传默认查询当天数据")
+	@GetMapping("/getTodayData")
+	public R getTodayData(String deliveryDate) {
+		return processesTruckService.getTodayData(deliveryDate);
+	}
+
+
+	@ApiOperation(value = "运输工序分页")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "deliveryDate", value = "运输时间", paramType = "query", dataType = "String")
+	})
+	@GetMapping("/getPage")
+	public R getPage(PageQuery pageQuery, String deliveryDate) {
+		return processesTruckService.getPage(pageQuery, deliveryDate);
+	}
+
+
+	@ApiOperation(value = "保存运输工序")
+	@PostMapping("/save")
+	public R save(@RequestBody TProcessesTruckQuery query) {
+		return processesTruckService.save(query);
+	}
+
+	@ApiOperation(value = "修改运输工序")
+	@PostMapping("/update")
+	public R update(@RequestBody TProcessesTruckQuery query) {
+		return processesTruckService.update(query);
+	}
+
+	@ApiOperation(value = "运输工序详情")
+	@GetMapping("/getDetail/{Uid}")
+	public R getDetail(@PathVariable @NotBlank String Uid) {
+		return processesTruckService.getDetail(Uid);
+	}
+
+
+
+
+
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleController.java

@@ -42,13 +42,13 @@ public class TSafeTroubleController {
 
 	@ApiOperation(value = "添加隐患")
 	@PostMapping("/save")
-	public R save(@RequestBody TSafeTroubleQuery query, HttpServletRequest request) {
+	public R save(TSafeTroubleQuery query, HttpServletRequest request) {
 		return safeTroubleService.save(query, request);
 	}
 
 	@ApiOperation(value = "隐患整改")
 	@PostMapping("/update")
-	public R update(@RequestBody TSafeTroubleQuery query, HttpServletRequest request) {
+	public R update(TSafeTroubleQuery query, HttpServletRequest request) {
 		return safeTroubleService.update(query, request);
 	}
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentAccount.java

@@ -28,7 +28,7 @@ public class TEquipmentAccount implements Serializable {
     /**
      * 设备编码
      */
-      @TableId("EquipmentID")
+    @TableId("EquipmentID")
     private String EquipmentID;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentCheck.java

 package cn.wise.sc.acquisition.business.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -28,7 +29,7 @@ public class TEquipmentCheck implements Serializable {
     /**
      * ID号
      */
-    @TableId("Uid")
+    @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
     private String Uid;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentRun.java

 package cn.wise.sc.acquisition.business.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -25,7 +26,7 @@ public class TEquipmentRun implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-    @TableId("Uid")
+    @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
     private String Uid;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentTrouble.java

 package cn.wise.sc.acquisition.business.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -28,7 +29,7 @@ public class TEquipmentTrouble implements Serializable {
     /**
      * ID号
      */
-      @TableId("Uid")
+    @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
     private String Uid;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialEntry.java

 package cn.wise.sc.acquisition.business.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -25,7 +26,7 @@ public class TMaterialEntry implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-      @TableId("Uid")
+    @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
     private String Uid;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialOut.java

 package cn.wise.sc.acquisition.business.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -28,7 +29,7 @@ public class TMaterialOut implements Serializable {
     /**
      * ID号
      */
-      @TableId("Uid")
+    @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
     private String Uid;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDigging.java

+package cn.wise.sc.acquisition.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Processes_Digging")
+public class TProcessesDigging implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * ID号
+     */
+
+    @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
+    private String Uid;
+
+    /**
+     * 采区名称
+     */
+    @TableField("StopeName")
+    private String StopeName;
+
+    /**
+     * 平台名称
+     */
+    @TableField("StepName")
+    private String StepName;
+
+    /**
+     * 爆区名称
+     */
+    @TableField("BlastAreaName")
+    private String BlastAreaName;
+
+    /**
+     * 装车日期
+     */
+    @TableField("DigDate")
+    private LocalDateTime DigDate;
+
+    /**
+     * 项目经理
+     */
+    @TableField("Manager")
+    private String Manager;
+
+    /**
+     * 主管项目领导
+     */
+    @TableField("Supervisor")
+    private String Supervisor;
+
+    /**
+     * 生产技术部
+     */
+    @TableField("TechDepart")
+    private String TechDepart;
+
+    /**
+     * 制表人
+     */
+    @TableField("Tabulator")
+    private String Tabulator;
+
+    /**
+     * 挖机编号
+     */
+    @TableField("EquipmentID")
+    private String EquipmentID;
+
+    /**
+     * 司机
+     */
+    @TableField("Driver")
+    private String Driver;
+
+    /**
+     * 工作内容
+     */
+    @TableField("WorkType")
+    private String WorkType;
+
+    /**
+     * 挖机开始读数（H）
+     */
+    @TableField("StartTime")
+    private Float StartTime;
+
+    /**
+     * 挖机结束读数（H）
+     */
+    @TableField("EndTime")
+    private Float EndTime;
+
+    /**
+     * 挖机工作时间（H）
+     */
+    @TableField("WorkTime")
+    private Float WorkTime;
+
+    /**
+     * 完成吨位
+     */
+    @TableField("Workload")
+    private Double Workload;
+
+    /**
+     * 备注
+     */
+    @TableField("Bz")
+    private String Bz;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @TableField("Tag")
+    private String Tag;
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesTruck.java

 package cn.wise.sc.acquisition.business.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -28,7 +29,7 @@ public class TProcessesTruck implements Serializable {
     /**
      * ID号
      */
-      @TableId("Uid")
+    @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
     private String Uid;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTrouble.java

 package cn.wise.sc.acquisition.business.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -28,7 +29,7 @@ public class TSafeTrouble implements Serializable {
     /**
      * ID号
      */
-      @TableId("Uid")
+    @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
     private String Uid;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTroubleImg.java

 package cn.wise.sc.acquisition.business.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
@@ -26,7 +28,7 @@ public class TSafeTroubleImg implements Serializable {
     /**
      * T_Safe_Trouble中的ID
      */
-    @TableField("TroubleUid")
+    @TableId(value = "TroubleUid", type = IdType.ASSIGN_UUID)
     private String TroubleUid;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysRole.java

@@ -28,7 +28,7 @@ public class TSysRole implements Serializable {
     /**
      * 角色ID
      */
-      @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDiggingMapper.java

+package cn.wise.sc.acquisition.business.mapper;
+
+import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-28
+ */
+public interface TProcessesDiggingMapper extends BaseMapper<TProcessesDigging> {
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDiggingMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesDiggingMapper">
+
+</mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesDiggingQuery.java

+package cn.wise.sc.acquisition.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-28
+ */
+@Data
+@ApiModel("装车工序Query")
+public class TProcessesDiggingQuery {
+
+
+
+    @ApiModelProperty("装车工序表id")
+    private String uid;
+
+    /**
+     * 采区名称
+     */
+    @ApiModelProperty("采区名称")
+    private String stopeName;
+
+    /**
+     * 平台名称
+     */
+    @ApiModelProperty("平台名称")
+    private String stepName;
+
+    /**
+     * 爆区名称
+     */
+    @ApiModelProperty("爆区名称")
+    private String blastAreaName;
+
+    /**
+     * 装车日期
+     */
+    @ApiModelProperty("装车日期")
+    private LocalDateTime digDate;
+
+    /**
+     * 项目经理
+     */
+    @ApiModelProperty("项目经理")
+    private String manager;
+
+    /**
+     * 主管项目领导
+     */
+    @ApiModelProperty("主管项目领导")
+    private String supervisor;
+
+    /**
+     * 生产技术部
+     */
+    @ApiModelProperty("生产技术部")
+    private String techDepart;
+
+    /**
+     * 制表人
+     */
+    @ApiModelProperty("制表人")
+    private String tabulator;
+
+    /**
+     * 挖机编号
+     */
+    @ApiModelProperty("挖机编号")
+    private String equipmentID;
+
+    /**
+     * 司机
+     */
+    @ApiModelProperty("司机")
+    private String driver;
+
+    /**
+     * 工作内容
+     */
+    @ApiModelProperty("工作内容")
+    private String workType;
+
+    /**
+     * 挖机开始读数（H）
+     */
+    @ApiModelProperty("挖机开始读数（H）")
+    private Float wtartTime;
+
+    /**
+     * 挖机结束读数（H）
+     */
+    @ApiModelProperty("挖机结束读数（H）")
+    private Float endTime;
+
+    /**
+     * 挖机工作时间（H）
+     */
+    @ApiModelProperty("挖机工作时间（H）")
+    private Float workTime;
+
+    /**
+     * 完成吨位
+     */
+    @ApiModelProperty("完成吨位")
+    private Double workload;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String bz;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @ApiModelProperty("日期标记,如:2021年01月")
+    private String tag;
+
+    
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesTruckQuery.java

+package cn.wise.sc.acquisition.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-28
+ */
+@Data
+@ApiModel("运输工序Query")
+public class TProcessesTruckQuery {
+
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty("ID号")
+    private String uid;
+
+    /**
+     * 采区名称
+     */
+    @ApiModelProperty("采区名称")
+    private String stopeName;
+
+    /**
+     * 平台名称
+     */
+    @ApiModelProperty("平台名称")
+    private String stepName;
+
+    /**
+     * 爆区名称
+     */
+    @ApiModelProperty("爆区名称")
+    private String blastAreaName;
+
+    /**
+     * 运输日期
+     */
+    @ApiModelProperty("运输日期")
+    private LocalDateTime deliveryDate;
+
+    /**
+     * 项目经理
+     */
+    @ApiModelProperty("项目经理")
+    private String manager;
+
+    /**
+     * 主管项目领导
+     */
+    @ApiModelProperty("主管项目领导")
+    private String supervisor;
+
+    /**
+     * 生产技术部
+     */
+    @ApiModelProperty("生产技术部")
+    private String techDepart;
+
+    /**
+     * 制表人
+     */
+    @ApiModelProperty("制表人")
+    private String tabulator;
+
+    /**
+     * 矿车编号
+     */
+    @ApiModelProperty("矿车编号")
+    private String truckID;
+
+    /**
+     * 矿车司机
+     */
+    @ApiModelProperty("矿车司机")
+    private String driver;
+
+    /**
+     * 挖机编号
+     */
+    @ApiModelProperty("挖机编号")
+    private String excavatorID;
+
+    /**
+     * 运距
+     */
+    @ApiModelProperty("运距")
+    private Float distance;
+
+    /**
+     * 装车内容
+     */
+    @ApiModelProperty("装车内容")
+    private String workType;
+
+    /**
+     * 矿车开始读数（H）
+     */
+    @ApiModelProperty("矿车开始读数（H）")
+    private Float startTime;
+
+    /**
+     * 矿车结束读数（H）
+     */
+    @ApiModelProperty("矿车结束读数（H）")
+    private Float endTime;
+
+    /**
+     * 矿车工作时间（H）
+     */
+    @ApiModelProperty("矿车工作时间（H）")
+    private Float workTime;
+
+    /**
+     * 车数合计
+     */
+    @ApiModelProperty("车数合计")
+    private Integer cshj;
+
+    /**
+     * 吨位合计
+     */
+    @ApiModelProperty("吨位合计")
+    private Double dwhj;
+
+    /**
+     * 吨公里合计
+     */
+    @ApiModelProperty("吨公里合计")
+    private Double dglhj;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String bz;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @ApiModelProperty("日期标记,如:2021年01月")
+    private String tag;
+
+
+    
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDiggingService.java

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesDiggingQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-28
+ */
+public interface ITProcessesDiggingService extends IService<TProcessesDigging> {
+
+	R getTodayData(String digDate);
+
+	R<IPage<TProcessesDigging>> getPage(PageQuery pageQuery, String digDate);
+
+	R save(TProcessesDiggingQuery query);
+
+	R update(TProcessesDiggingQuery query);
+
+	R<TProcessesDigging> getDetail(String Uid);
+
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesTruckService.java

 package cn.wise.sc.acquisition.business.service;
 
+import cn.wise.im.common.http.R;
 import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesTruckQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +17,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITProcessesTruckService extends IService<TProcessesTruck> {
 
+	R getTodayData(String deliveryDate);
+
+	R<IPage<TProcessesTruck>> getPage(PageQuery pageQuery, String deliveryDate);
+
+	R save(TProcessesTruckQuery query);
+
+	R update(TProcessesTruckQuery query);
+
+	R<TProcessesTruck> getDetail(String Uid);
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.java

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
+import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
+import cn.wise.sc.acquisition.business.mapper.TProcessesDiggingMapper;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TEquipmentAccountQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesDiggingQuery;
+import cn.wise.sc.acquisition.business.service.ITProcessesDiggingService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-28
+ */
+@Service
+@Transactional
+public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingMapper, TProcessesDigging> implements ITProcessesDiggingService {
+
+	@Resource
+	private TProcessesDiggingMapper processesDiggingMapper;
+
+
+	/**
+	 * 今日数量统计
+	 * @param digDate
+	 * @return
+	 */
+	@Override
+	public R getTodayData(String digDate){
+		Map<String,Object> map = new HashMap<>();
+		QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
+		if(StringUtils.isNoneBlank(digDate)){
+			qw.apply("DATE(DigDate) = digDate");
+		}else{
+			qw.apply("DATE(DigDate) = DATE(now())");
+		}
+		List<TProcessesDigging> list =  processesDiggingMapper.selectList(qw);
+		Float workTimes = list.stream().map(p -> p.getWorkTime()).reduce(Float::sum).get();
+		Double workLoads = list.stream().mapToDouble(TProcessesDigging::getWorkload).sum();
+		map.put("workTimes",workTimes);
+		map.put("workLoads",workLoads);
+		return R.ok(map);
+
+	}
+
+	/**
+	 * 分页列表
+	 * @param pageQuery
+	 * @param digDate
+	 * @return
+	 */
+	@Override
+	public R<IPage<TProcessesDigging>> getPage(PageQuery pageQuery, String digDate) {
+		QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
+		if(StringUtils.isNoneBlank(digDate)){
+			qw.apply("DATE(DigDate) = digDate");
+		}
+		qw.orderByDesc("DigDate");
+		IPage<TProcessesDigging> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		page = processesDiggingMapper.selectPage(page, qw);
+		return R.ok(page);
+	}
+
+	/**
+	 * 新增
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public R save(TProcessesDiggingQuery query){
+		Rcode.NOT_PARAM.assertNotNull(query);
+		Rcode.NOT_PARAM.assertNotNull(query.getStopeName());
+		Rcode.NOT_PARAM.assertNotNull(query.getStepName());
+		Rcode.NOT_PARAM.assertNotNull(query.getBlastAreaName());
+		TProcessesDigging digging = new TProcessesDigging();
+		BeanUtils.copyProperties(query, digging);
+		processesDiggingMapper.insert(digging);
+		return R.ok();
+	}
+
+	/**
+	 * 修改
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public R update(TProcessesDiggingQuery query) {
+		Rcode.NOT_PARAM.assertNotNull(query);
+		Rcode.NOT_PARAM.assertNotNull(query.getUid());
+		TProcessesDigging digging = processesDiggingMapper.selectById(query.getUid());
+		Rcode.NOT_FOUND.assertNotNull(digging);
+		BeanUtils.copyProperties(query, digging);
+		processesDiggingMapper.updateById(digging);
+		return R.ok();
+	}
+
+	/**
+	 * 详情
+	 * @param Uid
+	 * @return
+	 */
+	@Override
+	public R<TProcessesDigging> getDetail(String Uid) {
+		Rcode.NOT_PARAM.assertNotNull(Uid);
+		TProcessesDigging digging = processesDiggingMapper.selectById(Uid);
+		Rcode.NOT_FOUND.assertNotNull(digging);
+		return R.ok(digging);
+	}
+
+
+
+
+
+
+
+
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.java

 package cn.wise.sc.acquisition.business.service.impl;
 
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
 import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
 import cn.wise.sc.acquisition.business.mapper.TProcessesTruckMapper;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesTruckQuery;
 import cn.wise.sc.acquisition.business.service.ITProcessesTruckService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +32,96 @@ import org.springframework.stereotype.Service;
 @Service
 public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMapper, TProcessesTruck> implements ITProcessesTruckService {
 
+	@Resource
+	private TProcessesTruckMapper processesTruckMapper;
+
+
+	/**
+	 * 今日数量统计
+	 * @param deliveryDate
+	 * @return
+	 */
+	@Override
+	public R getTodayData(String deliveryDate){
+		Map<String,Object> map = new HashMap<>();
+		QueryWrapper<TProcessesTruck> qw = new QueryWrapper<>();
+		if(StringUtils.isNoneBlank(deliveryDate)){
+			qw.apply("DATE(DeliveryDate) = deliveryDate");
+		}else{
+			qw.apply("DATE(DeliveryDate) = DATE(now())");
+		}
+		List<TProcessesTruck> list =  processesTruckMapper.selectList(qw);
+		Integer cshjs = list.stream().map(p -> p.getCshj()).reduce(Integer::sum).get();
+		Double dwhjs = list.stream().mapToDouble(TProcessesTruck::getDwhj).sum();
+		map.put("cshjs",cshjs);
+		map.put("dwhjs",dwhjs);
+		return R.ok(map);
+
+	}
+
+	/**
+	 * 分页列表
+	 * @param pageQuery
+	 * @param deliveryDate
+	 * @return
+	 */
+	@Override
+	public R<IPage<TProcessesTruck>> getPage(PageQuery pageQuery, String deliveryDate) {
+		QueryWrapper<TProcessesTruck> qw = new QueryWrapper<>();
+		if(StringUtils.isNoneBlank(deliveryDate)){
+			qw.apply("DATE(DeliveryDate) = deliveryDate");
+		}
+		qw.orderByDesc("DeliveryDate");
+		IPage<TProcessesTruck> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		page = processesTruckMapper.selectPage(page, qw);
+		return R.ok(page);
+	}
+
+	/**
+	 * 新增
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public R save(TProcessesTruckQuery query){
+		Rcode.NOT_PARAM.assertNotNull(query);
+		Rcode.NOT_PARAM.assertNotNull(query.getStopeName());
+		Rcode.NOT_PARAM.assertNotNull(query.getStepName());
+		Rcode.NOT_PARAM.assertNotNull(query.getBlastAreaName());
+		TProcessesTruck truck = new TProcessesTruck();
+		BeanUtils.copyProperties(query, truck);
+		processesTruckMapper.insert(truck);
+		return R.ok();
+	}
+
+	/**
+	 * 修改
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public R update(TProcessesTruckQuery query) {
+		Rcode.NOT_PARAM.assertNotNull(query);
+		Rcode.NOT_PARAM.assertNotNull(query.getUid());
+		TProcessesTruck digging = processesTruckMapper.selectById(query.getUid());
+		Rcode.NOT_FOUND.assertNotNull(digging);
+		BeanUtils.copyProperties(query, digging);
+		processesTruckMapper.updateById(digging);
+		return R.ok();
+	}
+
+	/**
+	 * 详情
+	 * @param Uid
+	 * @return
+	 */
+	@Override
+	public R<TProcessesTruck> getDetail(String Uid) {
+		Rcode.NOT_PARAM.assertNotNull(Uid);
+		TProcessesTruck digging = processesTruckMapper.selectById(Uid);
+		Rcode.NOT_FOUND.assertNotNull(digging);
+		return R.ok(digging);
+	}
+
+
 }