Kaynağa Gözat

筹建+工器具

hfxc226 2 yıl önce
ebeveyn
işleme
dbd7b5986e
27 değiştirilmiş dosya ile 2673 ekleme ve 0 silme
  1. 168 0
      platform-dao/src/main/java/com/platform/dao/dto/preparation/PreparationDTO.java
  2. 159 0
      platform-dao/src/main/java/com/platform/dao/dto/tool/ToolDTO.java
  3. 110 0
      platform-dao/src/main/java/com/platform/dao/dto/tool/ToolLogDTO.java
  4. 123 0
      platform-dao/src/main/java/com/platform/dao/entity/preparation/Preparation.java
  5. 122 0
      platform-dao/src/main/java/com/platform/dao/entity/tool/Tool.java
  6. 89 0
      platform-dao/src/main/java/com/platform/dao/entity/tool/ToolLog.java
  7. 26 0
      platform-dao/src/main/java/com/platform/dao/mapper/preparation/PreparationMapper.java
  8. 26 0
      platform-dao/src/main/java/com/platform/dao/mapper/tool/ToolLogMapper.java
  9. 26 0
      platform-dao/src/main/java/com/platform/dao/mapper/tool/ToolMapper.java
  10. 155 0
      platform-dao/src/main/java/com/platform/dao/vo/export/preparation/ExportPreparationVO.java
  11. 105 0
      platform-dao/src/main/java/com/platform/dao/vo/export/tool/ExportToolLogVO.java
  12. 154 0
      platform-dao/src/main/java/com/platform/dao/vo/export/tool/ExportToolVO.java
  13. 118 0
      platform-dao/src/main/java/com/platform/dao/vo/query/preparation/PreparationVO.java
  14. 84 0
      platform-dao/src/main/java/com/platform/dao/vo/query/tool/ToolLogVO.java
  15. 117 0
      platform-dao/src/main/java/com/platform/dao/vo/query/tool/ToolVO.java
  16. 159 0
      platform-dao/src/main/resources/mapper/preparation/PreparationMapper.xml
  17. 101 0
      platform-dao/src/main/resources/mapper/tool/ToolLogMapper.xml
  18. 153 0
      platform-dao/src/main/resources/mapper/tool/ToolMapper.xml
  19. 141 0
      platform-rest/src/main/java/com/platform/rest/controller/preparation/PreparationController.java
  20. 141 0
      platform-rest/src/main/java/com/platform/rest/controller/tool/ToolController.java
  21. 141 0
      platform-rest/src/main/java/com/platform/rest/controller/tool/ToolLogController.java
  22. 35 0
      platform-service/src/main/java/com/platform/service/preparation/PreparationService.java
  23. 50 0
      platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java
  24. 35 0
      platform-service/src/main/java/com/platform/service/tool/ToolLogService.java
  25. 35 0
      platform-service/src/main/java/com/platform/service/tool/ToolService.java
  26. 50 0
      platform-service/src/main/java/com/platform/service/tool/impl/ToolLogServiceImpl.java
  27. 50 0
      platform-service/src/main/java/com/platform/service/tool/impl/ToolServiceImpl.java

+ 168 - 0
platform-dao/src/main/java/com/platform/dao/dto/preparation/PreparationDTO.java

@@ -0,0 +1,168 @@
+package com.platform.dao.dto.preparation;
+
+import com.platform.common.bean.BaseDTO;
+import com.platform.common.validation.group.UpdateGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.math.BigDecimal;
+
+/**
+ * @Description 筹建管理DTO
+ * @Author xc
+ * @Date 2022-12-28 20:00:26
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class PreparationDTO extends BaseDTO implements Serializable {
+
+      /**
+     * 主键
+     */
+        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
+    private String id;
+          /**
+     * 设备型号
+     */
+          private String positionId;
+          /**
+     * 申请人id
+     */
+          private String userId;
+          /**
+     * 申请部门
+     */
+          private String departId;
+          /**
+     * 报修时间
+     */
+        private LocalDateTime applyTime;
+      /**
+       * 报修时间开始
+       */
+      private LocalDateTime applyTimeStart;
+      /**
+       * 报修时间结束
+       */
+      private LocalDateTime applyTimeEnd;
+          /**
+     * 问题描述
+     */
+          private String content;
+          /**
+     * 报修状态:0:草稿 1-待分配 2-已分配 3-已完成 4-已撤销
+            
+     */
+          private Integer status;
+          /**
+     * 备注
+     */
+          private String remark;
+          /**
+     * 创建日期
+     */
+        private LocalDateTime createdTime;
+      /**
+       * 创建日期开始
+       */
+      private LocalDateTime createdTimeStart;
+      /**
+       * 创建日期结束
+       */
+      private LocalDateTime createdTimeEnd;
+          /**
+     * 更新日期
+     */
+        private LocalDateTime updateTime;
+      /**
+       * 更新日期开始
+       */
+      private LocalDateTime updateTimeStart;
+      /**
+       * 更新日期结束
+       */
+      private LocalDateTime updateTimeEnd;
+          /**
+     * 创建人
+     */
+          private String createdUserId;
+          /**
+     * 创建人名称
+     */
+          private String createdUserName;
+          /**
+     * 更新人
+     */
+          private String updateUserId;
+          /**
+     * 更新人名称
+     */
+          private String updateUserName;
+          /**
+     * 维修开始时间
+     */
+        private LocalDateTime repairStartTime;
+      /**
+       * 维修开始时间开始
+       */
+      private LocalDateTime repairStartTimeStart;
+      /**
+       * 维修开始时间结束
+       */
+      private LocalDateTime repairStartTimeEnd;
+          /**
+     * 维修结束时间
+     */
+        private LocalDateTime repairEndTime;
+      /**
+       * 维修结束时间开始
+       */
+      private LocalDateTime repairEndTimeStart;
+      /**
+       * 维修结束时间结束
+       */
+      private LocalDateTime repairEndTimeEnd;
+          /**
+     * 维修耗时
+     */
+          private Double repairMinutes;
+          /**
+     * 维修人员id
+     */
+          private String repairUserId;
+          /**
+     * 维修描述
+     */
+          private String repairContent;
+          /**
+     * 要求完成日期
+     */
+        private LocalDate limitHours;
+      /**
+       * 要求完成日期开始
+       */
+      private LocalDate limitHoursStart;
+      /**
+       * 要求完成日期结束
+       */
+      private LocalDate limitHoursEnd;
+          /**
+     * 费用预算
+     */
+          private BigDecimal fee;
+          /**
+     * 预算明细表
+     */
+          private String feeFile;
+        /**
+     * 关键字
+     */
+  private String keyword;
+
+}

+ 159 - 0
platform-dao/src/main/java/com/platform/dao/dto/tool/ToolDTO.java

@@ -0,0 +1,159 @@
+package com.platform.dao.dto.tool;
+
+import com.platform.common.bean.BaseDTO;
+import com.platform.common.validation.group.UpdateGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.math.BigDecimal;
+
+/**
+ * @Description 工器具管理DTO
+ * @Author xc
+ * @Date 2022-12-28 20:00:49
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class ToolDTO extends BaseDTO implements Serializable {
+
+      /**
+     * 主键
+     */
+        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
+    private String id;
+          /**
+     * 工器具名称
+     */
+          private String name;
+          /**
+     * 工器具型号
+     */
+          private String ggxh;
+          /**
+     * 编号
+     */
+        private LocalDateTime no;
+      /**
+       * 编号开始
+       */
+      private LocalDateTime noStart;
+      /**
+       * 编号结束
+       */
+      private LocalDateTime noEnd;
+          /**
+     * 数量
+     */
+          private Integer num;
+          /**
+     * 负责人
+     */
+          private String checkUserId;
+          /**
+     * 生产厂家
+     */
+          private String producer;
+          /**
+     * 是否合格:0否,1是
+     */
+          private String hgFlag;
+          /**
+     * 是否需要检验:0否,1是
+     */
+          private Integer checkFlag;
+          /**
+     * 检测内容
+     */
+        private LocalDateTime content;
+      /**
+       * 检测内容开始
+       */
+      private LocalDateTime contentStart;
+      /**
+       * 检测内容结束
+       */
+      private LocalDateTime contentEnd;
+          /**
+     * 备注
+     */
+          private String remark;
+          /**
+     * 创建日期
+     */
+        private LocalDateTime createdTime;
+      /**
+       * 创建日期开始
+       */
+      private LocalDateTime createdTimeStart;
+      /**
+       * 创建日期结束
+       */
+      private LocalDateTime createdTimeEnd;
+          /**
+     * 更新日期
+     */
+        private LocalDateTime updateTime;
+      /**
+       * 更新日期开始
+       */
+      private LocalDateTime updateTimeStart;
+      /**
+       * 更新日期结束
+       */
+      private LocalDateTime updateTimeEnd;
+          /**
+     * 创建人
+     */
+          private String createdUserId;
+          /**
+     * 创建人名称
+     */
+          private String createdUserName;
+          /**
+     * 更新人
+     */
+          private String updateUserId;
+          /**
+     * 更新人名称
+     */
+          private String updateUserName;
+          /**
+     * 存放地点
+     */
+          private String position;
+          /**
+     * 检测日期
+     */
+          private String checkDate;
+          /**
+     * 下次检测日期
+     */
+        private LocalDate nextCheckDate;
+      /**
+       * 下次检测日期开始
+       */
+      private LocalDate nextCheckDateStart;
+      /**
+       * 下次检测日期结束
+       */
+      private LocalDate nextCheckDateEnd;
+          /**
+     * 检测周期
+     */
+          private BigDecimal period;
+          /**
+     * 预警天数
+     */
+          private Integer warnDay;
+        /**
+     * 关键字
+     */
+  private String keyword;
+
+}

