From 795c16bd3aa31f4faa4fe8a8e2155718cac0e5d1 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 29 八月 2026 11:55:43 +0800
Subject: [PATCH] 修复电池组模板查询映射
---
ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImplTest.java | 5 +++--
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBatteryGroupMapper.java | 3 ++-
ruoyi-system/src/main/resources/mapper/system/TBatteryGroupMapper.xml | 6 +++++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImplTest.java
index f615a8f..704a705 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImplTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImplTest.java
@@ -20,6 +20,7 @@
import com.ruoyi.system.domain.TBatteryGroup;
import com.ruoyi.system.domain.TBatteryGroupBattery;
import com.ruoyi.system.domain.TBatteryGroupRelationField;
+import com.ruoyi.system.domain.TBatteryGroupTemplate;
import com.ruoyi.system.mapper.TBatteryGroupMapper;
/** 电池组 Service 单元测试。 */
@@ -96,7 +97,7 @@
when(batteryGroupMapper.selectBatteryGroupById(12L)).thenReturn(current);
when(batteryGroupMapper.countTestingByGroupId(12L)).thenReturn(0);
when(batteryGroupMapper.selectBatteryByNo("BAT-01", 12L)).thenReturn(null);
- when(batteryGroupMapper.selectTemplate(5L)).thenReturn(new TBatteryGroup());
+ when(batteryGroupMapper.selectTemplate(5L)).thenReturn(new TBatteryGroupTemplate());
when(batteryGroupMapper.selectTemplateFieldIds(5L)).thenReturn(Collections.singletonList(7L));
when(batteryGroupMapper.selectValidTemplateFields(5L, Collections.singletonList(7L)))
.thenReturn(Collections.singletonList(relation));
@@ -128,7 +129,7 @@
validField.setFieldType("number");
when(batteryGroupMapper.selectBatteryGroupByName("样品组")).thenReturn(null);
when(batteryGroupMapper.selectBatteryByNo("BAT-01", null)).thenReturn(null);
- when(batteryGroupMapper.selectTemplate(5L)).thenReturn(new TBatteryGroup());
+ when(batteryGroupMapper.selectTemplate(5L)).thenReturn(new TBatteryGroupTemplate());
when(batteryGroupMapper.selectTemplateFieldIds(5L)).thenReturn(Collections.singletonList(7L));
when(batteryGroupMapper.selectValidTemplateFields(5L, Collections.singletonList(7L)))
.thenReturn(Collections.singletonList(validField));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBatteryGroupMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBatteryGroupMapper.java
index c321d15..d2b0bf9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBatteryGroupMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBatteryGroupMapper.java
@@ -6,6 +6,7 @@
import com.ruoyi.system.domain.TBatteryGroup;
import com.ruoyi.system.domain.TBatteryGroupBattery;
import com.ruoyi.system.domain.TBatteryGroupRelationField;
+import com.ruoyi.system.domain.TBatteryGroupTemplate;
/** 电池组 Mapper。 */
public interface TBatteryGroupMapper
@@ -16,7 +17,7 @@
TBatteryGroup selectBatteryGroupByName(@Param("groupName") String groupName);
List<TBatteryGroupBattery> selectBatteries(Long groupId);
List<TBatteryGroupRelationField> selectRelationFields(Long groupId);
- TBatteryGroup selectTemplate(@Param("templateId") Long templateId);
+ TBatteryGroupTemplate selectTemplate(@Param("templateId") Long templateId);
List<Long> selectTemplateFieldIds(@Param("templateId") Long templateId);
List<TBatteryGroupRelationField> selectValidTemplateFields(@Param("templateId") Long templateId, @Param("fieldIds") List<Long> fieldIds);
TBatteryGroupBattery selectBatteryByNo(@Param("batteryNo") String batteryNo, @Param("groupId") Long groupId);
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBatteryGroupMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBatteryGroupMapper.xml
index aa4aaad..a4b05d2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBatteryGroupMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBatteryGroupMapper.xml
@@ -25,6 +25,10 @@
<result property="fieldValue" column="field_value" />
<result property="delFlag" column="del_flag" />
</resultMap>
+ <resultMap type="TBatteryGroupTemplate" id="TBatteryGroupTemplateReferenceResult">
+ <id property="templateId" column="template_id" />
+ <result property="templateName" column="template_name" />
+ </resultMap>
<sql id="groupColumns">select group_id, group_name, model, purpose, z, h, f, a, b, status, create_by, create_time, update_by, update_time, remark, del_flag from t_battery_group</sql>
<select id="selectBatteryGroupList" parameterType="TBatteryGroup" resultMap="TBatteryGroupResult">
select bg.group_id, bg.group_name, bg.model, bg.purpose, bg.z, bg.h, bg.f, bg.a, bg.b, bg.status,
@@ -52,7 +56,7 @@
<select id="selectBatteryGroupByName" resultMap="TBatteryGroupResult"> <include refid="groupColumns"/> where group_name = #{groupName} and del_flag = '0' limit 1</select>
<select id="selectBatteries" parameterType="Long" resultMap="TBatteryGroupBatteryResult">select relation_id, group_id, battery_no, sort_order, del_flag from t_battery_group_battery where group_id = #{groupId} and del_flag = '0' order by sort_order, relation_id</select>
<select id="selectRelationFields" parameterType="Long" resultMap="TBatteryGroupRelationFieldResult">select r.relation_id, r.group_id, r.template_id, r.battery_group_field_id, f.field_name, f.field_type, r.field_value, r.del_flag from t_battery_group_relation_field r inner join t_battery_group_field f on f.field_id = r.battery_group_field_id and f.del_flag = '0' where r.group_id = #{groupId} and r.del_flag = '0' order by r.relation_id</select>
- <select id="selectTemplate" resultType="TBatteryGroup">select template_id, template_name from t_battery_group_template where template_id = #{templateId}</select>
+ <select id="selectTemplate" resultMap="TBatteryGroupTemplateReferenceResult">select template_id, template_name from t_battery_group_template where template_id = #{templateId}</select>
<select id="selectTemplateFieldIds" resultType="Long">select field_id from t_battery_group_template_field where template_id = #{templateId} and del_flag = '0' order by sort_order, relation_id</select>
<select id="selectValidTemplateFields" resultMap="TBatteryGroupRelationFieldResult">select r.relation_id, r.template_id, r.field_id as battery_group_field_id, f.field_name, f.field_type, '0' as del_flag from t_battery_group_template_field r inner join t_battery_group_field f on f.field_id = r.field_id and f.del_flag = '0' where r.template_id = #{templateId} and r.del_flag = '0' and r.field_id in <foreach collection="fieldIds" item="fieldId" open="(" separator="," close=")">#{fieldId}</foreach></select>
<select id="selectBatteryByNo" resultMap="TBatteryGroupBatteryResult">select relation_id, group_id, battery_no, sort_order, del_flag from t_battery_group_battery where battery_no = #{batteryNo} and del_flag = '0' <if test="groupId != null">and group_id != #{groupId}</if> limit 1</select>
--
Gitblit v1.7.1