炮孔设计模块,设计爆区爆破量模块代码编写

acquisition-business/pom.xml

@@ -215,7 +215,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+
     </dependencies>
+
+
     <profiles>
         <profile>
             <!-- 开发环境 -->

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

+package cn.wise.sc.acquisition.business.controller;
+
+
+import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
+import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
+import com.baomidou.mybatisplus.extension.api.R;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@RestController
+@RequestMapping("/business/t-processes-blastdesign-hole")
+public class TProcessesBlastdesignHoleController {
+    @Autowired
+    private ITProcessesBlastdesignHoleService itProcessesBlastdesignHoleService;
+    /**
+     * 根据条件查询炮孔设计 分页
+     *
+     * @param tProcessesBlastdesignHoleQuery
+     * @return
+     */
+    @ApiOperation(value = "获取送验单列表 可分页模糊查询")
+    @RequestMapping(value = "/getPage", method = RequestMethod.GET)
+    public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) {
+        return itProcessesBlastdesignHoleService.getPage(tProcessesBlastdesignHoleQuery,query);
+    }
+
+
+    /**
+     * 根据uid修改炮孔设计
+     *
+     * @param tProcessesBlastdesignHoleQuery
+     * @return
+     */
+    @ApiOperation(value = "根据uid修改炮孔设计")
+    @RequestMapping(value = "/updateByUid", method = RequestMethod.POST)
+    public R updateByUid(@RequestBody TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery) {
+        return itProcessesBlastdesignHoleService.updateByUid(tProcessesBlastdesignHoleQuery);
+    }
+
+
+    /**
+     * 根据uid删除炮孔设计
+     *
+     * @param tProcessesBlastdesignHoleQuery
+     * @return
+     */
+    @ApiOperation(value = "根据uid删除炮孔设计")
+    @RequestMapping(value = "/deleteByUid", method = RequestMethod.POST)
+    public R deleteByUid(@RequestBody TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery) {
+        return itProcessesBlastdesignHoleService.deleteByUid(tProcessesBlastdesignHoleQuery);
+    }
+
+
+    /**
+     * 根据uid增加炮孔设计
+     *
+     * @param tProcessesBlastdesignHoleQuery
+     * @return
+     */
+    @ApiOperation(value = "根据uid增加炮孔设计")
+    @RequestMapping(value = "/insertTProcessesBlastdesignHole", method = RequestMethod.POST)
+    public R insertTProcessesBlastdesignHole(@RequestBody TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery) {
+        return itProcessesBlastdesignHoleService.insertTProcessesBlastdesignHole(tProcessesBlastdesignHoleQuery);
+    }
+
+
+    /**
+     * 根据uid查询炮孔设计
+     *
+     * @param tProcessesBlastdesignHoleQuery
+     * @return
+     */
+    @ApiOperation(value = "根据uid查询炮孔设计")
+    @RequestMapping(value = "/getByUid", method = RequestMethod.GET)
+    public R getByUid(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery) {
+        return itProcessesBlastdesignHoleService.getByUid(tProcessesBlastdesignHoleQuery);
+    }
+}
+

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

+package cn.wise.sc.acquisition.business.controller;
+
+
+import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery;
+import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignVolumeService;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
+import com.baomidou.mybatisplus.extension.api.R;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@RestController
+@RequestMapping("/business/t-processes-blastdesign-volume")
+public class TProcessesBlastdesignVolumeController {
+
+    @Autowired
+    private ITProcessesBlastdesignVolumeService itProcessesBlastdesignVolumeService;
+    /**
+     * 查询设计爆区爆破量列表 分页
+     *
+     * @param tProcessesBlastdesignVolumeQuery
+     * @return
+     */
+    @ApiOperation(value = "查询设计爆区爆破量列表 分页")
+    @RequestMapping(value = "/getPage", method = RequestMethod.GET)
+    public R getPage(TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery, Query query) {
+        return itProcessesBlastdesignVolumeService.getPage(tProcessesBlastdesignVolumeQuery,query);
+    }
+
+    /**
+     * 根据条件修改设计爆区爆破量
+     *
+     * @param tProcessesBlastdesignVolumeQuery
+     * @return
+     */
+    @ApiOperation(value = "根据条件修改设计爆区爆破量")
+    @RequestMapping(value = "/updateByQuery", method = RequestMethod.POST)
+    public R updateByQuery(@RequestBody TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery) {
+        return itProcessesBlastdesignVolumeService.updateByQuery(tProcessesBlastdesignVolumeQuery);
+    }
+
+
+
+
+    /**
+     * 根据条件查询设计爆区爆破量
+     *
+     * @param tProcessesBlastdesignVolumeQuery
+     * @return
+     */
+    @ApiOperation(value = "根据条件查询设计爆区爆破量")
+    @RequestMapping(value = "/getByQuery", method = RequestMethod.GET)
+    public R getByQuery(TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery) {
+        return itProcessesBlastdesignVolumeService.getByQuery(tProcessesBlastdesignVolumeQuery);
+    }
+}
+

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignHole.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 renchao
+ * @since 2021-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Processes_BlastDesign_Hole")
+public class TProcessesBlastdesignHole 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("BlastHoleID")
+    private String BlastHoleID;
+
+    /**
+     * 孔深（m）
+     */
+    @TableField("Depth")
+    private Double Depth;
+
+    /**
+     * 排距（m）
+     */
+    @TableField("RowSpace")
+    private Double RowSpace;
+
+    /**
+     * 孔距（m）
+     */
+    @TableField("HoleSpace")
+    private Double HoleSpace;
+
+    /**
+     * 方位角
+     */
+    @TableField("Azimuth")
+    private Double Azimuth;
+
+    /**
+     * 倾角
+     */
+    @TableField("Inclination")
+    private Double Inclination;
+
+    /**
+     * 孔径(m)
+     */
+    @TableField("Aperture")
+    private Double Aperture;
+
+    /**
+     * 开孔坐标X
+     */
+    @TableField("X")
+    private Double x;
+
+    /**
+     * 开孔坐标Y
+     */
+    @TableField("Y")
+    private Double y;
+
+    /**
+     * 开孔坐标Z
+     */
+    @TableField("Z")
+    private Double z;
+
+    /**
+     * 台阶高度
+     */
+    @TableField("StepHeight")
+    private Double StepHeight;
+
+    /**
+     * 单孔爆破量(m3)=孔距*排距*台阶高度
+     */
+    @TableField("HoleBlastVolume")
+    private Double HoleBlastVolume;
+
+    /**
+     * 穿孔日期
+     */
+    @TableField("DrillingDate")
+    private LocalDateTime DrillingDate;
+
+    /**
+     * 爆破日期
+     */
+    @TableField("BlastDate")
+    private LocalDateTime BlastDate;
+
+
+}

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

