修正缺失的字段

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

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

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

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

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

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

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

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