+ 110 - 0
platform-dao/src/main/java/com/platform/dao/dto/tool/ToolLogDTO.java

@@ -0,0 +1,110 @@
+package com.platform.dao.dto.tool;
+
+import com.platform.common.bean.BaseDTO;
+import com.platform.common.validation.group.UpdateGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 工器具检定记录DTO
+ * @Author xc
+ * @Date 2022-12-28 20:01:22
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class ToolLogDTO extends BaseDTO implements Serializable {
+
+      /**
+     * 主键
+     */
+        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
+    private String id;
+          /**
+     * 检验人
+     */
+          private String checkUserId;
+          /**
+     * 检验说明
+     */
+          private String requirement;
+          /**
+     * 备注
+     */
+          private String remark;
+          /**
+     * 创建人
+     */
+          private String createdUserId;
+          /**
+     * 更新人
+     */
+          private String updateUserId;
+          /**
+     * 创建人名称
+     */
+          private String createdUserName;
+          /**
+     * 更新人名称
+     */
+          private String updateUserName;
+          /**
+     * 创建时间
+     */
+        private LocalDateTime createdTime;
+      /**
+       * 创建时间开始
+       */
+      private LocalDateTime createdTimeStart;
+      /**
+       * 创建时间结束
+       */
+      private LocalDateTime createdTimeEnd;
+          /**
+     * 更新时间
+     */
+        private LocalDateTime updateTime;
+      /**
+       * 更新时间开始
+       */
+      private LocalDateTime updateTimeStart;
+      /**
+       * 更新时间结束
+       */
+      private LocalDateTime updateTimeEnd;
+          /**
+     * 工器具id
+     */
+          private String toolId;
+          /**
+     * 检测日期
+     */
+        private LocalDate checkDate;
+      /**
+       * 检测日期开始
+       */
+      private LocalDate checkDateStart;
+      /**
+       * 检测日期结束
+       */
+      private LocalDate checkDateEnd;
+          /**
+     * 检定图片路径
+     */
+          private String imgPath;
+          /**
+     * 检定文件路径
+     */
+          private String filePath;
+        /**
+     * 关键字
+     */
+  private String keyword;
+
+}

+ 123 - 0
platform-dao/src/main/java/com/platform/dao/entity/preparation/Preparation.java

@@ -0,0 +1,123 @@
+package com.platform.dao.entity.preparation;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import lombok.experimental.Accessors;
+import com.platform.common.bean.DataScope;
+import javax.persistence.Transient;
+import java.math.BigDecimal;
+
+/**
+ * @Description 筹建管理实体类
+ * @Author xc
+ * @Date 2022-12-28 20:00:26
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@Table(name = "t_preparation")
+public class Preparation implements Serializable{
+
+    /**
+     * 主键
+     */
+        @Id
+    private String id;
+    /**
+     * 设备型号
+     */
+    private String positionId;
+    /**
+     * 申请人id
+     */
+    private String userId;
+    /**
+     * 申请部门
+     */
+    private String departId;
+    /**
+     * 报修时间
+     */
+    private LocalDateTime applyTime;
+    /**
+     * 问题描述
+     */
+    private String content;
+    /**
+     * 报修状态:0:草稿 1-待分配 2-已分配 3-已完成 4-已撤销
+            
+     */
+    private Integer status;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 更新日期
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 创建人
+     */
+    private String createdUserId;
+    /**
+     * 创建人名称
+     */
+    private String createdUserName;
+    /**
+     * 更新人
+     */
+    private String updateUserId;
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+    /**
+     * 维修开始时间
+     */
+    private LocalDateTime repairStartTime;
+    /**
+     * 维修结束时间
+     */
+    private LocalDateTime repairEndTime;
+    /**
+     * 维修耗时
+     */
+    private Double repairMinutes;
+    /**
+     * 维修人员id
+     */
+    private String repairUserId;
+    /**
+     * 维修描述
+     */
+    private String repairContent;
+    /**
+     * 要求完成日期
+     */
+    private LocalDate limitHours;
+    /**
+     * 费用预算
+     */
+    private BigDecimal fee;
+    /**
+     * 预算明细表
+     */
+    private String feeFile;
+
+   /**
+    * 数据权限
+    */
+    @Transient
+    private DataScope dataScope;
+
+}

+ 122 - 0
platform-dao/src/main/java/com/platform/dao/entity/tool/Tool.java

@@ -0,0 +1,122 @@
+package com.platform.dao.entity.tool;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import lombok.experimental.Accessors;
+import com.platform.common.bean.DataScope;
+import javax.persistence.Transient;
+import java.math.BigDecimal;
+
+/**
+ * @Description 工器具管理实体类
+ * @Author xc
+ * @Date 2022-12-28 20:00:49
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@Table(name = "t_tool")
+public class Tool implements Serializable{
+
+    /**
+     * 主键
+     */
+        @Id
+    private String id;
+    /**
+     * 工器具名称
+     */
+    private String name;
+    /**
+     * 工器具型号
+     */
+    private String ggxh;
+    /**
+     * 编号
+     */
+    private LocalDateTime no;
+    /**
+     * 数量
+     */
+    private Integer num;
+    /**
+     * 负责人
+     */
+    private String checkUserId;
+    /**
+     * 生产厂家
+     */
+    private String producer;
+    /**
+     * 是否合格:0否,1是
+     */
+    private String hgFlag;
+    /**
+     * 是否需要检验:0否,1是
+     */
+    private Integer checkFlag;
+    /**
+     * 检测内容
+     */
+    private LocalDateTime content;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 更新日期
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 创建人
+     */
+    private String createdUserId;
+    /**
+     * 创建人名称
+     */
+    private String createdUserName;
+    /**
+     * 更新人
+     */
+    private String updateUserId;
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+    /**
+     * 存放地点
+     */
+    private String position;
+    /**
+     * 检测日期
+     */
+    private String checkDate;
+    /**
+     * 下次检测日期
+     */
+    private LocalDate nextCheckDate;
+    /**
+     * 检测周期
+     */
+    private BigDecimal period;
+    /**
+     * 预警天数
+     */
+    private Integer warnDay;
+
+   /**
+    * 数据权限
+    */
+    @Transient
+    private DataScope dataScope;
+
+}

+ 89 - 0
platform-dao/src/main/java/com/platform/dao/entity/tool/ToolLog.java

@@ -0,0 +1,89 @@
+package com.platform.dao.entity.tool;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import lombok.experimental.Accessors;
+import com.platform.common.bean.DataScope;
+import javax.persistence.Transient;
+
+/**
+ * @Description 工器具检定记录实体类
+ * @Author xc
+ * @Date 2022-12-28 20:01:22
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@Table(name = "t_tool_log")
+public class ToolLog implements Serializable{
+
+    /**
+     * 主键
+     */
+        @Id
+    private String id;
+    /**
+     * 检验人
+     */
+    private String checkUserId;
+    /**
+     * 检验说明
+     */
+    private String requirement;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建人
+     */
+    private String createdUserId;
+    /**
+     * 更新人
+     */
+    private String updateUserId;
+    /**
+     * 创建人名称
+     */
+    private String createdUserName;
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 工器具id
+     */
+    private String toolId;
+    /**
+     * 检测日期
+     */
+    private LocalDate checkDate;
+    /**
+     * 检定图片路径
+     */
+    private String imgPath;
+    /**
+     * 检定文件路径
+     */
+    private String filePath;
+
+   /**
+    * 数据权限
+    */
+    @Transient
+    private DataScope dataScope;
+
+}

