liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

feat(equipment): 添加设备维修图片功能并优化维修记录相关接口- 新增 DeviceRepairImages 相关实体、Mapper 和 XML 文件- 重构 DeviceRepairRecords 相关接口和实现类，支持图片上传

Browse Source 
- 新增 RepairImageType 枚举类
- 优化 DeviceRepairRecordsVo，增加图片列表和设备名称字段
This commit is contained in:
DragonWenLong
2025-09-03 15:17:39 +08:00
parent 8462fed747
commit bdbbd5a12f
14 changed files with 427 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceRepairImagesMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?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.fuyuanshen.equipment.mapper.DeviceRepairImagesMapper">
</mapper>

36
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceRepairRecordsMapper.xml
View File

@ -3,5 +3,41 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuyuanshen.equipment.mapper.DeviceRepairRecordsMapper">
<resultMap id="BaseResultMap" type="com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo">
<id column="record_id" property="recordId"/>
<result column="device_id" property="deviceId"/>
<result column="deviceName" property="deviceName"/>
<result column="repair_time" property="repairTime"/>
<result column="repair_part" property="repairPart"/>
<result column="repair_reason" property="repairReason"/>
<result column="repair_person" property="repairPerson"/>
<result column="create_by" property="createBy"/>
<result column="update_by" property="updateBy"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<!-- 查询所有设备类型 -->
<select id="findAll" resultMap="BaseResultMap">
SELECT DISTINCT dr.*,d.device_name as deviceName
FROM device_repair_records dr
JOIN device d ON dr.device_id = d.id
<where>
<if test="criteria.deviceId != null">
and dr.device_id = #{criteria.deviceId}
</if>
<if test="criteria.repairPart != null">
and dr.repairPart like concat('%', TRIM(#{criteria.repairPart}), '%')
</if>
<!-- 时间段条件 -->
<if test="criteria.repairBeginTime != null">
AND dr.repair_time <![CDATA[ >= ]]> #{criteria.repairBeginTime}
</if>
<if test="criteria.repairEndTime != null">
<!-- 如果想默认包含当天 23:59:59，可在 Java 代码里把结束时间设为 endOfDay -->
AND dr.repair_time <![CDATA[ <= ]]> #{criteria.repairEndTime}
</if>
</where>
ORDER BY dr.create_time DESC
</select>
</mapper>