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

修正缺失的字段

This commit is contained in:
syruan 2025-10-13 22:26:47 +08:00
parent 057da98918
commit 1784825d15
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/ToDoController.java
View File

@ -16,6 +16,7 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/todo") @RequestMapping("/todo")
public class ToDoController extends BaseController { public class ToDoController extends BaseController {
@Autowired @Autowired
private ToDoService toDoService; private ToDoService toDoService;
@ -24,8 +25,7 @@ public class ToDoController extends BaseController {
*/ */
@ApiOperation(value = "代办事项列表") @ApiOperation(value = "代办事项列表")
@GetMapping("/getToDoList") @GetMapping("/getToDoList")
public TableDataInfo getToDoList(ToDoBean bean) public TableDataInfo getToDoList(ToDoBean bean) {
{
startPage(); startPage();
List<ToDoBean> list = toDoService.getToDoList(bean); List<ToDoBean> list = toDoService.getToDoList(bean);
return getDataTable(list); return getDataTable(list);

4
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
View File

@ -56,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mtv.devCategory, mtv.devCategory,
mtv.devSubcategory, mtv.devSubcategory,
mtv.devName, mtv.devName,
mtv.devModel,
d.ma_id as maId, d.ma_id as maId,
d.code as `code`, d.code as `code`,
d.identify_code as identifyCode, d.identify_code as identifyCode,
@ -123,7 +122,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or locate(#{keyWord},mtv.devCategory) > 0 or locate(#{keyWord},mtv.devCategory) > 0
or locate(#{keyWord},mtv.devSubcategory) > 0 or locate(#{keyWord},mtv.devSubcategory) > 0
or locate(#{keyWord},mtv.devName) > 0 or locate(#{keyWord},mtv.devName) > 0
or locate(#{keyWord},mtv.devModel) > 0
or locate(#{keyWord},c.company_name) > 0 or locate(#{keyWord},c.company_name) > 0
or locate(#{keyWord},d.device_name) > 0 or locate(#{keyWord},d.device_name) > 0
or locate(#{keyWord},d.identify_code) > 0 or locate(#{keyWord},d.identify_code) > 0
@ -203,7 +201,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mtv.devCategory, mtv.devCategory,
mtv.devSubcategory, mtv.devSubcategory,
mtv.devName, mtv.devName,
mtv.devModel,
mtv.unit_name, mtv.unit_name,
mt4.type_name as typeName, mt4.type_name as typeName,
mt4.unit_name as unitName, mt4.unit_name as unitName,
@ -1506,7 +1503,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or locate(#{keyWord},mtv.devCategory) > 0 or locate(#{keyWord},mtv.devCategory) > 0
or locate(#{keyWord},mtv.devSubcategory) > 0 or locate(#{keyWord},mtv.devSubcategory) > 0
or locate(#{keyWord},mtv.devName) > 0 or locate(#{keyWord},mtv.devName) > 0
or locate(#{keyWord},mtv.devModel) > 0
or locate(#{keyWord},c.company_name) > 0 or locate(#{keyWord},c.company_name) > 0
or locate(#{keyWord},d.device_name) > 0 or locate(#{keyWord},d.device_name) > 0
or locate(#{keyWord},d.identify_code) > 0 or locate(#{keyWord},d.identify_code) > 0

1
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml
View File

@ -39,7 +39,6 @@
mtv.devCategory, mtv.devCategory,
mtv.devSubcategory, mtv.devSubcategory,
mtv.devName, mtv.devName,
mtv.devModel,
mtv.unit_name, mtv.unit_name,
d.ma_id as maId, d.ma_id as maId,
d.code as code, d.code as code,

3
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
View File

@ -785,8 +785,7 @@
END) AS fiveOrTen END) AS fiveOrTen
FROM FROM
ma_dev_info mdi ma_dev_info mdi
LEFT JOIN ma_type_view mtv LEFT JOIN ma_type_view mtv ON mtv.devModelId = mdi.type_id
ON mtv.devModelId = mdi.type_id
WHERE WHERE
-- 过滤目标proType，只处理需要的三类 -- 过滤目标proType，只处理需要的三类
mtv.proType IN ('变电施工类', '架空输电线路工程', '电缆（海缆）工程') mtv.proType IN ('变电施工类', '架空输电线路工程', '电缆（海缆）工程')