+ 26 - 0
platform-dao/src/main/java/com/platform/dao/mapper/preparation/PreparationMapper.java

@@ -0,0 +1,26 @@
+package com.platform.dao.mapper.preparation;
+
+import com.platform.dao.dto.preparation.PreparationDTO;
+import com.platform.dao.config.MyMapper;
+import com.platform.dao.entity.preparation.Preparation;
+import com.platform.dao.vo.query.preparation.PreparationVO;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+
+/**
+ * @Description 筹建管理 mapper
+ * @Author xc
+ * @Date 2022-12-28 20:00:26
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Component
+public interface PreparationMapper extends MyMapper<Preparation> {
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    List<PreparationVO> selectList(PreparationDTO dto);
+
+}

+ 26 - 0
platform-dao/src/main/java/com/platform/dao/mapper/tool/ToolLogMapper.java

@@ -0,0 +1,26 @@
+package com.platform.dao.mapper.tool;
+
+import com.platform.dao.dto.tool.ToolLogDTO;
+import com.platform.dao.config.MyMapper;
+import com.platform.dao.entity.tool.ToolLog;
+import com.platform.dao.vo.query.tool.ToolLogVO;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+
+/**
+ * @Description 工器具检定记录 mapper
+ * @Author xc
+ * @Date 2022-12-28 20:01:22
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Component
+public interface ToolLogMapper extends MyMapper<ToolLog> {
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    List<ToolLogVO> selectList(ToolLogDTO dto);
+
+}

+ 26 - 0
platform-dao/src/main/java/com/platform/dao/mapper/tool/ToolMapper.java

@@ -0,0 +1,26 @@
+package com.platform.dao.mapper.tool;
+
+import com.platform.dao.dto.tool.ToolDTO;
+import com.platform.dao.config.MyMapper;
+import com.platform.dao.entity.tool.Tool;
+import com.platform.dao.vo.query.tool.ToolVO;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+
+/**
+ * @Description 工器具管理 mapper
+ * @Author xc
+ * @Date 2022-12-28 20:00:49
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Component
+public interface ToolMapper extends MyMapper<Tool> {
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    List<ToolVO> selectList(ToolDTO dto);
+
+}

+ 155 - 0
platform-dao/src/main/java/com/platform/dao/vo/export/preparation/ExportPreparationVO.java

@@ -0,0 +1,155 @@
+package com.platform.dao.vo.export.preparation;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.math.BigDecimal;
+
+/**
+ * @Description 筹建管理导出VO
+ * @Author xc
+ * @Date 2022-12-28 20:00:26
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportPreparationVO implements Serializable {
+
+    /**
+     * 主键
+     */
+    @Excel(name = "主键", orderNum = "1")
+    private String id;
+
+    /**
+     * 设备型号
+     */
+    @Excel(name = "设备型号", orderNum = "2")
+    private String positionId;
+
+    /**
+     * 申请人id
+     */
+    @Excel(name = "申请人id", orderNum = "3")
+    private String userId;
+
+    /**
+     * 申请部门
+     */
+    @Excel(name = "申请部门", orderNum = "4")
+    private String departId;
+
+    /**
+     * 报修时间
+     */
+    @Excel(name = "报修时间", orderNum = "5")
+    private LocalDateTime applyTime;
+
+    /**
+     * 问题描述
+     */
+    @Excel(name = "问题描述", orderNum = "6")
+    private String content;
+
+    /**
+     * 报修状态:0:草稿 1-待分配 2-已分配 3-已完成 4-已撤销
+     */
+    @Excel(name = "报修状态", orderNum = "7")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", orderNum = "8")
+    private String remark;
+
+    /**
+     * 创建日期
+     */
+    @Excel(name = "创建日期", orderNum = "9")
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新日期
+     */
+    @Excel(name = "更新日期", orderNum = "10")
+    private LocalDateTime updateTime;
+
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人", orderNum = "11")
+    private String createdUserId;
+
+    /**
+     * 创建人名称
+     */
+    @Excel(name = "创建人名称", orderNum = "12")
+    private String createdUserName;
+
+    /**
+     * 更新人
+     */
+    @Excel(name = "更新人", orderNum = "13")
+    private String updateUserId;
+
+    /**
+     * 更新人名称
+     */
+    @Excel(name = "更新人名称", orderNum = "14")
+    private String updateUserName;
+
+    /**
+     * 维修开始时间
+     */
+    @Excel(name = "维修开始时间", orderNum = "15")
+    private LocalDateTime repairStartTime;
+
+    /**
+     * 维修结束时间
+     */
+    @Excel(name = "维修结束时间", orderNum = "16")
+    private LocalDateTime repairEndTime;
+
+    /**
+     * 维修耗时
+     */
+    @Excel(name = "维修耗时", orderNum = "17")
+    private Double repairMinutes;
+
+    /**
+     * 维修人员id
+     */
+    @Excel(name = "维修人员id", orderNum = "18")
+    private String repairUserId;
+
+    /**
+     * 维修描述
+     */
+    @Excel(name = "维修描述", orderNum = "19")
+    private String repairContent;
+
+    /**
+     * 要求完成日期
+     */
+    @Excel(name = "要求完成日期", orderNum = "20")
+    private LocalDate limitHours;
+
+    /**
+     * 费用预算
+     */
+    @Excel(name = "费用预算", orderNum = "21")
+    private BigDecimal fee;
+
+    /**
+     * 预算明细表
+     */
+    @Excel(name = "预算明细表", orderNum = "22")
+    private String feeFile;
+
+
+}

+ 105 - 0
platform-dao/src/main/java/com/platform/dao/vo/export/tool/ExportToolLogVO.java

@@ -0,0 +1,105 @@
+package com.platform.dao.vo.export.tool;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 工器具检定记录导出VO
+ * @Author xc
+ * @Date 2022-12-28 20:01:22
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportToolLogVO implements Serializable {
+
+    /**
+   * 主键
+   */
+          @Excel(name = "主键", orderNum = "1")
+      private String id;
+    
+    /**
+   * 检验人
+   */
+          @Excel(name = "检验人", orderNum = "2")
+      private String checkUserId;
+    
+    /**
+   * 检验说明
+   */
+          @Excel(name = "检验说明", orderNum = "3")
+      private String requirement;
+    
+    /**
+   * 备注
+   */
+          @Excel(name = "备注", orderNum = "4")
+      private String remark;
+    
+    /**
+   * 创建人
+   */
+          @Excel(name = "创建人", orderNum = "5")
+      private String createdUserId;
+    
+    /**
+   * 更新人
+   */
+          @Excel(name = "更新人", orderNum = "6")
+      private String updateUserId;
+    
+    /**
+   * 创建人名称
+   */
+          @Excel(name = "创建人名称", orderNum = "7")
+      private String createdUserName;
+    
+    /**
+   * 更新人名称
+   */
+          @Excel(name = "更新人名称", orderNum = "8")
+      private String updateUserName;
+    
+    /**
+   * 创建时间
+   */
+          @Excel(name = "创建时间", orderNum = "9")
+      private LocalDateTime createdTime;
+    
+    /**
+   * 更新时间
+   */
+          @Excel(name = "更新时间", orderNum = "10")
+      private LocalDateTime updateTime;
+    
+    /**
+   * 工器具id
+   */
+          @Excel(name = "工器具id", orderNum = "11")
+      private String toolId;
+    
+    /**
+   * 检测日期
+   */
+          @Excel(name = "检测日期", orderNum = "12")
+      private LocalDate checkDate;
+    
+    /**
+   * 检定图片路径
+   */
+          @Excel(name = "检定图片路径", orderNum = "13")
+      private String imgPath;
+    
+    /**
+   * 检定文件路径
+   */
+          @Excel(name = "检定文件路径", orderNum = "14")
+      private String filePath;
+    
+  
+}

+ 154 - 0
platform-dao/src/main/java/com/platform/dao/vo/export/tool/ExportToolVO.java

