bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

This commit is contained in:
jiang 2025-11-25 15:50:08 +08:00
parent 399796aa27
commit f6e70c3fb6
4 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/controller/BackChangeController.java
View File

@ -36,14 +36,8 @@ public class BackChangeController extends BaseController {
@ApiOperation(value = "获取添加设备详情") @ApiOperation(value = "获取添加设备详情")
@GetMapping("/getDevDetailsInfo") @GetMapping("/getDevDetailsInfo")
public AjaxResult getDevDetailsInfo(BackCsDeviceDetails dto) { public AjaxResult getDevDetailsInfo(BackCsDeviceDetails dto) {
try {
startPage();
List<BackCsDeviceDetails> list = service.getDevDetailsInfo(dto); List<BackCsDeviceDetails> list = service.getDevDetailsInfo(dto);
return AjaxResult.success(getDataTable(list)); return AjaxResult.success(list);
} catch (Exception e) {
log.error("查询失败，请联系管理员:{}", e.getMessage());
return AjaxResult.error("查询失败，请联系管理员");
}
} }
/** /**

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java
View File

@ -165,7 +165,7 @@ public class BackChangeServiceImpl implements BackChangeService {
} }
// 编码重复 // 编码重复
String devCode = details.getDevCode(); String devCode = details.getDevCode();
if (StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) { if (!devCode.equals("/") && StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) {
return AjaxResult.error("添加的列表中设备编号存在重复：" + devCode); return AjaxResult.error("添加的列表中设备编号存在重复：" + devCode);
} else if (StringUtils.isNotBlank(devCode)) { } else if (StringUtils.isNotBlank(devCode)) {
devCodeSet.add(devCode); devCodeSet.add(devCode);

4
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml
View File

@ -222,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
</where> </where>
GROUP BY tl.tool_code GROUP BY tl.tool_code
HAVING useNum &gt; 0
UNION ALL UNION ALL
SELECT CONCAT(tt4.type_name, '>', tt3.type_name, '>', tt2.type_name) as category, SELECT CONCAT(tt4.type_name, '>', tt3.type_name, '>', tt2.type_name) as category,
@ -264,7 +264,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND cd.pro_code = #{proCode} AND cd.pro_code = #{proCode}
</if> </if>
</where> </where>
GROUP BY tl.id GROUP BY tl.id
HAVING useNum &gt; 0
</select> </select>
<select id="getMonthMaxOrderByDate" resultType="java.lang.Integer"> <select id="getMonthMaxOrderByDate" resultType="java.lang.Integer">

3
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml
View File

@ -479,8 +479,7 @@
<select id="selectTotalDeviceCount" resultType="java.lang.Integer"> <select id="selectTotalDeviceCount" resultType="java.lang.Integer">
SELECT COUNT(1) SELECT COUNT(1)
FROM ma_dev_info d FROM ma_dev_info WHERE is_active = '1' and entry_status = '1'
JOIN ma_type t ON d.type_id = t.type_id
</select> </select>
</mapper> </mapper>