完善

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -50,6 +50,11 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      * 设备id
      */
     private String sbId;
+    /**
+     * 设备编号
+     */
+    @Transient
+    private String sbNo;
     /**
      * 是否停机: 1-是 2-否
      */

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairReasonDTO.java

@@ -31,6 +31,10 @@ public class RepairReasonDTO extends BaseDTO implements Serializable {
      * 编号
      */
     private String no;
+    /**
+     * 设备id
+     */
+    private String sbId;
     /**
      * 维修编号ID
      */

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -37,6 +37,10 @@ public class RepairApplicationForm implements Serializable {
      * 设备id
      */
     private String sbId;
+    /**
+     * 设备id
+     */
+    private String sbNo;
     /**
      * 设备使用位置
      */

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairReason.java

@@ -31,6 +31,10 @@ public class RepairReason implements Serializable{
      * 编号
      */
     private String no;
+    /**
+     * 设备id
+     */
+    private String sbId;
     /**
      * 维修编号ID
      */

platform-dao/src/main/java/com/platform/dao/vo/query/repair/RepairReasonVO.java

@@ -31,6 +31,10 @@ public class RepairReasonVO extends BaseVO implements Serializable {
      * 编号
      */
     private String no;
+    /**
+     * 设备id
+     */
+    private String sbId;
     /**
      * 维修编号ID
      */

platform-dao/src/main/resources/mapper/repair/RepairReasonMapper.xml

@@ -4,6 +4,7 @@
     <sql id="Base_Column_List">
                              repairReason.id,
                                      repairReason.no,
+ repairReason.sb_id,
                                      repairReason.repair_id,
                                      repairReason.analyze_time,
                                      repairReason.problem_desc,
@@ -23,6 +24,7 @@
                         </sql>
     <sql id="Ref_Column_List">
                                                                          repairReason.no,
+                                     repairReason.sb_id,
                                      repairReason.repair_id,
                                      repairReason.analyze_time,
                                      repairReason.problem_desc,
@@ -47,7 +49,10 @@
                                                 <if test="no != null and no != ''">
                     and repairReason.no = #{no}
                 </if>
-                                                <if test="repairId != null and repairId != ''">
+                <if test="sbId != null and sbId != ''">
+                    and repairReason.sb_id = #{sbId}
+                </if>
+                <if test="repairId != null and repairId != ''">
                     and repairReason.repair_id = #{repairId}
                 </if>
                                                 <if test="analyzeTimeStart != null">

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -7,6 +7,7 @@ import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.repair.RepairCheckDTO;
 import com.platform.dao.dto.repair.RepairFormDTO;
+import com.platform.dao.dto.repair.RepairReasonDTO;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.repair.ExportRepairApplicationFormVO;
@@ -45,6 +46,17 @@ public class RepairApplicationFormController {
         return new R<>(repairApplicationFormService.getById(id));
     }
 
+    /**
+     * 历史分析记录数量DTO
+     *
+     * @param repairReasonDTO 历史分析记录数量DTO
+     * @return R
+     */
+    @GetMapping("/num")
+    public R getNum(RepairApplicationFormDTO repairApplicationFormDTO) {
+        return new R<>(repairApplicationFormService.getCountByDTO(repairApplicationFormDTO));
+    }
+
     /**
      * 新增记录
      *

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairReasonController.java

@@ -1,6 +1,7 @@
 package com.platform.rest.controller.repair;
 
 import com.platform.common.util.R;
+import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.dto.repair.RepairReasonDTO;
 import com.platform.dao.entity.repair.RepairReason;
 import com.platform.service.repair.RepairReasonService;
@@ -56,7 +57,18 @@ public class RepairReasonController {
       return new R<>(repairReasonService.saveModelByDTO(repairReasonDTO));
   }
 
-  /**
+    /**
+     * 历史分析记录数量DTO
+     *
+     * @param repairReasonDTO 历史分析记录数量DTO
+     * @return R
+     */
+    @GetMapping("/num")
+    public R getNum(RepairReasonDTO repairReasonDTO) {
+        return new R<>(repairReasonService.getCountByDTO(repairReasonDTO));
+    }
+
+    /**
    * 修改记录
    *
    * @param repairReasonDTO 维修原因DTO