Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bug修改

Browse Source
This commit is contained in:
chendaofei
2025-07-03 14:22:06 +08:00
parent ba03707443
commit 6bb9d19765
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
View File

@@ -169,7 +169,7 @@
INNER JOIN sys_area area ON area.Id = areaId.NAME INNER JOIN sys_area area ON area.Id = areaId.NAME
INNER JOIN pq_device device ON device.Id = dev.Id INNER JOIN pq_device device ON device.Id = dev.Id
INNER JOIN sys_dict_data manufacturerId ON manufacturerId.Id = device.Manufacturer INNER JOIN sys_dict_data manufacturerId ON manufacturerId.Id = device.Manufacturer
INNER JOIN sys_dict_data devT ON devT.Id = device.Dev_Type INNER JOIN pq_dev_type devT ON devT.Id = device.Dev_Type
WHERE dev.Id in WHERE dev.Id in
<foreach item="item" collection="list" open="(" separator="," close=")"> <foreach item="item" collection="list" open="(" separator="," close=")">
#{item} #{item}
@@ -309,7 +309,7 @@
INNER JOIN sys_area area ON area.Id = areaId.NAME INNER JOIN sys_area area ON area.Id = areaId.NAME
INNER JOIN pq_device device ON device.Id = dev.Id INNER JOIN pq_device device ON device.Id = dev.Id
left JOIN sys_dict_data manufacturerId ON manufacturerId.Id = device.Manufacturer left JOIN sys_dict_data manufacturerId ON manufacturerId.Id = device.Manufacturer
left JOIN sys_dict_data devT ON devT.Id = device.Dev_Type left JOIN pq_dev_type devT ON devT.Id = device.Dev_Type
WHERE dev.Id in WHERE dev.Id in
<foreach item="item" collection="list" open="(" separator="," close=")"> <foreach item="item" collection="list" open="(" separator="," close=")">
#{item} #{item}

8
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -860,7 +860,7 @@
LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_dev_meal c ON b.id = c.line_id
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
LEFT JOIN sys_dict_data e ON b.dev_type = e.id LEFT JOIN pq_dev_type e ON b.dev_type = e.id
where a.id in where a.id in
<foreach item="item" collection="list" separator="," open="(" close=")"> <foreach item="item" collection="list" separator="," open="(" close=")">
#{item} #{item}
@@ -894,7 +894,7 @@
LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_dev_meal c ON b.id = c.line_id
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
LEFT JOIN sys_dict_data e ON b.dev_type = e.id LEFT JOIN pq_dev_type e ON b.dev_type = e.id
where a.id in where a.id in
<foreach item="item" collection="list" separator="," open="(" close=")"> <foreach item="item" collection="list" separator="," open="(" close=")">
#{item} #{item}
@@ -1012,7 +1012,7 @@
LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_dev_meal c ON b.id = c.line_id
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
LEFT JOIN sys_dict_data e ON b.dev_type = e.id LEFT JOIN pq_dev_type e ON b.dev_type = e.id
where a.id in where a.id in
<foreach item="item" collection="list" separator="," open="(" close=")"> <foreach item="item" collection="list" separator="," open="(" close=")">
#{item} #{item}
@@ -1100,7 +1100,7 @@
left join sys_dict_data dic4 on de.Load_Type = dic4.id left join sys_dict_data dic4 on de.Load_Type = dic4.id
left join sys_dict_data dic5 on de.Business_Type = dic5.id left join sys_dict_data dic5 on de.Business_Type = dic5.id
left join sys_dict_data dic6 on d.Manufacturer = dic6.id left join sys_dict_data dic6 on d.Manufacturer = dic6.id
left join sys_dict_data dic7 on d.Dev_Type = dic7.id left join pq_dev_type dic7 on d.Dev_Type = dic7.id
left join sys_dict_data dic8 on d.front_type = dic8.id left join sys_dict_data dic8 on d.front_type = dic8.id
LEFT JOIN pq_node node ON d.Node_Id = node.id LEFT JOIN pq_node node ON d.Node_Id = node.id
order by pj.sort,pro.sort,gd.sort,sub.sort,dev.sort,vol.sort,line.sort order by pj.sort,pro.sort,gd.sort,sub.sort,dev.sort,vol.sort,line.sort

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml
View File

@@ -76,7 +76,7 @@
sdd.Name AS devTypeName sdd.Name AS devTypeName
FROM cld_dev_version cdv FROM cld_dev_version cdv
LEFT JOIN pq_device pd ON cdv.Line_Id = pd.Id LEFT JOIN pq_device pd ON cdv.Line_Id = pd.Id
LEFT JOIN sys_dict_data sdd ON pd.Dev_Type = sdd.Id LEFT JOIN pq_dev_type sdd ON pd.Dev_Type = sdd.Id
WHERE cdv.Line_Id = #{id} WHERE cdv.Line_Id = #{id}
</select> </select>
<select id="selectDevVersion" resultType="com.njcn.device.pq.pojo.vo.TerminalVersionVO$Version"> <select id="selectDevVersion" resultType="com.njcn.device.pq.pojo.vo.TerminalVersionVO$Version">