From 62cd9d30a8995f11be78aeb49815e7f7d4a11506 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 13 十月 2026 17:45:18 +0800
Subject: [PATCH] 设备模块后端调整：档案修订保存时自动同步生成本年度校准、核查、保养计划明细（校准计划时间取有效期前一个月，核查、保养取下次日期前一个月）；设备新增保养、核查日期与周期字段；设备树查询改为全部/设备/计量器具分类；新增检测员角色人员查询接口；导入模板移除所属部门列
---
basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index fd67dfc..c18b8e7 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -3,11 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StructureItemParameterMapper">
- <delete id="removeNoSample">
- delete
- from structure_item_parameter
- where sample like concat('%', #{sample}, '%')
- </delete>
+
<select id="selectItemParameterList" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
select * from (select A.id,
inspection_item,
@@ -40,7 +36,9 @@
inspection_item_class_en,
code,
radius_list,
- rates
+ rates,
+ device_ids,
+ spot_check_type
from (select *,
CASE
WHEN INSTR(sample, ',') > 0 THEN
@@ -108,6 +106,13 @@
from structure_test_object sto
left join product p on p.object_id = sto.id
</select>
+ <select id="selectDeviceIdsByNumber" resultType="java.lang.Integer">
+ select id from device
+ where management_number in
+ <foreach item="item" collection="managementNumberList" open="(" separator="),(" close=")">
+ #{item}
+ </foreach>
+ </select>
<resultMap id="itemDto" type="com.ruoyi.basic.dto.TestItemDto">
<result column="sId" property="id"/>
--
Gitblit v1.9.3