@@ -0,0 +1,154 @@
+package com.platform.dao.vo.export.tool;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.math.BigDecimal;
+
+/**
+ * @Description 工器具管理导出VO
+ * @Author xc
+ * @Date 2022-12-28 20:00:49
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportToolVO implements Serializable {
+
+    /**
+   * 主键
+   */
+          @Excel(name = "主键", orderNum = "1")
+      private String id;
+    
+    /**
+   * 工器具名称
+   */
+          @Excel(name = "工器具名称", orderNum = "2")
+      private String name;
+    
+    /**
+   * 工器具型号
+   */
+          @Excel(name = "工器具型号", orderNum = "3")
+      private String ggxh;
+    
+    /**
+   * 编号
+   */
+          @Excel(name = "编号", orderNum = "4")
+      private LocalDateTime no;
+    
+    /**
+   * 数量
+   */
+          @Excel(name = "数量", orderNum = "5")
+      private Integer num;
+    
+    /**
+   * 负责人
+   */
+          @Excel(name = "负责人", orderNum = "6")
+      private String checkUserId;
+    
+    /**
+   * 生产厂家
+   */
+          @Excel(name = "生产厂家", orderNum = "7")
+      private String producer;
+    
+    /**
+   * 是否合格:0否,1是
+   */
+          @Excel(name = "是否合格:0否,1是", orderNum = "8")
+      private String hgFlag;
+    
+    /**
+   * 是否需要检验:0否,1是
+   */
+          @Excel(name = "是否需要检验:0否,1是", orderNum = "9")
+      private Integer checkFlag;
+    
+    /**
+   * 检测内容
+   */
+          @Excel(name = "检测内容", orderNum = "10")
+      private LocalDateTime content;
+    
+    /**
+   * 备注
+   */
+          @Excel(name = "备注", orderNum = "11")
+      private String remark;
+    
+    /**
+   * 创建日期
+   */
+          @Excel(name = "创建日期", orderNum = "12")
+      private LocalDateTime createdTime;
+    
+    /**
+   * 更新日期
+   */
+          @Excel(name = "更新日期", orderNum = "13")
+      private LocalDateTime updateTime;
+    
+    /**
+   * 创建人
+   */
+          @Excel(name = "创建人", orderNum = "14")
+      private String createdUserId;
+    
+    /**
+   * 创建人名称
+   */
+          @Excel(name = "创建人名称", orderNum = "15")
+      private String createdUserName;
+    
+    /**
+   * 更新人
+   */
+          @Excel(name = "更新人", orderNum = "16")
+      private String updateUserId;
+    
+    /**
+   * 更新人名称
+   */
+          @Excel(name = "更新人名称", orderNum = "17")
+      private String updateUserName;
+    
+    /**
+   * 存放地点
+   */
+          @Excel(name = "存放地点", orderNum = "18")
+      private String position;
+    
+    /**
+   * 检测日期
+   */
+          @Excel(name = "检测日期", orderNum = "19")
+      private String checkDate;
+    
+    /**
+   * 下次检测日期
+   */
+          @Excel(name = "下次检测日期", orderNum = "20")
+      private LocalDate nextCheckDate;
+    
+    /**
+   * 检测周期
+   */
+          @Excel(name = "检测周期", orderNum = "21")
+      private BigDecimal period;
+    
+    /**
+   * 预警天数
+   */
+          @Excel(name = "预警天数", orderNum = "22")
+      private Integer warnDay;
+    
+  
+}

+ 118 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/preparation/PreparationVO.java

@@ -0,0 +1,118 @@
+package com.platform.dao.vo.query.preparation;
+
+import lombok.Data;
+import com.platform.common.bean.BaseVO;
+import com.platform.common.bean.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.math.BigDecimal;
+
+/**
+ * @Description 筹建管理VO结果类
+ * @Author xc
+ * @Date 2022-12-28 20:00:26
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class PreparationVO extends BaseVO implements Serializable{
+
+    /**
+     * 主键
+     */
+        private String id;
+        /**
+     * 设备型号
+     */
+        private String positionId;
+        /**
+     * 申请人id
+     */
+        private String userId;
+        /**
+     * 申请部门
+     */
+        private String departId;
+        /**
+     * 报修时间
+     */
+        private LocalDateTime applyTime;
+        /**
+     * 问题描述
+     */
+        private String content;
+        /**
+     * 报修状态:0:草稿 1-待分配 2-已分配 3-已完成 4-已撤销
+            
+     */
+        private Integer status;
+        /**
+     * 备注
+     */
+        private String remark;
+        /**
+     * 创建日期
+     */
+        private LocalDateTime createdTime;
+        /**
+     * 更新日期
+     */
+        private LocalDateTime updateTime;
+        /**
+     * 创建人
+     */
+        private String createdUserId;
+        /**
+     * 创建人名称
+     */
+        private String createdUserName;
+        /**
+     * 更新人
+     */
+        private String updateUserId;
+        /**
+     * 更新人名称
+     */
+        private String updateUserName;
+        /**
+     * 维修开始时间
+     */
+        private LocalDateTime repairStartTime;
+        /**
+     * 维修结束时间
+     */
+        private LocalDateTime repairEndTime;
+        /**
+     * 维修耗时
+     */
+        private Double repairMinutes;
+        /**
+     * 维修人员id
+     */
+        private String repairUserId;
+        /**
+     * 维修描述
+     */
+        private String repairContent;
+        /**
+     * 要求完成日期
+     */
+        private LocalDate limitHours;
+        /**
+     * 费用预算
+     */
+        private BigDecimal fee;
+        /**
+     * 预算明细表
+     */
+        private String feeFile;
+    
+
+
+}

+ 84 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/tool/ToolLogVO.java

@@ -0,0 +1,84 @@
+package com.platform.dao.vo.query.tool;
+
+import lombok.Data;
+import com.platform.common.bean.BaseVO;
+import com.platform.common.bean.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 工器具检定记录VO结果类
+ * @Author xc
+ * @Date 2022-12-28 20:01:22
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class ToolLogVO extends BaseVO implements Serializable{
+
+    /**
+     * 主键
+     */
+        private String id;
+        /**
+     * 检验人
+     */
+        private String checkUserId;
+        /**
+     * 检验说明
+     */
+        private String requirement;
+        /**
+     * 备注
+     */
+        private String remark;
+        /**
+     * 创建人
+     */
+        private String createdUserId;
+        /**
+     * 更新人
+     */
+        private String updateUserId;
+        /**
+     * 创建人名称
+     */
+        private String createdUserName;
+        /**
+     * 更新人名称
+     */
+        private String updateUserName;
+        /**
+     * 创建时间
+     */
+        private LocalDateTime createdTime;
+        /**
+     * 更新时间
+     */
+        private LocalDateTime updateTime;
+        /**
+     * 工器具id
+     */
+        private String toolId;
+        /**
+     * 检测日期
+     */
+        private LocalDate checkDate;
+        /**
+     * 检定图片路径
+     */
+        private String imgPath;
+        /**
+     * 检定文件路径
+     */
+        private String filePath;
+    
+
+
+}

+ 117 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/tool/ToolVO.java

@@ -0,0 +1,117 @@
+package com.platform.dao.vo.query.tool;
+
+import lombok.Data;
+import com.platform.common.bean.BaseVO;
+import com.platform.common.bean.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.math.BigDecimal;
+
+/**
+ * @Description 工器具管理VO结果类
+ * @Author xc
+ * @Date 2022-12-28 20:00:49
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class ToolVO extends BaseVO implements Serializable{
+
+    /**
+     * 主键
+     */
+        private String id;
+        /**
+     * 工器具名称
+     */
+        private String name;
+        /**
+     * 工器具型号
+     */
+        private String ggxh;
+        /**
+     * 编号
+     */
+        private LocalDateTime no;
+        /**
+     * 数量
+     */
+        private Integer num;
+        /**
+     * 负责人
+     */
+        private String checkUserId;
+        /**
+     * 生产厂家
+     */
+        private String producer;
+        /**
+     * 是否合格:0否,1是
+     */
+        private String hgFlag;
+        /**
+     * 是否需要检验:0否,1是
+     */
+        private Integer checkFlag;
+        /**
+     * 检测内容
+     */
+        private LocalDateTime content;
+        /**
+     * 备注
+     */
+        private String remark;
+        /**
+     * 创建日期
+     */
+        private LocalDateTime createdTime;
+        /**
+     * 更新日期
+     */
+        private LocalDateTime updateTime;
+        /**
+     * 创建人
+     */
+        private String createdUserId;
+        /**
+     * 创建人名称
+     */
+        private String createdUserName;
+        /**
+     * 更新人
+     */
+        private String updateUserId;
+        /**
+     * 更新人名称
+     */
+        private String updateUserName;
+        /**
+     * 存放地点
+     */
+        private String position;
+        /**
+     * 检测日期
+     */
+        private String checkDate;
+        /**
+     * 下次检测日期
+     */
+        private LocalDate nextCheckDate;
+        /**
+     * 检测周期
+     */
+        private BigDecimal period;
+        /**
+     * 预警天数
+     */
+        private Integer warnDay;
+    
+
+
+}

+ 159 - 0
platform-dao/src/main/resources/mapper/preparation/PreparationMapper.xml