+package cn.wise.sc.acquisition.business.entity;
+
+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 renchao
+ * @since 2021-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Processes_BlastDesign_Volume")
+public class TProcessesBlastdesignVolume implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 采区名称
+     */
+      @TableId("StopeName")
+    private String StopeName;
+
+    /**
+     * 平台名称
+     */
+    @TableField("StepName")
+    private String StepName;
+
+    /**
+     * 爆区名称
+     */
+    @TableField("BlastAreaName")
+    private String BlastAreaName;
+
+    /**
+     * 设计爆区爆破量(m3)
+     */
+    @TableField("BlastVolume")
+    private Double BlastVolume;
+
+    /**
+     * 设计日期
+     */
+    @TableField("DesignDate")
+    private LocalDateTime DesignDate;
+
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java

@@ -92,24 +92,24 @@ public class ProjectEnum {
          * 根据value,获取label
          */
         public static String getLabel(int value) {
-            for (ImageType c : ImageType.values()) {
+            for (TSampleListType c : TSampleListType.values()) {
                 if (c.value == value) {
                     return c.label;
                 }
             }
-            return ImageType.RECORD_CODE.label;
+            return TSampleListType.YH.label;
         }
 
         /**
          * 根据label,获取value
          */
         public static int getValue(String label) {
-            for (ImageType c : ImageType.values()) {
+            for (TSampleListType c : TSampleListType.values()) {
                 if (StringUtils.equalsIgnoreCase(label, c.label)) {
                     return c.value;
                 }
             }
-            return ImageType.RECORD_CODE.value;
+            return TSampleListType.YH.value;
         }
 
         public int getValue() {
@@ -120,4 +120,209 @@ public class ProjectEnum {
             return label;
         }
     }
+
+
+    /**
+     * 数据库别名字段 例如select * from TProcessesBlastdesignVolume b,会在queryWrapper中用到
+     */
+    public enum TableAlias {
+
+        A(1, "a.","别名a"),
+
+        B(2, "b.","别名b");
+
+        // 成员变量
+        private int value;
+        private String label;
+        private String explain;
+
+        // 构造方法
+        TableAlias(int value, String label, String explain) {
+            this.value = value;
+            this.label = label;
+            this.explain = explain;
+        }
+
+        /**
+         * 根据value,获取label
+         */
+        public static String getLabel(int value) {
+            for (TSampleListType c : TSampleListType.values()) {
+                if (c.value == value) {
+                    return c.label;
+                }
+            }
+            return TSampleListType.YH.label;
+        }
+
+        /**
+         * 根据label,获取value
+         */
+        public static int getValue(String label) {
+            for (TableAlias c : TableAlias.values()) {
+                if (StringUtils.equalsIgnoreCase(label, c.label)) {
+                    return c.value;
+                }
+            }
+            return TableAlias.A.value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+
+        public String getexplain() {
+            return explain;
+        }
+    }
+
+
+    /**
+     * 炮孔设计模块业务枚举
+     */
+    public enum TProcessesBlastdesignVolume {
+
+        DESIGN_DATE(1, "DesignDate","设计时间"),
+        STOPE_NAME(2, "StopeName","采区名称"),
+        STEP_NAME(3, "StepName","平台名称"),
+        BLAST_AREA_NAME(4, "BlastAreaName","爆区名称");
+
+        // 成员变量
+        private int value;
+        private String label;
+        private String explain;
+
+        // 构造方法
+        TProcessesBlastdesignVolume(int value, String label, String explain) {
+            this.value = value;
+            this.label = label;
+            this.explain = explain;
+        }
+
+        /**
+         * 根据value,获取label
+         */
+        public static String getLabel(int value) {
+            for (TProcessesBlastdesignVolume c : TProcessesBlastdesignVolume.values()) {
+                if (c.value == value) {
+                    return c.label;
+                }
+            }
+            return TProcessesBlastdesignVolume.DESIGN_DATE.label;
+        }
+
+        /**
+         * 根据value,获取tableAlias
+         */
+        public static String getExplain(int value) {
+            for (TProcessesBlastdesignVolume c : TProcessesBlastdesignVolume.values()) {
+                if (c.value == value) {
+                    return c.explain;
+                }
+            }
+            return TProcessesBlastdesignVolume.DESIGN_DATE.label;
+        }
+
+        /**
+         * 根据label,获取value
+         */
+        public static int getValue(String label) {
+            for (TProcessesBlastdesignVolume c : TProcessesBlastdesignVolume.values()) {
+                if (StringUtils.equalsIgnoreCase(label, c.label)) {
+                    return c.value;
+                }
+            }
+            return TProcessesBlastdesignVolume.DESIGN_DATE.value;
+        }
+
+
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+
+        public String getexplain() {
+            return explain;
+        }
+    }
+
+
+
+    /**
+     * 炮孔设计模块业务枚举
+     */
+    public enum TProcessesBlastdesignHole {
+
+        UID(1, "Uid","炮孔设计id");
+
+        // 成员变量
+        private int value;
+        private String label;
+        private String explain;
+
+        // 构造方法
+        TProcessesBlastdesignHole(int value, String label, String explain) {
+            this.value = value;
+            this.label = label;
+            this.explain = explain;
+        }
+
+        /**
+         * 根据value,获取label
+         */
+        public static String getLabel(int value) {
+            for (TProcessesBlastdesignHole c : TProcessesBlastdesignHole.values()) {
+                if (c.value == value) {
+                    return c.label;
+                }
+            }
+            return TProcessesBlastdesignHole.UID.label;
+        }
+
+        /**
+         * 根据value,获取tableAlias
+         */
+        public static String getExplain(int value) {
+            for (TProcessesBlastdesignHole c : TProcessesBlastdesignHole.values()) {
+                if (c.value == value) {
+                    return c.explain;
+                }
+            }
+            return TProcessesBlastdesignHole.UID.label;
+        }
+
+        /**
+         * 根据label,获取value
+         */
+        public static int getValue(String label) {
+            for (TProcessesBlastdesignHole c : TProcessesBlastdesignHole.values()) {
+                if (StringUtils.equalsIgnoreCase(label, c.label)) {
+                    return c.value;
+                }
+            }
+            return TProcessesBlastdesignHole.UID.value;
+        }
+
+
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+
+        public String getexplain() {
+            return explain;
+        }
+    }
 }

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

+package cn.wise.sc.acquisition.business.mapper;
+
+import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
+import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface TProcessesBlastdesignHoleMapper extends BaseMapper<TProcessesBlastdesignHole> {
+
+    Page<TProcessesBlastdesignHoleVo> getPage(Page<TProcessesBlastdesignHole> page, @Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
+
+}

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

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

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.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.TProcessesBlastdesignHoleMapper">
+
+
+    <!-- 表和实体字段对照关系, 类似RestultMap -->
+    <sql id="TProcessesBlastdesignHoleColumns">
+        a.Uid,
+        a.StopeName,
+        a.StepName,
+        a.BlastAreaName,
+        a.BlastHoleID,
+        a.Depth,
+        a.RowSpace,
+        a.HoleSpace,
+        a.Azimuth,
+        a.Inclination,
+        a.Aperture,
+        a.x,
+        a.y,
+        a.z,
+        a.StepHeight,
+        a.HoleBlastVolume,
+        a.DrillingDate,
+        a.BlastDate
+	</sql>
+
+    <sql id="TProcessesBlastdesignVolumeColumns">
+        b.BlastVolume,
+        b.DesignDate,
+	</sql>
+
+
+    <sql id="TProcessesBlastdesignHoleJoins">
+        left join T_Processes_BlastDesign_Volume b on a.StopeName=b.StopeName and a.StepName=b.StepName and a.BlastAreaName=b.BlastAreaName
+    </sql>
+
+    <!-- 获取所有getPage列表 -->
+    <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
+        SELECT
+        <include refid="TProcessesBlastdesignVolumeColumns"/>
+        <include refid="TProcessesBlastdesignHoleColumns"/>
+        FROM T_Processes_BlastDesign_Hole a
+        <include refid="TProcessesBlastdesignHoleJoins"/>
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignVolumeMapper.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.TProcessesBlastdesignVolumeMapper">
+
+</mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesBlastdesignHoleQuery.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 renchao
+ * @since 2021-04-27
+ */
+@Data
+@ApiModel("爆破设计表")
+public class TProcessesBlastdesignHoleQuery  extends TProcessesBlastdesignVolumeQuery{
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty("ID号")
+    private String Uid;
+
+    /**
+     * 采区名称
+     */
+    @ApiModelProperty("采区名称")
+    private String StopeName;
+
+    /**
+     * 平台名称
+     */
+    @ApiModelProperty("平台名称")
+    private String StepName;
+
+    /**
+     * 爆区名称
+     */
+    @ApiModelProperty("爆区名称")
+    private String BlastAreaName;
+
+    /**
+     * 炮孔编号
+     */
+    @ApiModelProperty("炮孔编号")
+    private String BlastHoleID;
+
+    /**
+     * 孔深（m）
+     */
+    @ApiModelProperty("孔深（m）")
+    private Double Depth;
+
+    /**
+     * 排距（m）
+     */
+    @ApiModelProperty("排距（m）")
+    private Double RowSpace;
+
+    /**
+     * 孔距（m）
+     */
+    @ApiModelProperty("孔距（m）")
+    private Double HoleSpace;
+
+    /**
+     * 方位角
+     */
+    @ApiModelProperty("方位角")
+    private Double Azimuth;
+
+    /**
+     * 倾角
+     */
+    @ApiModelProperty("倾角")
+    private Double Inclination;
+
+    /**
+     * 孔径(m)
+     */
+    @ApiModelProperty("孔径(m)")
+    private Double Aperture;
+
+    /**
+     * 开孔坐标X
+     */
+    @ApiModelProperty("开孔坐标X")
+    private Double x;
+
+    /**
+     * 开孔坐标Y
+     */
+    @ApiModelProperty("开孔坐标Y")
+    private Double y;
+
+    /**
+     * 开孔坐标Z
+     */
+    @ApiModelProperty("开孔坐标Z")
+    private Double z;
+
+    /**
+     * 台阶高度
+     */
+    @ApiModelProperty("台阶高度")
+    private Double StepHeight;
+
+    /**
+     * 单孔爆破量(m3)=孔距*排距*台阶高度
+     */
+    @ApiModelProperty("单孔爆破量(m3)=孔距*排距*台阶高度")
+    private Double HoleBlastVolume;
+
+    /**
+     * 穿孔日期
+     */
+    @ApiModelProperty("穿孔日期")
+    private LocalDateTime DrillingDate;
+
+    /**
+     * 爆破日期
+     */
+    @ApiModelProperty("爆破日期")
+    private LocalDateTime BlastDate;
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesBlastdesignVolumeQuery.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 renchao
+ * @since 2021-04-27
+ */
+@Data
+@ApiModel("设计爆区爆破量")
+public class TProcessesBlastdesignVolumeQuery {
+
+
+    /**
+     * 采区名称
+     */
+    @ApiModelProperty("采区名称")
+    private String StopeName;
+
+    /**
+     * 平台名称
+     */
+    @ApiModelProperty("平台名称")
+    private String StepName;
+
+    /**
+     * 爆区名称
+     */
+    @ApiModelProperty("爆区名称")
+    private String BlastAreaName;
+
+    /**
+     * 设计爆区爆破量(m3)
+     */
+    @ApiModelProperty("设计爆区爆破量(m3)")
+    private Double BlastVolume;
+
+    /**
+     * 设计日期
+     */
+    @ApiModelProperty("设计日期")
+    private LocalDateTime DesignDate;
+
+
+}

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

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @ApiModel("样品化验单query")
-public class TSampleLaboratorysheetQuery implements Serializable {
+public class TSampleLaboratorysheetQuery {
 
 
     /**

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

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @ApiModel("送样单query")
-public class TSampleListQuery implements Serializable {
+public class TSampleListQuery  {
 
     /**
      * 搜索字段

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesBlastdesignHoleResultVo.java

+package cn.wise.sc.acquisition.business.model.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Data
+public class TProcessesBlastdesignHoleResultVo<T> {
+
+    /**
+     * 设计孔深合计
+     */
+    private Integer depthCount;
+
+    /**
+     * 分页返回数据
+     */
+    private Page<T> data;
+
+
+    public TProcessesBlastdesignHoleResultVo() {
+
+    }
+
+    public TProcessesBlastdesignHoleResultVo(Page<T> data, Integer depthCount) {
+        this.depthCount = depthCount;
+        this.data = data;
+    }
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesBlastdesignHoleVo.java

+package cn.wise.sc.acquisition.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+/**
+ * T_Processes_BlastDesign_Hole（爆破设计表）
+ * 与 T_Processes_BlastDesign_Volume（设计爆区爆破量） 属性合并返回实体
+ */
+@Data
+@ApiModel("爆破设计表")
+public class TProcessesBlastdesignHoleVo extends TProcessesBlastdesignVolumeVo {
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty("ID号")
+    private String Uid;
+
+    /**
+     * 采区名称
+     */
+    @ApiModelProperty("采区名称")
+    private String StopeName;
+
+    /**
+     * 平台名称
+     */
+    @ApiModelProperty("平台名称")
+    private String StepName;
+
+    /**
+     * 爆区名称
+     */
+    @ApiModelProperty("爆区名称")
+    private String BlastAreaName;
+
+    /**
+     * 炮孔编号
+     */
+    @ApiModelProperty("炮孔编号")
+    private String BlastHoleID;
+
+    /**
+     * 孔深（m）
+     */
+    @ApiModelProperty("孔深（m）")
+    private Double Depth;
+
+    /**
+     * 排距（m）
+     */
+    @ApiModelProperty("排距（m）")
+    private Double RowSpace;
+
+    /**
+     * 孔距（m）
+     */
+    @ApiModelProperty("孔距（m）")
+    private Double HoleSpace;
+
+    /**
+     * 方位角
+     */
+    @ApiModelProperty("方位角")
+    private Double Azimuth;
+
+    /**
+     * 倾角
+     */
+    @ApiModelProperty("倾角")
+    private Double Inclination;
+
+    /**
+     * 孔径(m)
+     */
+    @ApiModelProperty("孔径(m)")
+    private Double Aperture;
+
+    /**
+     * 开孔坐标X
+     */
+    @ApiModelProperty("开孔坐标X")
+    private Double x;
+
+    /**
+     * 开孔坐标Y
+     */
+    @ApiModelProperty("开孔坐标Y")
+    private Double y;
+
+    /**
+     * 开孔坐标Z
+     */
+    @ApiModelProperty("开孔坐标Z")
+    private Double z;
+
+    /**
+     * 台阶高度
+     */
+    @ApiModelProperty("台阶高度")
+    private Double StepHeight;
+
+    /**
+     * 单孔爆破量(m3)=孔距*排距*台阶高度
+     */
+    @ApiModelProperty("单孔爆破量(m3)=孔距*排距*台阶高度")
+    private Double HoleBlastVolume;
+
+    /**
+     * 穿孔日期
+     */
+    @ApiModelProperty("穿孔日期")
+    private LocalDateTime DrillingDate;
+
+    /**
+     * 爆破日期
+     */
+    @ApiModelProperty("爆破日期")
+    private LocalDateTime BlastDate;
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesBlastdesignVolumeVo.java

+package cn.wise.sc.acquisition.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Data
+@ApiModel("设计爆区爆破量")
+public class TProcessesBlastdesignVolumeVo {
+
+
+    /**
+     * 采区名称
+     */
+    @ApiModelProperty("采区名称")
+    private String StopeName;
+
+    /**
+     * 平台名称
+     */
+    @ApiModelProperty("平台名称")
+    private String StepName;
+
+    /**
+     * 爆区名称
+     */
+    @ApiModelProperty("爆区名称")
+    private String BlastAreaName;
+
+    /**
+     * 设计爆区爆破量(m3)
+     */
+    @ApiModelProperty("设计爆区爆破量(m3)")
+    private Double BlastVolume;
+
+    /**
+     * 设计日期
+     */
+    @ApiModelProperty("设计日期")
+    private LocalDateTime DesignDate;
+
+}

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

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
+import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface ITProcessesBlastdesignHoleService extends IService<TProcessesBlastdesignHole> {
+
+    R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query);
+
+    R updateByUid(TProcessesBlastdesignHoleQuery query);
+
+    R deleteByUid(TProcessesBlastdesignHoleQuery query);
+
+    R insertTProcessesBlastdesignHole(TProcessesBlastdesignHoleQuery query);
+
+    R getByUid(TProcessesBlastdesignHoleQuery query);
+}

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

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignVolume;
+import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+public interface ITProcessesBlastdesignVolumeService extends IService<TProcessesBlastdesignVolume> {
+
+    R getPage(TProcessesBlastdesignVolumeQuery tProcessesBlastdesignHoleQuery, Query query);
+
+    R updateByQuery(TProcessesBlastdesignVolumeQuery query);
+    
+    R getByQuery(TProcessesBlastdesignVolumeQuery query);
+
+}

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

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
+import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
+import cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignHoleMapper;
+import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery;
+import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleResultVo;
+import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo;
+import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
+import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignVolumeService;
+import cn.wise.sc.acquisition.business.util.DateUtil;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Calendar;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Slf4j
+@Service
+public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcessesBlastdesignHoleMapper, TProcessesBlastdesignHole> implements ITProcessesBlastdesignHoleService {
+
+    @Autowired
+    ITProcessesBlastdesignVolumeService itProcessesBlastdesignVolumeService;
+
+    @Override
+    public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) {
+        log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery));
+        //参数校验
+        //分页
+        Page<TProcessesBlastdesignHole> page = new Page<>(query.getPageNum(), query.getPageSize());
+        //条件封装
+        QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
+        //如果设计时间不为空 因为涉及到表连接，需要创建字段别名
+        if (tProcessesBlastdesignHoleQuery.getDesignDate() != null) {
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append(ProjectEnum.TableAlias.B.getLabel()).append(ProjectEnum.TProcessesBlastdesignVolume.DESIGN_DATE.getLabel());
+            //前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
+            queryWrapper
+                    .ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(tProcessesBlastdesignHoleQuery.getDesignDate()))
+                    .le(stringBuilder.toString(), DateUtil.getEndTimeStr(tProcessesBlastdesignHoleQuery.getDesignDate()));
+        }
+        //查询
+        Page<TProcessesBlastdesignHoleVo> tSampleListPage = baseMapper.getPage(page, queryWrapper);
+        return R.ok(tSampleListPage);
+    }
+
+    @Override
+    public R updateByUid(TProcessesBlastdesignHoleQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
+        //判断数据是否存在
+        TProcessesBlastdesignHole temp = baseMapper.selectById(query.getUid());
+        if (temp == null) {
+            return R.failed("数据不存在，uid：" + query.getUid());
+        }
+        //判断是否需要修改关联的 设计爆区爆破量
+        if (StringUtils.isNotBlank(query.getStepName())
+                && StringUtils.isNotBlank(query.getBlastAreaName())
+                && StringUtils.isNotBlank(query.getStopeName())) {
+            //判断设计爆区爆破量是否存在数据 不存在不能修改
+            TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery = new TProcessesBlastdesignHoleQuery();
+            BeanUtils.copyProperties(query, tProcessesBlastdesignVolumeQuery);
+            R volume = itProcessesBlastdesignVolumeService.getByQuery(tProcessesBlastdesignVolumeQuery);
+            if (volume.getData() == null) {
+                return R.failed("设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
+            }
+        }
+
+        //条件封装
+        TProcessesBlastdesignHole tProcessesBlastdesignHole = new TProcessesBlastdesignHole();
+        BeanUtils.copyProperties(query, tProcessesBlastdesignHole);
+
+        QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel(), query.getUid());
+        //修改
+        int update = baseMapper.update(tProcessesBlastdesignHole, queryWrapper);
+        if (update > 0) {
+            return R.ok("修改成功");
+        } else {
+            log.info(JSON.toJSONString(tProcessesBlastdesignHole));
+            return R.failed("修改失败");
+        }
+    }
+
+    @Override
+    public R deleteByUid(TProcessesBlastdesignHoleQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
+        TProcessesBlastdesignHole temp = baseMapper.selectById(query.getUid());
+        if (temp == null) {
+            return R.failed("数据不存在，uid：" + query.getUid());
+        }
+        //删除
+        int delete = baseMapper.delete(new QueryWrapper<TProcessesBlastdesignHole>().eq(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel(), query.getUid()));
+        if (delete > 0) {
+            return R.ok("删除成功");
+        } else {
+            return R.failed("删除失败");
+        }
+
+    }
+
+    @Override
+    public R insertTProcessesBlastdesignHole(TProcessesBlastdesignHoleQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotEmpty(query.getStopeName());
+        Rcode.NOT_PARAM.assertNotEmpty(query.getStepName());
+        Rcode.NOT_PARAM.assertNotEmpty(query.getBlastAreaName());
+        Rcode.NOT_PARAM.assertNotEmpty(query.getBlastHoleID());
+        Rcode.NOT_PARAM.assertNotNull(query.getDepth());
+        Rcode.NOT_PARAM.assertNotNull(query.getRowSpace());
+        Rcode.NOT_PARAM.assertNotNull(query.getHoleSpace());
+        Rcode.NOT_PARAM.assertNotNull(query.getAzimuth());
+        Rcode.NOT_PARAM.assertNotNull(query.getInclination());
+        Rcode.NOT_PARAM.assertNotNull(query.getAperture());
+        Rcode.NOT_PARAM.assertNotNull(query.getStepHeight());
+        Rcode.NOT_PARAM.assertNotNull(query.getX());
+        Rcode.NOT_PARAM.assertNotNull(query.getY());
+        Rcode.NOT_PARAM.assertNotNull(query.getZ());
+        Rcode.NOT_PARAM.assertNotNull(query.getDrillingDate());
+        //uid自动生成 不能手动设置
+        if (query.getUid() != null) {
+            return R.failed("uid自动生成 不能手动设置");
+        }
+        //查看设计爆区爆破量是否存在数据
+        TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery = new TProcessesBlastdesignHoleQuery();
+        BeanUtils.copyProperties(query, tProcessesBlastdesignVolumeQuery);
+        R volume = itProcessesBlastdesignVolumeService.getByQuery(tProcessesBlastdesignVolumeQuery);
+        if (volume.getData() == null) {
+            return R.failed("设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
+        }
+
+        //条件封装
+        TProcessesBlastdesignHole tProcessesBlastdesignHole = new TProcessesBlastdesignHole();
+        BeanUtils.copyProperties(query, tProcessesBlastdesignHole);
+
+        //增加
+        log.info(JSON.toJSONString(tProcessesBlastdesignHole));
+        int insert = baseMapper.insert(tProcessesBlastdesignHole);
+        if (insert > 0) {
+            return R.ok("增加成功");
+        } else {
+            log.info(JSON.toJSONString(tProcessesBlastdesignHole));
+            return R.failed("增加失败");
+        }
+    }
+
+    @Override
+    public R getByUid(TProcessesBlastdesignHoleQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
+        //查询并且返回
+        return R.ok(baseMapper.selectById(query.getUid()));
+    }
+}

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

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignVolume;
+import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
+import cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignVolumeMapper;
+import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery;
+import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignVolumeService;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-04-27
+ */
+@Service
+@Slf4j
+public class TProcessesBlastdesignVolumeServiceImpl extends ServiceImpl<TProcessesBlastdesignVolumeMapper, TProcessesBlastdesignVolume> implements ITProcessesBlastdesignVolumeService {
+
+    @Override
+    public R getPage(TProcessesBlastdesignVolumeQuery tProcessesBlastdesignHoleQuery, Query query) {
+        log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery));
+        //参数校验
+        //分页
+        Page<TProcessesBlastdesignVolume> page = new Page<>(query.getPageNum(), query.getPageSize());
+        //条件封装
+        QueryWrapper<TProcessesBlastdesignVolume> queryWrapper = new QueryWrapper<>();
+        //暂时没有添加的筛选条件
+        //查询
+        Page<TProcessesBlastdesignVolume> tProcessesBlastdesignVolumePage = baseMapper.selectPage(page, queryWrapper);
+        return R.ok(tProcessesBlastdesignVolumePage);
+    }
+
+    @Override
+    public R updateByQuery(TProcessesBlastdesignVolumeQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotEmpty(query.getStopeName());
+        Rcode.NOT_PARAM.assertNotEmpty(query.getStepName());
+        Rcode.NOT_PARAM.assertNotEmpty(query.getBlastAreaName());
+        //判断数据是否存在
+        R volume = getByQuery(query);
+        if (volume.getData() == null) {
+            return R.failed("设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
+        }
+        //条件封装
+        TProcessesBlastdesignVolume tProcessesBlastdesignVolume = new TProcessesBlastdesignVolume();
+        BeanUtils.copyProperties(query, tProcessesBlastdesignVolume);
+
+        QueryWrapper<TProcessesBlastdesignVolume> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ProjectEnum.TProcessesBlastdesignVolume.STOPE_NAME.getLabel(),query.getStopeName())
+                .eq(ProjectEnum.TProcessesBlastdesignVolume.STEP_NAME.getLabel(),query.getStepName())
+                .eq(ProjectEnum.TProcessesBlastdesignVolume.BLAST_AREA_NAME.getLabel(),query.getBlastAreaName());
+        //修改
+        int update = baseMapper.update(tProcessesBlastdesignVolume, queryWrapper);
+        if (update > 0) {
+            return R.ok("修改成功");
+        } else {
+            log.info(JSON.toJSONString(tProcessesBlastdesignVolume));
+            return R.failed("修改失败");
+        }
+    }
+
+    @Override
+    public R getByQuery(TProcessesBlastdesignVolumeQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotEmpty(query.getStopeName());
+        Rcode.NOT_PARAM.assertNotEmpty(query.getStepName());
+        Rcode.NOT_PARAM.assertNotEmpty(query.getBlastAreaName());
+        //封装
+        QueryWrapper<TProcessesBlastdesignVolume> queryWrapper = new QueryWrapper<>();
+        queryWrapper
+                .eq(ProjectEnum.TProcessesBlastdesignVolume.STOPE_NAME.getLabel(),query.getStopeName())
+                .eq(ProjectEnum.TProcessesBlastdesignVolume.STEP_NAME.getLabel(),query.getStepName())
+                .eq(ProjectEnum.TProcessesBlastdesignVolume.BLAST_AREA_NAME.getLabel(),query.getBlastAreaName());
+        //查询并且返回
+        return R.ok(baseMapper.selectOne(queryWrapper));
+    }
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/DateUtil.java

 package cn.wise.sc.acquisition.business.util;
 
+import org.apache.commons.lang3.StringUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.WeekFields;
 import java.util.Date;
+import java.util.TimeZone;
 
 /**
  * @author neo.shu
@@ -11,6 +19,12 @@ import java.util.Date;
 
 public class DateUtil {
 
+    public static final String FORMAT_TO_DAY = "yyyy-MM-dd";
+
+    public static final String FORMAT_TO_SECOND = "yyyy-MM-dd HH:mm:ss";
+
+    private static final int ONE = 1;
+
     /**
      * 获取自然周数
      *
@@ -42,4 +56,122 @@ public class DateUtil {
 
         return rts;
     }
+
+
+    /**
+     * 获取今天  例如参数为 2021-04-05 17:37:33  返回 2021-04-05 00.00.00
+     *
+     * @param localDateTime
+     * @return
+     */
+    public static LocalDateTime getToday(LocalDateTime localDateTime, String format) {
+        return formatDateToDay(localDateTime, format);
+    }
+
+
+    /**
+     * 获取今天 返回String  例如参数为 2021-04-05 17:37:33  返回 2021-04-05 00.00.00
+     *
+     * @param localDateTime
+     * @return
+     */
+    public static String getTodayStr(LocalDateTime localDateTime, String format) {
+        return formatDateToStr(localDateTime, format);
+    }
+
+    /**
+     * 获取下一天  例如参数为 2021-04-05 17:37:33  返回 2021-04-06 00.00.00
+     *
+     * @param localDateTime
+     * @return
+     */
+    public static LocalDateTime getTomorrow(LocalDateTime localDateTime, String format) {
+        return formatDateToDay(localDateTime.plusDays(ONE), format);
+    }
+
+
+    /**
+     * 获取下一天  返回String 例如参数为 2021-04-05 17:37:33  返回 2021-04-06 00.00.00
+     *
+     * @param localDateTime
+     * @return
+     */
+    public static String getTomorrowStr(LocalDateTime localDateTime, String format) {
+        return formatDateToStr(localDateTime.plusDays(ONE), format);
+    }
+
+
+    /**
+     * 按照参数格式化时间
+     *
+     * @param localDateTime
+     * @return
+     */
+    private static LocalDateTime formatDateToDay(LocalDateTime localDateTime, String format) {
+        if (localDateTime == null) throw new RuntimeException("formatDate method:LocalDateTime localDateTime is null");
+        if (StringUtils.isBlank(format)) throw new RuntimeException("formatDate method:String format is null");
+
+        DateTimeFormatter sdf = DateTimeFormatter.ofPattern(format);
+        String date = sdf.format(localDateTime);
+        return LocalDateTime.parse(date);
+    }
+
+
+    /**
+     * 按照参数格式化时间
+     *
+     * @param localDateTime
+     * @return
+     */
+    private static String formatDateToStr(LocalDateTime localDateTime, String format) {
+        if (localDateTime == null) throw new RuntimeException("formatDate method:LocalDateTime localDateTime is null");
+        if (StringUtils.isBlank(format)) throw new RuntimeException("formatDate method:String format is null");
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        return sdf.format(localDateTime);
+    }
+
+
+    /**
+     * 获取今天的最后一刻
+     */
+    public static String getEndTimeStr(LocalDateTime localDateTime) {
+        LocalDateTime endT = getEndTime(localDateTime);//今天23点59分59秒的毫秒数
+        String date = DateTimeFormatter.ofPattern(FORMAT_TO_SECOND).format(endT);
+        return date;
+    }
+
+    /**
+     * 获取今天的最后一刻
+     */
+    public static LocalDateTime getEndTime(LocalDateTime localDateTime) {
+        if (localDateTime == null) throw new RuntimeException("getEndTime method:LocalDateTime localDateTime is null");
+        LocalDateTime endT = LocalDateTime.of(localDateTime.toLocalDate(), LocalTime.MAX);//今天23点59分59秒的毫秒数
+        return endT;
+    }
+
+
+    /**
+     * 获取今天的00时刻
+     */
+    public static String getBeginTimeStr(LocalDateTime localDateTime) {
+        LocalDateTime zeroT = getBeginTime(localDateTime);//今天零点零分零秒的毫秒数
+        String date = DateTimeFormatter.ofPattern(FORMAT_TO_SECOND).format(zeroT);
+        return date;
+    }
+
+
+    /**
+     * 获取今天的00一刻
+     */
+    public static LocalDateTime getBeginTime(LocalDateTime localDateTime) {
+        if (localDateTime == null) throw new RuntimeException("getEndTime method:LocalDateTime localDateTime is null");
+        LocalDateTime endT = LocalDateTime.of(localDateTime.toLocalDate(), LocalTime.MIN);//今天23点59分59秒的毫秒数
+        return endT;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(getBeginTimeStr(LocalDateTime.now()));
+        System.out.println(getEndTimeStr(LocalDateTime.now()));
+    }
+
 }

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/DataStatisticsMapper.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.DataStatisticsMapper">
+
+    <select id="countByPhoto" resultType="cn.wise.sc.acquisition.business.model.vo.DataStatisticsVo">
+        SELECT tw.Rq as name, SUM(tw.Jz) as value
+        FROM T_Weight tw
+        where 1=1
+        <if test="params.cycle == 1 ">
+            and datediff(week, tw.Rq,getdate())=0
+        </if>
+        <if test="params.cycle == 2 ">
+            and datediff(month, tw.Rq,getdate())=0
+        </if>
+        <if test="params.cycle = 3 ">
+            and datediff(quarter, tw.Rq,getdate())=0
+        </if>
+        <if test="params.cycle = 4 ">
+            and  datediff(year, tw.Rq,getdate())=0
+        </if>
+        <if test="params.startDate != null and params.startDate != ''">
+            and tw.Rq >  &gt;= #{params.startDate}
+        </if>
+        <if test="params.endDate != null and params.endDate != ''">
+            and tw.Rq >  &lt;= #{params.endDate}
+        </if>
+        <if test="params.startDate == null and params.endDate == null">
+            and datediff(week, tw.Rq,getdate())=0
+        </if>
+        group by tw.Rq
+    </select>
+
+
+    <select id="countByTable" resultType="cn.wise.sc.acquisition.business.model.vo.DataStatisticsTableVo">
+        SELECT  tw.Uid,tw.Rq,tw.Sj,tw.TruckID,'发货单位' as clientName,tpt.WorkType,tw.Mz,tw.Pz,tw.Jz
+        FROM T_Weight tw
+        left join T_Processes_Truck tpt on tpt.TruckID = tw.TruckID
+        where 1=1
+        <if test="params.cycle == 1 ">
+            and datediff(week, tw.Rq,getdate())=0
+        </if>
+        <if test="params.cycle == 2 ">
+            and datediff(month, tw.Rq,getdate())=0
+        </if>
+        <if test="params.cycle = 3 ">
+            and datediff(quarter, tw.Rq,getdate())=0
+        </if>
+        <if test="params.cycle = 4 ">
+            and  datediff(year, tw.Rq,getdate())=0
+        </if>
+        <if test="params.startDate != null and params.startDate != ''">
+            and tw.Rq >  &gt;= #{params.startDate}
+        </if>
+        <if test="params.endDate != null and params.endDate != ''">
+            and tw.Rq >  &lt;= #{params.endDate}
+        </if>
+        <if test="params.startDate == null and params.endDate == null">
+            and datediff(week, tw.Rq,getdate())=0
+        </if>
+    </select>
+
+
+
+
+
+
+
+
+
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckMapper.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.TEquipmentCheckMapper">
+
+    <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo">
+       select tea.EquipmentID,tea.EquipmentName,
+        tec.Uid,tec.Djbw,tec.Djnr,tec.Djbz,tec.Djzq,tec.Zqlx,tec.Djjg,tec.Ycjl,tec.Djr,tec.Djrq
+        from T_Equipment_Account tea
+        left join T_Equipment_Check tec on tec.EquipmentID = tea.EquipmentID
+        <include refid="where"/>
+        order by tea.Ccrq desc
+    </select>
+    <sql id="where">
+        <where>
+            <if test="params.Djr != null and params.Djr != ''">
+                and tec.Djr = #{params.Djr}
+            </if>
+            <if test="params.EquipmentName != null and params.EquipmentName != ''">
+                and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
+            </if>
+        </where>
+    </sql>
+
+
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TEquipmentRunMapper.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.TEquipmentRunMapper">
+
+    <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentRunVo">
+        select tea.EquipmentID,tea.EquipmentName,
+        ter.Uid,ter.RunDate,ter.RunHour,ter.StopHour,ter.StopType,ter.Driver,ter.Txr,ter.Tag
+        from T_Equipment_Account tea
+        left join T_Equipment_Run ter on ter.EquipmentID = tea.EquipmentID
+        <include refid="where"/>
+        order by tea.Ccrq desc
+    </select>
+
+    <sql id="where">
+        <where>
+            <if test="params.Txr != null and params.Txr != ''">
+                and ter.Txr = #{params.Txr}
+            </if>
+            <if test="params.EquipmentName != null and params.EquipmentName != ''">
+                and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
+            </if>
+        </where>
+    </sql>
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TEquipmentTroubleMapper.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.TEquipmentTroubleMapper">
+
+    <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo">
+        select tea.EquipmentID,tea.EquipmentName,
+        tet.Uid,tet.Fxr,tet.Fxrq,tet.Yhms,tet.Clcs,tet.Clrq,tet.clr,tet.Txr,tet.Txrq,tet.Clzt
+        from T_Equipment_Account tea
+        left join T_Equipment_Trouble tet on tet.EquipmentID = tea.EquipmentID
+        <include refid="where"/>
+        order by tea.Ccrq desc
+    </select>
+    <sql id="where">
+        <where>
+            <if test="params.Txr != null and params.Txr != ''">
+                and tet.Txr = #{params.Txr}
+            </if>
+            <if test="params.EquipmentName != null and params.EquipmentName != ''">
+                and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
+            </if>
+        </where>
+    </sql>
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.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.TProcessesBlastdesignHoleMapper">
+
+
+    <!-- 表和实体字段对照关系, 类似RestultMap -->
+    <sql id="TProcessesBlastdesignHoleColumns">
+        a.Uid,
+        a.StopeName,
+        a.StepName,
+        a.BlastAreaName,
+        a.BlastHoleID,
+        a.Depth,
+        a.RowSpace,
+        a.HoleSpace,
+        a.Azimuth,
+        a.Inclination,
+        a.Aperture,
+        a.x,
+        a.y,
+        a.z,
+        a.StepHeight,
+        a.HoleBlastVolume,
+        a.DrillingDate,
+        a.BlastDate
+	</sql>
+
+    <sql id="TProcessesBlastdesignVolumeColumns">
+        b.BlastVolume,
+        b.DesignDate,
+	</sql>
+
+
+    <sql id="TProcessesBlastdesignHoleJoins">
+        left join T_Processes_BlastDesign_Volume b on a.StopeName=b.StopeName and a.StepName=b.StepName and a.BlastAreaName=b.BlastAreaName
+    </sql>
+
+    <!-- 获取所有getPage列表 -->
+    <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
+        SELECT
+        <include refid="TProcessesBlastdesignVolumeColumns"/>
+        <include refid="TProcessesBlastdesignHoleColumns"/>
+        FROM T_Processes_BlastDesign_Hole a
+        <include refid="TProcessesBlastdesignHoleJoins"/>
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignVolumeMapper.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.TProcessesBlastdesignVolumeMapper">
+
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesTruckMapper.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.TProcessesTruckMapper">
+
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TWeightMapper.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.TWeightMapper">
+
+</mapper>