From 6a2f1461e8775f988634b8f204623e836cb73e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Mon, 31 Jul 2023 10:27:35 +0800
Subject: [PATCH] 2023-07-31

---
 .../com/jtem/modules/pda/dao/ToolDetailMapper.java  |  2 ++
 .../jtem/modules/pda/service/ToolHeaderService.java |  2 ++
 .../pda/service/impl/ToolHeaderServiceImpl.java     | 12 ++++++++++++
 .../toolMan/controller/ToolInfoController.java      | 13 +++++++++++++
 src/main/resources/mapper/pda/ToolDetailMapper.xml  | 11 +++++++++++
 5 files changed, 40 insertions(+)

diff --git a/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java b/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java
index ef4f00c..e232f3f 100644
--- a/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java
+++ b/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java
@@ -217,4 +217,6 @@ public interface ToolDetailMapper {
     void checkToolUseQtyAssess(ToolUseQtyAssessData data);
 
     void updateToolDetailUseQty(ToolUseQtyAssessData data);
+
+    List<ToolUseQtyAssessData> checkAssessRecord(ToolUseQtyAssessData data);
 }
diff --git a/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java b/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java
index 53f9d1b..5830834 100644
--- a/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java
+++ b/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java
@@ -264,4 +264,6 @@ public interface ToolHeaderService {
 
 
     void checkToolUseQtyAssess(ToolUseQtyAssessData data);
+
+    List<ToolUseQtyAssessData> checkAssessRecord(ToolUseQtyAssessData data);
 }
diff --git a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java
index cc7d254..536661c 100644
--- a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java
+++ b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java
@@ -742,4 +742,16 @@ public class ToolHeaderServiceImpl implements ToolHeaderService {
     public void deleteItemModal(ToolSubPropertiesValueData data){
         toolDetailMapper.deleteItemModal(data);
     }
+
+    /**
+     * @description: 根据实例编码获取寿命评估记录
+     * @author: fengyuan_yang
+     * @date: 2023/7/31 9:31
+     * @param: [data]
+     * @return: java.util.List<com.jtem.modules.toolMan.entity.ToolUseQtyAssessData>
+     **/
+    @Override
+    public List<ToolUseQtyAssessData> checkAssessRecord(ToolUseQtyAssessData data) {
+        return toolDetailMapper.checkAssessRecord(data);
+    }
 }
diff --git a/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java b/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java
index 191c941..327e344 100644
--- a/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java
+++ b/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java
@@ -379,4 +379,17 @@ public class ToolInfoController extends AbstractController {
         return R.ok();
     }
 
+    /**
+     * @description: 根据实例编码获取寿命评估记录
+     * @author: fengyuan_yang
+     * @date: 2023/7/31 9:29
+     * @param: [data]
+     * @return: com.jtem.common.utils.R
+     **/
+    @PostMapping("checkAssessRecord")
+    public R checkAssessRecord(@RequestBody ToolUseQtyAssessData data){
+        List<ToolUseQtyAssessData> resultList = toolHeaderService.checkAssessRecord(data);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
+
 }
diff --git a/src/main/resources/mapper/pda/ToolDetailMapper.xml b/src/main/resources/mapper/pda/ToolDetailMapper.xml
index 9d1234d..295e7d2 100644
--- a/src/main/resources/mapper/pda/ToolDetailMapper.xml
+++ b/src/main/resources/mapper/pda/ToolDetailMapper.xml
@@ -624,4 +624,15 @@
     <delete id="deleteItemModal">
         delete from  ToolSubPropertiesValue where ToolItemNo=#{toolItemNo} and  site=#{site} and ToolID=#{toolID}
     </delete>
+
+    <!-- 根据实例编码获取寿命评估记录 -->
+    <select id="checkAssessRecord" resultType="ToolUseQtyAssessData" parameterType="ToolUseQtyAssessData">
+        select
+            id,
+            tool_id,
+            tool_instance_id,
+            est_use_qty
+        from tool_use_qty_assess
+        where tool_id = #{toolId} and tool_instance_id = #{toolInstanceId} and status = '待审核'
+    </select>
 </mapper>