@@ -0,0 +1,159 @@
+<?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="com.platform.dao.mapper.preparation.PreparationMapper">
+    <sql id="Base_Column_List">
+                             preparation.id,
+                                     preparation.position_id,
+                                     preparation.user_id,
+                                     preparation.depart_id,
+                                     preparation.apply_time,
+                                     preparation.content,
+                                     preparation.status,
+                                     preparation.remark,
+                                     preparation.created_time,
+                                     preparation.update_time,
+                                     preparation.created_user_id,
+                                     preparation.created_user_name,
+                                     preparation.update_user_id,
+                                     preparation.update_user_name,
+                                     preparation.repair_start_time,
+                                     preparation.repair_end_time,
+                                     preparation.repair_minutes,
+                                     preparation.repair_user_id,
+                                     preparation.repair_content,
+                                     preparation.limit_hours,
+                                     preparation.fee,
+                                     preparation.fee_file
+                        </sql>
+    <sql id="Ref_Column_List">
+                                                                         preparation.position_id,
+                                     preparation.user_id,
+                                     preparation.depart_id,
+                                     preparation.apply_time,
+                                     preparation.content,
+                                     preparation.status,
+                                     preparation.remark,
+                                                                                                                                                                                                                                                                                                             preparation.repair_start_time,
+                                     preparation.repair_end_time,
+                                     preparation.repair_minutes,
+                                     preparation.repair_user_id,
+                                     preparation.repair_content,
+                                     preparation.limit_hours,
+                                     preparation.fee,
+                                     preparation.fee_file
+                                </sql>
+    <sql id="List_Condition">
+                                    <if test="id != null and id != ''">
+                    and preparation.id = #{id}
+                </if>
+                                                <if test="positionId != null and positionId != ''">
+                    and preparation.position_id = #{positionId}
+                </if>
+                                                <if test="userId != null and userId != ''">
+                    and preparation.user_id = #{userId}
+                </if>
+                                                <if test="departId != null and departId != ''">
+                    and preparation.depart_id = #{departId}
+                </if>
+                                                <if test="applyTimeStart != null">
+                    and preparation.apply_time <![CDATA[>=]]>; #{applyTimeStart}
+                </if>
+                <if test="applyTimeEnd != null">
+                    and preparation.apply_time <![CDATA[<=]]> #{applyTimeEnd}
+                </if>
+                <if test="applyTime != null">
+                    and preparation.apply_time = #{applyTime}
+                </if>
+                                                <if test="content != null and content != ''">
+                    and preparation.content = #{content}
+                </if>
+                                                <if test="status != null">
+                    and preparation.status = #{status}
+                </if>
+                                                <if test="remark != null and remark != ''">
+                    and preparation.remark = #{remark}
+                </if>
+                                                <if test="createdTimeStart != null">
+                    and preparation.created_time <![CDATA[>=]]>; #{createdTimeStart}
+                </if>
+                <if test="createdTimeEnd != null">
+                    and preparation.created_time <![CDATA[<=]]> #{createdTimeEnd}
+                </if>
+                <if test="createdTime != null">
+                    and preparation.created_time = #{createdTime}
+                </if>
+                                                <if test="updateTimeStart != null">
+                    and preparation.update_time <![CDATA[>=]]>; #{updateTimeStart}
+                </if>
+                <if test="updateTimeEnd != null">
+                    and preparation.update_time <![CDATA[<=]]> #{updateTimeEnd}
+                </if>
+                <if test="updateTime != null">
+                    and preparation.update_time = #{updateTime}
+                </if>
+                                                <if test="createdUserId != null and createdUserId != ''">
+                    and preparation.created_user_id = #{createdUserId}
+                </if>
+                                                <if test="createdUserName != null and createdUserName != ''">
+                    and preparation.created_user_name = #{createdUserName}
+                </if>
+                                                <if test="updateUserId != null and updateUserId != ''">
+                    and preparation.update_user_id = #{updateUserId}
+                </if>
+                                                <if test="updateUserName != null and updateUserName != ''">
+                    and preparation.update_user_name = #{updateUserName}
+                </if>
+                                                <if test="repairStartTimeStart != null">
+                    and preparation.repair_start_time <![CDATA[>=]]>; #{repairStartTimeStart}
+                </if>
+                <if test="repairStartTimeEnd != null">
+                    and preparation.repair_start_time <![CDATA[<=]]> #{repairStartTimeEnd}
+                </if>
+                <if test="repairStartTime != null">
+                    and preparation.repair_start_time = #{repairStartTime}
+                </if>
+                                                <if test="repairEndTimeStart != null">
+                    and preparation.repair_end_time <![CDATA[>=]]>; #{repairEndTimeStart}
+                </if>
+                <if test="repairEndTimeEnd != null">
+                    and preparation.repair_end_time <![CDATA[<=]]> #{repairEndTimeEnd}
+                </if>
+                <if test="repairEndTime != null">
+                    and preparation.repair_end_time = #{repairEndTime}
+                </if>
+                                                <if test="repairMinutes != null">
+                    and preparation.repair_minutes = #{repairMinutes}
+                </if>
+                                                <if test="repairUserId != null and repairUserId != ''">
+                    and preparation.repair_user_id = #{repairUserId}
+                </if>
+                                                <if test="repairContent != null and repairContent != ''">
+                    and preparation.repair_content = #{repairContent}
+                </if>
+                                                <if test="limitHoursStart != null">
+                    and preparation.limit_hours <![CDATA[>=]]>; #{limitHoursStart}
+                </if>
+                <if test="limitHoursEnd != null">
+                    and preparation.limit_hours <![CDATA[<=]]> #{limitHoursEnd}
+                </if>
+                <if test="limitHours != null">
+                    and preparation.limit_hours = #{limitHours}
+                </if>
+                                                <if test="fee != null">
+                    and preparation.fee = #{fee}
+                </if>
+                                                <if test="feeFile != null and feeFile != ''">
+                    and preparation.fee_file = #{feeFile}
+                </if>
+                            <if test="keyword != null and keyword != ''">
+            and preparation.id like concat(concat('%',#{keyword}),'%')
+        </if>
+    </sql>
+    <select id="selectList" parameterType="com.platform.dao.dto.preparation.PreparationDTO" resultType="com.platform.dao.vo.query.preparation.PreparationVO">
+        select preparation.*
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                        from t_preparation as preparation
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <where>
+            <include refid="List_Condition" />
+        </where>
+    </select>
+</mapper>

+ 101 - 0
platform-dao/src/main/resources/mapper/tool/ToolLogMapper.xml

@@ -0,0 +1,101 @@
+<?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="com.platform.dao.mapper.tool.ToolLogMapper">
+    <sql id="Base_Column_List">
+        log.id,
+                                     log.check_user_id,
+                                     log.requirement,
+                                     log.remark,
+                                     log.created_user_id,
+                                     log.update_user_id,
+                                     log.created_user_name,
+                                     log.update_user_name,
+                                     log.created_time,
+                                     log.update_time,
+                                     log.tool_id,
+                                     log.check_date,
+                                     log.img_path,
+                                     log.file_path
+    </sql>
+    <sql id="Ref_Column_List">
+        log.check_user_id,
+                                     log.requirement,
+                                     log.remark,                                                                                                                                                                                                                                                                      log.tool_id,
+                                     log.check_date,
+                                     log.img_path,
+                                     log.file_path
+    </sql>
+    <sql id="List_Condition">
+        <if test="id != null and id != ''">
+            and log.id = #{id}
+        </if>
+        <if test="checkUserId != null and checkUserId != ''">
+            and log.check_user_id = #{checkUserId}
+        </if>
+        <if test="requirement != null and requirement != ''">
+            and log.requirement = #{requirement}
+        </if>
+        <if test="remark != null and remark != ''">
+            and log.remark = #{remark}
+        </if>
+        <if test="createdUserId != null and createdUserId != ''">
+            and log.created_user_id = #{createdUserId}
+        </if>
+        <if test="updateUserId != null and updateUserId != ''">
+            and log.update_user_id = #{updateUserId}
+        </if>
+        <if test="createdUserName != null and createdUserName != ''">
+            and log.created_user_name = #{createdUserName}
+        </if>
+        <if test="updateUserName != null and updateUserName != ''">
+            and log.update_user_name = #{updateUserName}
+        </if>
+        <if test="createdTimeStart != null">
+            and log.created_time <![CDATA[>=]]>; #{createdTimeStart}
+        </if>
+        <if test="createdTimeEnd != null">
+            and log.created_time <![CDATA[<=]]> #{createdTimeEnd}
+        </if>
+        <if test="createdTime != null">
+            and log.created_time = #{createdTime}
+        </if>
+        <if test="updateTimeStart != null">
+            and log.update_time <![CDATA[>=]]>; #{updateTimeStart}
+        </if>
+        <if test="updateTimeEnd != null">
+            and log.update_time <![CDATA[<=]]> #{updateTimeEnd}
+        </if>
+        <if test="updateTime != null">
+            and log.update_time = #{updateTime}
+        </if>
+        <if test="toolId != null and toolId != ''">
+            and log.tool_id = #{toolId}
+        </if>
+        <if test="checkDateStart != null">
+            and log.check_date <![CDATA[>=]]>; #{checkDateStart}
+        </if>
+        <if test="checkDateEnd != null">
+            and log.check_date <![CDATA[<=]]> #{checkDateEnd}
+        </if>
+        <if test="checkDate != null">
+            and log.check_date = #{checkDate}
+        </if>
+        <if test="imgPath != null and imgPath != ''">
+            and log.img_path = #{imgPath}
+        </if>
+        <if test="filePath != null and filePath != ''">
+            and log.file_path = #{filePath}
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and log.id like concat(concat('%',#{keyword}),'%')
+        </if>
+    </sql>
+    <select id="selectList" parameterType="com.platform.dao.dto.tool.ToolLogDTO"
+            resultType="com.platform.dao.vo.query.tool.ToolLogVO">
+        select log.*
+        from t_tool_log as log
+        <where>
+            <include refid="List_Condition"/>
+        </where>
+    </select>
+</mapper>

+ 153 - 0
platform-dao/src/main/resources/mapper/tool/ToolMapper.xml

@@ -0,0 +1,153 @@
+<?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="com.platform.dao.mapper.tool.ToolMapper">
+    <sql id="Base_Column_List">
+                             tool.id,
+                                     tool.name,
+                                     tool.ggxh,
+                                     tool.no,
+                                     tool.num,
+                                     tool.check_user_id,
+                                     tool.producer,
+                                     tool.hg_flag,
+                                     tool.check_flag,
+                                     tool.content,
+                                     tool.remark,
+                                     tool.created_time,
+                                     tool.update_time,
+                                     tool.created_user_id,
+                                     tool.created_user_name,
+                                     tool.update_user_id,
+                                     tool.update_user_name,
+                                     tool.position,
+                                     tool.check_date,
+                                     tool.next_check_date,
+                                     tool.period,
+                                     tool.warn_day
+                        </sql>
+    <sql id="Ref_Column_List">
+                                                                         tool.name,
+                                     tool.ggxh,
+                                     tool.no,
+                                     tool.num,
+                                     tool.check_user_id,
+                                     tool.producer,
+                                     tool.hg_flag,
+                                     tool.check_flag,
+                                     tool.content,
+                                     tool.remark,
+                                                                                                                                                                                                                                                                                                             tool.position,
+                                     tool.check_date,
+                                     tool.next_check_date,
+                                     tool.period,
+                                     tool.warn_day
+                                </sql>
+    <sql id="List_Condition">
+                                    <if test="id != null and id != ''">
+                    and tool.id = #{id}
+                </if>
+                                                <if test="name != null and name != ''">
+                    and tool.name = #{name}
+                </if>
+                                                <if test="ggxh != null and ggxh != ''">
+                    and tool.ggxh = #{ggxh}
+                </if>
+                                                <if test="noStart != null">
+                    and tool.no <![CDATA[>=]]>; #{noStart}
+                </if>
+                <if test="noEnd != null">
+                    and tool.no <![CDATA[<=]]> #{noEnd}
+                </if>
+                <if test="no != null">
+                    and tool.no = #{no}
+                </if>
+                                                <if test="num != null">
+                    and tool.num = #{num}
+                </if>
+                                                <if test="checkUserId != null and checkUserId != ''">
+                    and tool.check_user_id = #{checkUserId}
+                </if>
+                                                <if test="producer != null and producer != ''">
+                    and tool.producer = #{producer}
+                </if>
+                                                <if test="hgFlag != null and hgFlag != ''">
+                    and tool.hg_flag = #{hgFlag}
+                </if>
+                                                <if test="checkFlag != null">
+                    and tool.check_flag = #{checkFlag}
+                </if>
+                                                <if test="contentStart != null">
+                    and tool.content <![CDATA[>=]]>; #{contentStart}
+                </if>
+                <if test="contentEnd != null">
+                    and tool.content <![CDATA[<=]]> #{contentEnd}
+                </if>
+                <if test="content != null">
+                    and tool.content = #{content}
+                </if>
+                                                <if test="remark != null and remark != ''">
+                    and tool.remark = #{remark}
+                </if>
+                                                <if test="createdTimeStart != null">
+                    and tool.created_time <![CDATA[>=]]>; #{createdTimeStart}
+                </if>
+                <if test="createdTimeEnd != null">
+                    and tool.created_time <![CDATA[<=]]> #{createdTimeEnd}
+                </if>
+                <if test="createdTime != null">
+                    and tool.created_time = #{createdTime}
+                </if>
+                                                <if test="updateTimeStart != null">
+                    and tool.update_time <![CDATA[>=]]>; #{updateTimeStart}
+                </if>
+                <if test="updateTimeEnd != null">
+                    and tool.update_time <![CDATA[<=]]> #{updateTimeEnd}
+                </if>
+                <if test="updateTime != null">
+                    and tool.update_time = #{updateTime}
+                </if>
+                                                <if test="createdUserId != null and createdUserId != ''">
+                    and tool.created_user_id = #{createdUserId}
+                </if>
+                                                <if test="createdUserName != null and createdUserName != ''">
+                    and tool.created_user_name = #{createdUserName}
+                </if>
+                                                <if test="updateUserId != null and updateUserId != ''">
+                    and tool.update_user_id = #{updateUserId}
+                </if>
+                                                <if test="updateUserName != null and updateUserName != ''">
+                    and tool.update_user_name = #{updateUserName}
+                </if>
+                                                <if test="position != null and position != ''">
+                    and tool.position = #{position}
+                </if>
+                                                <if test="checkDate != null and checkDate != ''">
+                    and tool.check_date = #{checkDate}
+                </if>
+                                                <if test="nextCheckDateStart != null">
+                    and tool.next_check_date <![CDATA[>=]]>; #{nextCheckDateStart}
+                </if>
+                <if test="nextCheckDateEnd != null">
+                    and tool.next_check_date <![CDATA[<=]]> #{nextCheckDateEnd}
+                </if>
+                <if test="nextCheckDate != null">
+                    and tool.next_check_date = #{nextCheckDate}
+                </if>
+                                                <if test="period != null">
+                    and tool.period = #{period}
+                </if>
+                                                <if test="warnDay != null">
+                    and tool.warn_day = #{warnDay}
+                </if>
+                            <if test="keyword != null and keyword != ''">
+            and tool.id like concat(concat('%',#{keyword}),'%')
+        </if>
+    </sql>
+    <select id="selectList" parameterType="com.platform.dao.dto.tool.ToolDTO" resultType="com.platform.dao.vo.query.tool.ToolVO">
+        select tool.*
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                        from t_tool as tool
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <where>
+            <include refid="List_Condition" />
+        </where>
+    </select>
+</mapper>

+ 141 - 0
platform-rest/src/main/java/com/platform/rest/controller/preparation/PreparationController.java

@@ -0,0 +1,141 @@
+package com.platform.rest.controller.preparation;
+
+import com.platform.common.util.R;
+import com.platform.dao.dto.preparation.PreparationDTO;
+import com.platform.dao.entity.preparation.Preparation;
+import com.platform.service.preparation.PreparationService;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.preparation.ExportPreparationVO;
+import com.platform.dao.vo.query.preparation.PreparationVO;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import lombok.AllArgsConstructor;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.rest.log.annotation.SysLog;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description 筹建管理 控制器
+ * @Author xc
+ * @Date 2022-12-28 20:00:26
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/preparation/preparations")
+public class PreparationController {
+
+  private final  PreparationService preparationService;
+
+  /**
+   * 通过id查询单条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R<Preparation> getById(@PathVariable("id") String id){
+      return new R<>(preparationService.getModelById(id));
+  }
+
+  /**
+   * 新增记录
+   *
+   * @param preparationDTO 筹建管理DTO
+   * @return R
+   */
+  @SysLog("新增筹建管理")
+  @PostMapping
+  @PreAuthorize("@pms.hasPermission('preparation-preparations-add')")
+  public R save(@Validated({AddGroup.class}) @RequestBody PreparationDTO preparationDTO) {
+      return new R<>(preparationService.saveModelByDTO(preparationDTO));
+  }
+
+  /**
+   * 修改记录
+   *
+   * @param preparationDTO 筹建管理DTO
+   * @return R
+   */
+  @SysLog("修改筹建管理")
+  @PutMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('preparation-preparations-edit')")
+  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody PreparationDTO preparationDTO) {
+      preparationService.modModelByDTO(preparationDTO);
+      return new R<>();
+  }
+
+
+                                                                                                                                      
+  /**
+   * 通过id删除一条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @SysLog("删除筹建管理")
+  @DeleteMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('preparation-preparations-del')")
+  public R removeById(@PathVariable String id){
+    preparationService.deleteByPrimaryKey(id);
+    return new R<>();
+  }
+
+    /**
+     * 批量记录
+     *
+     * @param ids 主键
+     * @return R
+     */
+    @SysLog("批量删除筹建管理")
+    @DeleteMapping("")
+    @PreAuthorize("@pms.hasPermission('preparation-preparations-del')")
+    public R removeIds(@RequestBody List<String> ids){
+        preparationService.batchDelete(ids);
+        return new R<>();
+    }
+
+  /**
+   * 获取分页
+   *
+   * @param pageNum 当前页码
+   * @param pageSize 每页条数
+   * @param preparationDTO 筹建管理DTO
+   * @return R
+   */
+  @GetMapping("/page")
+  public R<AbstractPageResultBean<PreparationVO>> query(PreparationDTO preparationDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+      return new R<>(preparationService.selectPageList(preparationDTO, pageNum, pageSize));
+  }
+
+  /**
+   * 获取列表
+   *
+   * @param preparationDTO 筹建管理DTO
+   * @return R
+   */
+  @GetMapping("")
+  public R query(PreparationDTO preparationDTO) {
+      return new R<>(preparationService.getModelListByDTO(preparationDTO));
+  }
+
+  /**
+     * 筹建管理导出
+     *
+     * @param preparationDTO 筹建管理DTO
+     * @return R
+     */
+  @GetMapping("/export")
+  @SysLog("筹建管理导出")
+  @PreAuthorize("@pms.hasPermission('preparation-preparations-export')")
+  public void export(HttpServletResponse response, PreparationDTO preparationDTO) {
+    List<Preparation> list = preparationService.getModelListByDTO(preparationDTO);
+    ExcelUtil.exportResponseDict(response, ExportPreparationVO.class, BeanConverterUtil.copyListProperties(list, ExportPreparationVO.class), "筹建管理");
+  }
+
+}

+ 141 - 0
platform-rest/src/main/java/com/platform/rest/controller/tool/ToolController.java

@@ -0,0 +1,141 @@
+package com.platform.rest.controller.tool;
+
+import com.platform.common.util.R;
+import com.platform.dao.dto.tool.ToolDTO;
+import com.platform.dao.entity.tool.Tool;
+import com.platform.service.tool.ToolService;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.tool.ExportToolVO;
+import com.platform.dao.vo.query.tool.ToolVO;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import lombok.AllArgsConstructor;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.rest.log.annotation.SysLog;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description 工器具管理 控制器
+ * @Author xc
+ * @Date 2022-12-28 20:00:49
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tool/tools")
+public class ToolController {
+
+  private final  ToolService toolService;
+
+  /**
+   * 通过id查询单条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R<Tool> getById(@PathVariable("id") String id){
+      return new R<>(toolService.getModelById(id));
+  }
+
+  /**
+   * 新增记录
+   *
+   * @param toolDTO 工器具管理DTO
+   * @return R
+   */
+  @SysLog("新增工器具管理")
+  @PostMapping
+  @PreAuthorize("@pms.hasPermission('tool-tools-add')")
+  public R save(@Validated({AddGroup.class}) @RequestBody ToolDTO toolDTO) {
+      return new R<>(toolService.saveModelByDTO(toolDTO));
+  }
+
+  /**
+   * 修改记录
+   *
+   * @param toolDTO 工器具管理DTO
+   * @return R
+   */
+  @SysLog("修改工器具管理")
+  @PutMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('tool-tools-edit')")
+  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody ToolDTO toolDTO) {
+      toolService.modModelByDTO(toolDTO);
+      return new R<>();
+  }
+
+
+                                                                                                                                      
+  /**
+   * 通过id删除一条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @SysLog("删除工器具管理")
+  @DeleteMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('tool-tools-del')")
+  public R removeById(@PathVariable String id){
+    toolService.deleteByPrimaryKey(id);
+    return new R<>();
+  }
+
+    /**
+     * 批量记录
+     *
+     * @param ids 主键
+     * @return R
+     */
+    @SysLog("批量删除工器具管理")
+    @DeleteMapping("")
+    @PreAuthorize("@pms.hasPermission('tool-tools-del')")
+    public R removeIds(@RequestBody List<String> ids){
+        toolService.batchDelete(ids);
+        return new R<>();
+    }
+
+  /**
+   * 获取分页
+   *
+   * @param pageNum 当前页码
+   * @param pageSize 每页条数
+   * @param toolDTO 工器具管理DTO
+   * @return R
+   */
+  @GetMapping("/page")
+  public R<AbstractPageResultBean<ToolVO>> query(ToolDTO toolDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+      return new R<>(toolService.selectPageList(toolDTO, pageNum, pageSize));
+  }
+
+  /**
+   * 获取列表
+   *
+   * @param toolDTO 工器具管理DTO
+   * @return R
+   */
+  @GetMapping("")
+  public R query(ToolDTO toolDTO) {
+      return new R<>(toolService.getModelListByDTO(toolDTO));
+  }
+
+  /**
+     * 工器具管理导出
+     *
+     * @param toolDTO 工器具管理DTO
+     * @return R
+     */
+  @GetMapping("/export")
+  @SysLog("工器具管理导出")
+  @PreAuthorize("@pms.hasPermission('tool-tools-export')")
+  public void export(HttpServletResponse response, ToolDTO toolDTO) {
+    List<Tool> list = toolService.getModelListByDTO(toolDTO);
+    ExcelUtil.exportResponseDict(response, ExportToolVO.class, BeanConverterUtil.copyListProperties(list, ExportToolVO.class), "工器具管理");
+  }
+
+}

+ 141 - 0
platform-rest/src/main/java/com/platform/rest/controller/tool/ToolLogController.java

@@ -0,0 +1,141 @@
+package com.platform.rest.controller.tool;
+
+import com.platform.common.util.R;
+import com.platform.dao.dto.tool.ToolLogDTO;
+import com.platform.dao.entity.tool.ToolLog;
+import com.platform.service.tool.ToolLogService;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.tool.ExportToolLogVO;
+import com.platform.dao.vo.query.tool.ToolLogVO;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import lombok.AllArgsConstructor;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.rest.log.annotation.SysLog;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description 工器具检定记录 控制器
+ * @Author xc
+ * @Date 2022-12-28 20:01:22
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tool/tool-logs")
+public class ToolLogController {
+
+  private final  ToolLogService toolLogService;
+
+  /**
+   * 通过id查询单条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R<ToolLog> getById(@PathVariable("id") String id){
+      return new R<>(toolLogService.getModelById(id));
+  }
+
+  /**
+   * 新增记录
+   *
+   * @param toolLogDTO 工器具检定记录DTO
+   * @return R
+   */
+  @SysLog("新增工器具检定记录")
+  @PostMapping
+  @PreAuthorize("@pms.hasPermission('tool-tool-logs-add')")
+  public R save(@Validated({AddGroup.class}) @RequestBody ToolLogDTO toolLogDTO) {
+      return new R<>(toolLogService.saveModelByDTO(toolLogDTO));
+  }
+
+  /**
+   * 修改记录
+   *
+   * @param toolLogDTO 工器具检定记录DTO
+   * @return R
+   */
+  @SysLog("修改工器具检定记录")
+  @PutMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('tool-tool-logs-edit')")
+  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody ToolLogDTO toolLogDTO) {
+      toolLogService.modModelByDTO(toolLogDTO);
+      return new R<>();
+  }
+
+
+                                                                                      
+  /**
+   * 通过id删除一条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @SysLog("删除工器具检定记录")
+  @DeleteMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('tool-tool-logs-del')")
+  public R removeById(@PathVariable String id){
+    toolLogService.deleteByPrimaryKey(id);
+    return new R<>();
+  }
+
+    /**
+     * 批量记录
+     *
+     * @param ids 主键
+     * @return R
+     */
+    @SysLog("批量删除工器具检定记录")
+    @DeleteMapping("")
+    @PreAuthorize("@pms.hasPermission('tool-tool-logs-del')")
+    public R removeIds(@RequestBody List<String> ids){
+        toolLogService.batchDelete(ids);
+        return new R<>();
+    }
+
+  /**
+   * 获取分页
+   *
+   * @param pageNum 当前页码
+   * @param pageSize 每页条数
+   * @param toolLogDTO 工器具检定记录DTO
+   * @return R
+   */
+  @GetMapping("/page")
+  public R<AbstractPageResultBean<ToolLogVO>> query(ToolLogDTO toolLogDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+      return new R<>(toolLogService.selectPageList(toolLogDTO, pageNum, pageSize));
+  }
+
+  /**
+   * 获取列表
+   *
+   * @param toolLogDTO 工器具检定记录DTO
+   * @return R
+   */
+  @GetMapping("")
+  public R query(ToolLogDTO toolLogDTO) {
+      return new R<>(toolLogService.getModelListByDTO(toolLogDTO));
+  }
+
+  /**
+     * 工器具检定记录导出
+     *
+     * @param toolLogDTO 工器具检定记录DTO
+     * @return R
+     */
+  @GetMapping("/export")
+  @SysLog("工器具检定记录导出")
+  @PreAuthorize("@pms.hasPermission('tool-tool-logs-export')")
+  public void export(HttpServletResponse response, ToolLogDTO toolLogDTO) {
+    List<ToolLog> list = toolLogService.getModelListByDTO(toolLogDTO);
+    ExcelUtil.exportResponseDict(response, ExportToolLogVO.class, BeanConverterUtil.copyListProperties(list, ExportToolLogVO.class), "工器具检定记录");
+  }
+
+}

+ 35 - 0
platform-service/src/main/java/com/platform/service/preparation/PreparationService.java

@@ -0,0 +1,35 @@
+package com.platform.service.preparation;
+
+import com.platform.dao.vo.query.preparation.PreparationVO;
+import com.platform.dao.dto.preparation.PreparationDTO;
+import com.platform.dao.entity.preparation.Preparation;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.service.base.IBaseService;
+import java.util.List;
+
+/**
+ * @Description 筹建管理 service
+ * @Author xc
+ * @Date 2022-12-28 20:00:26
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+public interface PreparationService extends IBaseService<Preparation, PreparationDTO> {
+
+   /**
+    * 批量删除
+    *
+    * @param ids :
+    * @return :
+    */
+    int batchDelete(List<String> ids);
+
+    /**
+     * 分页查询
+     * @param record
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    AbstractPageResultBean<PreparationVO> selectPageList(PreparationDTO record, int pageNum, int pageSize);
+
+                                                                                                                                                                                                                                                                            }

+ 50 - 0
platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -0,0 +1,50 @@
+package com.platform.service.preparation.impl;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.bean.MyPage;
+import com.github.pagehelper.PageHelper;
+import com.platform.dao.vo.query.preparation.PreparationVO;
+import com.platform.dao.dto.preparation.PreparationDTO;
+import com.platform.dao.entity.preparation.Preparation;
+import com.platform.dao.mapper.preparation.PreparationMapper;
+import com.platform.service.preparation.PreparationService;
+import org.springframework.stereotype.Service;
+import com.platform.service.base.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description 筹建管理 service 实现类
+ * @Author xc
+ * @Date 2022-12-28 20:00:26
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@AllArgsConstructor
+@Service("preparationService")
+public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, Preparation, PreparationDTO> implements PreparationService {
+
+    @Override
+    public int batchDelete(List<String> ids) {
+        Weekend<Preparation> weekend = new Weekend<>(Preparation.class);
+        WeekendCriteria<Preparation, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(Preparation::getId, ids);
+        mapper.deleteByExample(weekend);
+        return 1;
+    }
+
+    @Override
+    public AbstractPageResultBean<PreparationVO> selectPageList(PreparationDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    public AbstractPageResultBean<Preparation> selectPageInfo(PreparationDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+                                                                                                                                                                                                                                                                            }

+ 35 - 0
platform-service/src/main/java/com/platform/service/tool/ToolLogService.java

@@ -0,0 +1,35 @@
+package com.platform.service.tool;
+
+import com.platform.dao.vo.query.tool.ToolLogVO;
+import com.platform.dao.dto.tool.ToolLogDTO;
+import com.platform.dao.entity.tool.ToolLog;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.service.base.IBaseService;
+import java.util.List;
+
+/**
+ * @Description 工器具检定记录 service
+ * @Author xc
+ * @Date 2022-12-28 20:01:22
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+public interface ToolLogService extends IBaseService<ToolLog, ToolLogDTO> {
+
+   /**
+    * 批量删除
+    *
+    * @param ids :
+    * @return :
+    */
+    int batchDelete(List<String> ids);
+
+    /**
+     * 分页查询
+     * @param record
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    AbstractPageResultBean<ToolLogVO> selectPageList(ToolLogDTO record, int pageNum, int pageSize);
+
+                                                                                                                                                                            }

+ 35 - 0
platform-service/src/main/java/com/platform/service/tool/ToolService.java

@@ -0,0 +1,35 @@
+package com.platform.service.tool;
+
+import com.platform.dao.vo.query.tool.ToolVO;
+import com.platform.dao.dto.tool.ToolDTO;
+import com.platform.dao.entity.tool.Tool;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.service.base.IBaseService;
+import java.util.List;
+
+/**
+ * @Description 工器具管理 service
+ * @Author xc
+ * @Date 2022-12-28 20:00:49
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+public interface ToolService extends IBaseService<Tool, ToolDTO> {
+
+   /**
+    * 批量删除
+    *
+    * @param ids :
+    * @return :
+    */
+    int batchDelete(List<String> ids);
+
+    /**
+     * 分页查询
+     * @param record
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    AbstractPageResultBean<ToolVO> selectPageList(ToolDTO record, int pageNum, int pageSize);
+
+                                                                                                                                                                                                                                                                            }

+ 50 - 0
platform-service/src/main/java/com/platform/service/tool/impl/ToolLogServiceImpl.java

@@ -0,0 +1,50 @@
+package com.platform.service.tool.impl;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.bean.MyPage;
+import com.github.pagehelper.PageHelper;
+import com.platform.dao.vo.query.tool.ToolLogVO;
+import com.platform.dao.dto.tool.ToolLogDTO;
+import com.platform.dao.entity.tool.ToolLog;
+import com.platform.dao.mapper.tool.ToolLogMapper;
+import com.platform.service.tool.ToolLogService;
+import org.springframework.stereotype.Service;
+import com.platform.service.base.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description 工器具检定记录 service 实现类
+ * @Author xc
+ * @Date 2022-12-28 20:01:22
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@AllArgsConstructor
+@Service("toolLogService")
+public class ToolLogServiceImpl extends BaseServiceImpl<ToolLogMapper, ToolLog, ToolLogDTO> implements ToolLogService {
+
+    @Override
+    public int batchDelete(List<String> ids) {
+        Weekend<ToolLog> weekend = new Weekend<>(ToolLog.class);
+        WeekendCriteria<ToolLog, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(ToolLog::getId, ids);
+        mapper.deleteByExample(weekend);
+        return 1;
+    }
+
+    @Override
+    public AbstractPageResultBean<ToolLogVO> selectPageList(ToolLogDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    public AbstractPageResultBean<ToolLog> selectPageInfo(ToolLogDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+                                                                                                                                                                            }

+ 50 - 0
platform-service/src/main/java/com/platform/service/tool/impl/ToolServiceImpl.java

@@ -0,0 +1,50 @@
+package com.platform.service.tool.impl;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.bean.MyPage;
+import com.github.pagehelper.PageHelper;
+import com.platform.dao.vo.query.tool.ToolVO;
+import com.platform.dao.dto.tool.ToolDTO;
+import com.platform.dao.entity.tool.Tool;
+import com.platform.dao.mapper.tool.ToolMapper;
+import com.platform.service.tool.ToolService;
+import org.springframework.stereotype.Service;
+import com.platform.service.base.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description 工器具管理 service 实现类
+ * @Author xc
+ * @Date 2022-12-28 20:00:49
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@AllArgsConstructor
+@Service("toolService")
+public class ToolServiceImpl extends BaseServiceImpl<ToolMapper, Tool, ToolDTO> implements ToolService {
+
+    @Override
+    public int batchDelete(List<String> ids) {
+        Weekend<Tool> weekend = new Weekend<>(Tool.class);
+        WeekendCriteria<Tool, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(Tool::getId, ids);
+        mapper.deleteByExample(weekend);
+        return 1;
+    }
+
+    @Override
+    public AbstractPageResultBean<ToolVO> selectPageList(ToolDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    public AbstractPageResultBean<Tool> selectPageInfo(ToolDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+                                                                                                                                                                                                                                                                            }