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

分配客户

Browse Source
This commit is contained in:
daiyongfei
2025-07-09 13:41:03 +08:00
parent 0d3b48bbbb
commit 8a66e5ca51
7 changed files with 248 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAssignmentsMapper.xml
View File

@ -5,15 +5,41 @@
<mapper namespace="com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper">
<resultMap id="BaseResultMap" type="com.fuyuanshen.equipment.domain.DeviceAssignments">
<id property="id" column="id" />
<result property="deviceId" column="device_id" />
<result property="fromCustomerId" column="from_customer_id" />
<result property="toCustomerId" column="to_customer_id" />
<result property="assignedAt" column="assigned_at" />
<result property="deviceTypeGranted" column="device_type_granted" />
<id property="id" column="id"/>
<result property="deviceId" column="device_id"/>
<result property="fromCustomerId" column="from_customer_id"/>
<result property="toCustomerId" column="to_customer_id"/>
<result property="assignedAt" column="assigned_at"/>
<result property="deviceTypeGranted" column="device_type_granted"/>
</resultMap>
<sql id="Base_Column_List">
id,device_id,from_customer_id,to_customer_id,assigned_at,device_type_granted
id
,device_id,from_customer_id,to_customer_id,assigned_at,device_type_granted
</sql>
<!-- 查询设备分配信息 -->
<select id="deviceAssignmentsMapper" resultType="com.fuyuanshen.equipment.domain.DeviceAssignments"
parameterType="com.fuyuanshen.equipment.domain.query.DeviceAssignmentQuery">
SELECT *
FROM device_assignments
<where>
<if test="query.deviceId != null">
AND device_id = #{query.deviceId}
</if>
<if test="query.assigneeId != null">
AND assignee_id = #{query.assigneeId}
</if>
<if test="query.active != null">
AND active = #{query.active}
</if>
<if test="query.assignerId != null">
AND assigner_id = #{query.assignerId}
</if>
<if test="query.lever != null">
AND lever LIKE CONCAT('%', #{query.lever}, '%')
</if>
</where>
</select>
</mapper>

3
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
View File

@ -77,11 +77,12 @@
select
da.id AS id,d.device_name,
d.device_pic, d.device_mac, d.device_sn, d.update_by,d.device_imei,
d.update_time, d.device_type, d.remark, d.binding_status,d.type_name AS typeName,
d.update_time, dg.id AS device_type, d.remark, d.binding_status,d.type_name AS typeName,
da.assignee_id AS customerId, da.assignee_name AS customerName, da.active AS deviceStatus,
da.create_time AS create_time , da.assigner_name AS createByName , da.id AS assignId
from device d
LEFT JOIN device_type t ON d.device_type = t.id
LEFT JOIN device_type_grants dg ON dg.device_type_id = t.id
LEFT JOIN device_assignments da ON da.device_id = d.id
<where>
<!-- 时间范围等其他条件保持原样 -->