From 179e8f57ac647bc28f1035543ed6f11228da18d7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 二月 2025 16:38:27 +0800
Subject: [PATCH] 维修物品与分类,故障区域

---
 ruoyi-system/src/main/java/com/ruoyi/system/query/TItemQuery.java                      |   18 +
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java  |   12 +
 ruoyi-system/src/main/java/com/ruoyi/system/vo/TItemVO.java                            |   15 +
 ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java                           |   10 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemServiceImpl.java         |   13 +
 ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml                          |    5 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java                           |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/query/TItemTypeQuery.java                  |   10 +
 ruoyi-system/src/main/resources/mapper/system/TFaultDescribeDicMapper.xml              |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemMapper.java                    |   14 +
 ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml                  |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultAreaDicService.java          |    7 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java    |   21 +
 ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java                    |   10 
 ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java              |   15 +
 ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml                   |   15 +
 ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml                          |   17 +
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java            |   88 ++++++++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java     |   87 ++++++++
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java                |   12 +
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultAreaDicServiceImpl.java |   14 +
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java             |   12 +
 ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml                      |    7 
 ruoyi-system/src/main/java/com/ruoyi/system/query/TInformationQuery.java               |   15 +
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java     |   26 ++
 ruoyi-system/src/main/java/com/ruoyi/system/service/TItemService.java                  |    9 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java        |  104 ++++++++++
 ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java           |    8 
 28 files changed, 553 insertions(+), 17 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java
index 7d8127e..accebe7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java
@@ -1,13 +1,16 @@
 package com.ruoyi.web.controller.api;
 
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.model.TFaultAreaDic;
+import com.ruoyi.system.model.TFaultDescribeDic;
 import com.ruoyi.system.query.TFaultAreaDicQuery;
 import com.ruoyi.system.service.TFaultAreaDicService;
+import com.ruoyi.system.service.TFaultDescribeDicService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,9 +34,11 @@
 public class TFaultAreaDicController {
 
     private final TFaultAreaDicService faultAreaDicService;
+    private final TFaultDescribeDicService faultDescribeDicService;
     @Autowired
-    public TFaultAreaDicController(TFaultAreaDicService faultAreaDicService) {
+    public TFaultAreaDicController(TFaultAreaDicService faultAreaDicService, TFaultDescribeDicService faultDescribeDicService) {
         this.faultAreaDicService = faultAreaDicService;
+        this.faultDescribeDicService = faultDescribeDicService;
     }
 
     /**
@@ -50,7 +55,7 @@
     @ApiOperation(value = "获取故障区域列表")
     @PostMapping(value = "/list")
     public R<List<TFaultAreaDic>> list() {
-        return R.ok(faultAreaDicService.list());
+        return R.ok(faultAreaDicService.list(Wrappers.lambdaQuery(TFaultAreaDic.class).orderByDesc(TFaultAreaDic::getSortBy).orderByDesc(TFaultAreaDic::getCreateTime)));
     }
 
     /**
@@ -61,6 +66,9 @@
     @ApiOperation(value = "添加故障区域")
     @PostMapping(value = "/add")
     public R<Boolean> add(@Validated @RequestBody TFaultAreaDic dto) {
+        if (faultAreaDicService.isExit(dto)) {
+            return R.fail("故障区域名称已存在");
+        }
         return R.ok(faultAreaDicService.save(dto));
     }
 
@@ -72,6 +80,9 @@
     @ApiOperation(value = "修改故障区域")
     @PostMapping(value = "/update")
     public R<Boolean> update(@Validated @RequestBody TFaultAreaDic dto) {
+        if (faultAreaDicService.isExit(dto)) {
+            return R.fail("故障区域名称已存在");
+        }
         return R.ok(faultAreaDicService.updateById(dto));
     }
 
@@ -93,6 +104,9 @@
     @ApiOperation(value = "删除故障区域")
     @DeleteMapping(value = "/deleteById")
     public R<Boolean> deleteById(@RequestParam String id) {
+        // 删除故障描述关联信息
+        faultDescribeDicService.remove(Wrappers.lambdaQuery(TFaultDescribeDic.class)
+                .eq(TFaultDescribeDic::getFaultId, id));
         return R.ok(faultAreaDicService.removeById(id));
     }
 
@@ -104,6 +118,9 @@
     @ApiOperation(value = "批量删除故障区域")
     @DeleteMapping(value = "/deleteByIds")
     public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        // 删除故障描述关联信息
+        faultDescribeDicService.remove(Wrappers.lambdaQuery(TFaultDescribeDic.class)
+                .in(TFaultDescribeDic::getFaultId, ids));
         return R.ok(faultAreaDicService.removeByIds(ids));
     }
     
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
index 1917c1a..6152134 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
@@ -1,9 +1,21 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TInformation;
+import com.ruoyi.system.query.TInformationQuery;
+import com.ruoyi.system.service.TInformationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 
 /**
  * <p>
@@ -13,9 +25,80 @@
  * @author xiaochen
  * @since 2025-01-17
  */
+@Api(tags = "资讯管理")
 @RestController
 @RequestMapping("/t-information")
 public class TInformationController {
 
+    private final TInformationService informationService;
+    @Autowired
+    public TInformationController(TInformationService informationService) {
+        this.informationService = informationService;
+    }
+
+    /**
+     * 获取资讯管理管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:list')")
+    @ApiOperation(value = "获取资讯管理分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TInformation>> pageList(@RequestBody TInformationQuery query) {
+        return R.ok(informationService.pageList(query));
+    }
+
+    /**
+     * 添加资讯管理管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:add')")
+    @Log(title = "资讯管理信息-新增资讯管理", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加资讯管理")
+    @PostMapping(value = "/add")
+    public R<Boolean> add(@Validated @RequestBody TInformation dto) {
+        return R.ok(informationService.save(dto));
+    }
+
+    /**
+     * 修改资讯管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:update')")
+    @Log(title = "资讯管理信息-修改资讯管理", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改资讯管理")
+    @PostMapping(value = "/update")
+    public R<Boolean> update(@Validated @RequestBody TInformation dto) {
+        return R.ok(informationService.updateById(dto));
+    }
+
+    /**
+     * 查看资讯管理详情
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:detail')")
+    @ApiOperation(value = "查看资讯管理详情")
+    @GetMapping(value = "/getDetailById")
+    public R<TInformation> getDetailById(@RequestParam String id) {
+        return R.ok(informationService.getById(id));
+    }
+
+    /**
+     * 删除资讯管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:delete')")
+    @Log(title = "资讯管理信息-删除资讯管理", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除资讯管理")
+    @DeleteMapping(value = "/deleteById")
+    public R<Boolean> deleteById(@RequestParam String id) {
+        return R.ok(informationService.removeById(id));
+    }
+
+    /**
+     * 批量删除资讯管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:information:delete')")
+    @Log(title = "资讯管理信息-删除资讯管理", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "批量删除资讯管理")
+    @DeleteMapping(value = "/deleteByIds")
+    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        return R.ok(informationService.removeByIds(ids));
+    }
+    
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java
index 587af1d..b9cfe64 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java
@@ -1,9 +1,22 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TItem;
+import com.ruoyi.system.query.TItemQuery;
+import com.ruoyi.system.service.TItemService;
+import com.ruoyi.system.vo.TItemVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 
 /**
  * <p>
@@ -13,9 +26,80 @@
  * @author xiaochen
  * @since 2025-01-17
  */
+@Api(tags = "维修物品管理")
 @RestController
 @RequestMapping("/t-item")
 public class TItemController {
 
+    private final TItemService itemService;
+    @Autowired
+    public TItemController(TItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    /**
+     * 获取维修物品管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:list')")
+    @ApiOperation(value = "获取维修物品分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TItemVO>> pageList(@RequestBody TItemQuery query) {
+        return R.ok(itemService.pageList(query));
+    }
+
+    /**
+     * 添加维修物品管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:add')")
+    @Log(title = "维修物品信息-新增维修物品", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加维修物品")
+    @PostMapping(value = "/add")
+    public R<Boolean> add(@Validated @RequestBody TItem dto) {
+        return R.ok(itemService.save(dto));
+    }
+
+    /**
+     * 修改维修物品
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:update')")
+    @Log(title = "维修物品信息-修改维修物品", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改维修物品")
+    @PostMapping(value = "/update")
+    public R<Boolean> update(@Validated @RequestBody TItem dto) {
+        return R.ok(itemService.updateById(dto));
+    }
+
+    /**
+     * 查看维修物品详情
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:detail')")
+    @ApiOperation(value = "查看维修物品详情")
+    @GetMapping(value = "/getDetailById")
+    public R<TItem> getDetailById(@RequestParam String id) {
+        return R.ok(itemService.getById(id));
+    }
+
+    /**
+     * 删除维修物品
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:delete')")
+    @Log(title = "维修物品信息-删除维修物品", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除维修物品")
+    @DeleteMapping(value = "/deleteById")
+    public R<Boolean> deleteById(@RequestParam String id) {
+        return R.ok(itemService.removeById(id));
+    }
+
+    /**
+     * 批量删除维修物品
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:delete')")
+    @Log(title = "维修物品信息-删除维修物品", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "批量删除维修物品")
+    @DeleteMapping(value = "/deleteByIds")
+    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        return R.ok(itemService.removeByIds(ids));
+    }
+    
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
index eadbb05..01a651f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
@@ -1,9 +1,22 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TItemType;
+import com.ruoyi.system.query.TItemTypeQuery;
+import com.ruoyi.system.service.TItemTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 
 /**
  * <p>
@@ -13,9 +26,96 @@
  * @author xiaochen
  * @since 2025-01-17
  */
+@Api(tags = "维修物品分类管理")
 @RestController
 @RequestMapping("/t-item-type")
 public class TItemTypeController {
 
+    private final TItemTypeService itemTypeService;
+    @Autowired
+    public TItemTypeController(TItemTypeService itemTypeService) {
+        this.itemTypeService = itemTypeService;
+    }
+
+    /**
+     * 获取维修物品分类管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:itemType:list')")
+    @ApiOperation(value = "获取维修物品分类分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TItemType>> pageList(@RequestBody TItemTypeQuery query) {
+        return R.ok(itemTypeService.pageList(query));
+    }
+
+    /**
+     * 获取维修物品分类管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:itemType:list')")
+    @ApiOperation(value = "获取维修物品分类列表")
+    @PostMapping(value = "/list")
+    public R<List<TItemType>> list() {
+        return R.ok(itemTypeService.list(Wrappers.lambdaQuery(TItemType.class).orderByDesc(TItemType::getSortBy).orderByDesc(TItemType::getCreateTime)));
+    }
+
+    /**
+     * 添加维修物品分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:itemType:add')")
+    @Log(title = "维修物品分类信息-新增维修物品分类", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加维修物品分类")
+    @PostMapping(value = "/add")
+    public R<Boolean> add(@Validated @RequestBody TItemType dto) {
+        if (itemTypeService.isExit(dto)) {
+            return R.fail("维修物品分类名称已存在");
+        }
+        return R.ok(itemTypeService.save(dto));
+    }
+
+    /**
+     * 修改维修物品分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:itemType:update')")
+    @Log(title = "维修物品分类信息-修改维修物品分类", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改维修物品分类")
+    @PostMapping(value = "/update")
+    public R<Boolean> update(@Validated @RequestBody TItemType dto) {
+        if (itemTypeService.isExit(dto)) {
+            return R.fail("维修物品分类名称已存在");
+        }
+        return R.ok(itemTypeService.updateById(dto));
+    }
+
+    /**
+     * 查看维修物品分类详情
+     */
+    @PreAuthorize("@ss.hasPermi('system:itemType:detail')")
+    @ApiOperation(value = "查看维修物品分类详情")
+    @GetMapping(value = "/getDetailById")
+    public R<TItemType> getDetailById(@RequestParam String id) {
+        return R.ok(itemTypeService.getById(id));
+    }
+
+    /**
+     * 删除维修物品分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:itemType:delete')")
+    @Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除维修物品分类")
+    @DeleteMapping(value = "/deleteById")
+    public R<Boolean> deleteById(@RequestParam String id) {
+        return R.ok(itemTypeService.removeById(id));
+    }
+
+    /**
+     * 批量删除维修物品分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:itemType:delete')")
+    @Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "批量删除维修物品分类")
+    @DeleteMapping(value = "/deleteByIds")
+    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        return R.ok(itemTypeService.removeByIds(ids));
+    }
+    
 }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java
index c5b0c50..6938d02 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java
@@ -1,7 +1,12 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TInformation;
+import com.ruoyi.system.query.TInformationQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,11 @@
  */
 public interface TInformationMapper extends BaseMapper<TInformation> {
 
+    /**
+     * 获取资讯管理分页列表
+     * @param query
+     * @param pageInfo
+     * @return
+     */
+    List<TInformation> pageList(@Param("query") TInformationQuery query, @Param("pageInfo")PageInfo<TInformation> pageInfo);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemMapper.java
index 66635b1..0fda975 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemMapper.java
@@ -1,7 +1,13 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TItem;
+import com.ruoyi.system.query.TItemQuery;
+import com.ruoyi.system.vo.TItemVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,12 @@
  */
 public interface TItemMapper extends BaseMapper<TItem> {
 
+    /**
+     * 获取维修物品分页列表
+     * @param query
+     * @param pageInfo
+     * @return
+     */
+    List<TItemVO> pageList(@Param("query") TItemQuery query, @Param("pageInfo")PageInfo<TItemVO> pageInfo);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java
index f02e0a2..8b6aca6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java
@@ -1,7 +1,12 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TItemType;
+import com.ruoyi.system.query.TItemTypeQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,11 @@
  */
 public interface TItemTypeMapper extends BaseMapper<TItemType> {
 
+    /**
+     * 获取维修物品分类管理列表
+     * @param query
+     * @param pageInfo
+     * @return
+     */
+    List<TItemType> pageList(@Param("query") TItemTypeQuery query, @Param("pageInfo")PageInfo<TItemType> pageInfo);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
index 7abdadb..a298bb2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
@@ -40,6 +40,10 @@
     @TableField("contract_id")
     private String contractId;
 
+    @ApiModelProperty(value = "合同编号")
+    @TableField("contract_number")
+    private String contractNumber;
+
     @ApiModelProperty(value = "应缴费")
     @TableField("payable_fees_money")
     private BigDecimal payableFeesMoney;
@@ -92,9 +96,9 @@
     @TableField("bank_serial_number")
     private String bankSerialNumber;
 
-    @ApiModelProperty(value = "实际收款")
-    @TableField("actual_money")
-    private BigDecimal actualMoney;
+    @ApiModelProperty(value = "欠费金额")
+    @TableField("outstanding_money")
+    private BigDecimal outstandingMoney;
 
     @ApiModelProperty(value = "凭证上传")
     @TableField("voucher")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java
index 532ee46..93144fe 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java
@@ -13,6 +13,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 
@@ -36,6 +37,7 @@
     private String id;
 
     @NotBlank(message = "部门ID不能为空")
+    @Length(max = 10, message = "部门ID不能超过10个字符")
     @ApiModelProperty(value = "部门id")
     @TableField("dept_id")
     private String deptId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
index b57e911..7ebb8ff 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
@@ -14,6 +14,9 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 资讯管理
@@ -33,6 +36,7 @@
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
+    @NotBlank(message = "资讯标题不能为空")
     @ApiModelProperty(value = "标题")
     @TableField("title_name")
     private String titleName;
@@ -45,6 +49,7 @@
     @TableField("info_source")
     private String infoSource;
 
+    @NotNull(message = "请选择发布时间")
     @ApiModelProperty(value = "发布时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("release_time")
@@ -54,9 +59,12 @@
     @TableField("content")
     private String content;
 
-    @ApiModelProperty(value = "附件")
+    @ApiModelProperty(value = "附件 逗号分割 ")
     @TableField("attachment")
     private String attachment;
 
+    @ApiModelProperty(value = "附件名称  与附件顺序一致")
+    @TableField("attachment_name")
+    private String attachmentName;
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TInformationQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInformationQuery.java
new file mode 100644
index 0000000..d5a8e41
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInformationQuery.java
@@ -0,0 +1,15 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "咨询列表query")
+public class TInformationQuery extends BasePage {
+
+    @ApiModelProperty(value = "标题")
+    private String titleName;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TItemQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TItemQuery.java
new file mode 100644
index 0000000..7e1f9b9
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TItemQuery.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "维修物品query")
+public class TItemQuery extends BasePage {
+
+    @ApiModelProperty(value = "分类id")
+    private String typeId;
+
+    @ApiModelProperty(value = "物品名称")
+    private String itemName;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TItemTypeQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TItemTypeQuery.java
new file mode 100644
index 0000000..3b33ba0
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TItemTypeQuery.java
@@ -0,0 +1,10 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "维修物品分类query")
+public class TItemTypeQuery extends BasePage {
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultAreaDicService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultAreaDicService.java
index 1e4f8c3..5ef09fb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultAreaDicService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultAreaDicService.java
@@ -21,4 +21,11 @@
      * @return
      */
     PageInfo<TFaultAreaDic> pageList(TFaultAreaDicQuery query);
+
+    /**
+     * 判断区域是否存在
+     * @param dto
+     * @return
+     */
+    boolean isExit(TFaultAreaDic dto);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java
index 17c8d8e..5f30b03 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TInformation;
+import com.ruoyi.system.query.TInformationQuery;
 
 /**
  * <p>
@@ -13,4 +15,10 @@
  */
 public interface TInformationService extends IService<TInformation> {
 
+    /**
+     * 分页查询
+     * @param query
+     * @return
+     */
+    PageInfo<TInformation> pageList(TInformationQuery query);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemService.java
index 960a6e5..5cb9285 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemService.java
@@ -1,7 +1,10 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TItem;
+import com.ruoyi.system.query.TItemQuery;
+import com.ruoyi.system.vo.TItemVO;
 
 /**
  * <p>
@@ -13,4 +16,10 @@
  */
 public interface TItemService extends IService<TItem> {
 
+    /**
+     * 获取维修物品分页列表
+     * @param query
+     * @return
+     */
+    PageInfo<TItemVO> pageList(TItemQuery query);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java
index 7dced6d..d542486 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TItemType;
+import com.ruoyi.system.query.TItemTypeQuery;
 
 /**
  * <p>
@@ -13,4 +15,17 @@
  */
 public interface TItemTypeService extends IService<TItemType> {
 
+    /**
+     * 判断分类是否存在
+     * @param dto
+     * @return
+     */
+    boolean isExit(TItemType dto);
+
+    /**
+     * 获取维修物品分类分页列表
+     * @param query
+     * @return
+     */
+    PageInfo<TItemType> pageList(TItemTypeQuery query);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultAreaDicServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultAreaDicServiceImpl.java
index bd6f3be..094504b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultAreaDicServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultAreaDicServiceImpl.java
@@ -1,9 +1,12 @@
 package com.ruoyi.system.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.common.constant.DictConstants;
 import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.TFaultAreaDicMapper;
+import com.ruoyi.system.model.TDept;
 import com.ruoyi.system.model.TFaultAreaDic;
 import com.ruoyi.system.query.TFaultAreaDicQuery;
 import com.ruoyi.system.service.TFaultAreaDicService;
@@ -31,4 +34,15 @@
         pageInfo.setRecords(list);
         return pageInfo;
     }
+
+    @Override
+    public boolean isExit(TFaultAreaDic dto) {
+        if(StringUtils.isNotEmpty(dto.getId())){
+            // 修改
+            return this.count(Wrappers.lambdaQuery(TFaultAreaDic.class).ne(TFaultAreaDic::getId, dto.getId()).eq(TFaultAreaDic::getFaultAreaName, dto.getFaultAreaName())) > 0;
+        }else {
+            // 新增
+            return this.count(Wrappers.lambdaQuery(TFaultAreaDic.class).eq(TFaultAreaDic::getFaultAreaName, dto.getFaultAreaName())) > 0;
+        }
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java
index 550d6a4..282470c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java
@@ -1,10 +1,15 @@
 package com.ruoyi.system.service.impl;
 
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.mapper.TInformationMapper;
 import com.ruoyi.system.model.TInformation;
+import com.ruoyi.system.query.TInformationQuery;
 import com.ruoyi.system.service.TInformationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.vo.HouseVO;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +22,11 @@
 @Service
 public class TInformationServiceImpl extends ServiceImpl<TInformationMapper, TInformation> implements TInformationService {
 
+    @Override
+    public PageInfo<TInformation> pageList(TInformationQuery query) {
+        PageInfo<TInformation> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TInformation> list = this.baseMapper.pageList(query,pageInfo);
+        pageInfo.setRecords(list);
+        return pageInfo;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemServiceImpl.java
index 1d5a7a4..b3c9c84 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemServiceImpl.java
@@ -1,10 +1,16 @@
 package com.ruoyi.system.service.impl;
 
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.mapper.TItemMapper;
+import com.ruoyi.system.model.TInformation;
 import com.ruoyi.system.model.TItem;
+import com.ruoyi.system.query.TItemQuery;
 import com.ruoyi.system.service.TItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.vo.TItemVO;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +23,11 @@
 @Service
 public class TItemServiceImpl extends ServiceImpl<TItemMapper, TItem> implements TItemService {
 
+    @Override
+    public PageInfo<TItemVO> pageList(TItemQuery query) {
+        PageInfo<TItemVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TItemVO> list = this.baseMapper.pageList(query,pageInfo);
+        pageInfo.setRecords(list);
+        return pageInfo;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java
index bc8a264..8696828 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java
@@ -1,10 +1,18 @@
 package com.ruoyi.system.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.TItemTypeMapper;
+import com.ruoyi.system.model.TContract;
+import com.ruoyi.system.model.TFaultAreaDic;
 import com.ruoyi.system.model.TItemType;
+import com.ruoyi.system.query.TItemTypeQuery;
 import com.ruoyi.system.service.TItemTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +25,22 @@
 @Service
 public class TItemTypeServiceImpl extends ServiceImpl<TItemTypeMapper, TItemType> implements TItemTypeService {
 
+    @Override
+    public boolean isExit(TItemType dto) {
+        if(StringUtils.isNotEmpty(dto.getId())){
+            // 修改
+            return this.count(Wrappers.lambdaQuery(TItemType.class).ne(TItemType::getId, dto.getId()).eq(TItemType::getTypeName, dto.getTypeName())) > 0;
+        }else {
+            // 新增
+            return this.count(Wrappers.lambdaQuery(TItemType.class).eq(TItemType::getTypeName, dto.getTypeName())) > 0;
+        }
+    }
+
+    @Override
+    public PageInfo<TItemType> pageList(TItemTypeQuery query) {
+        PageInfo<TItemType> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TItemType> list = this.baseMapper.pageList(query,pageInfo);
+        pageInfo.setRecords(list);
+        return pageInfo;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TItemVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TItemVO.java
new file mode 100644
index 0000000..f2b2943
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TItemVO.java
@@ -0,0 +1,15 @@
+package com.ruoyi.system.vo;
+
+import com.ruoyi.system.model.TItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "维修物品VO")
+public class TItemVO extends TItem {
+
+    @ApiModelProperty(value = "分类名称")
+    private String typeName;
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
index 82f6ac0..27290d9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TBill">
         <id column="id" property="id" />
         <result column="contract_id" property="contractId" />
+        <result column="contract_number" property="contractNumber" />
         <result column="payable_fees_money" property="payableFeesMoney" />
         <result column="payable_fees_time" property="payableFeesTime" />
         <result column="pay_fees_status" property="payFeesStatus" />
@@ -18,7 +19,7 @@
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="bank_serial_number" property="bankSerialNumber" />
-        <result column="actual_money" property="actualMoney" />
+        <result column="outstanding_money" property="outstandingMoney" />
         <result column="voucher" property="voucher" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -29,7 +30,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, contract_id, payable_fees_money, payable_fees_time, pay_fees_status, pay_fees_money, pay_fees_time, pay_fees_type, bill_type, over_days, payable_fees_penalty, start_time, end_time, bank_serial_number, actual_money, voucher, create_time, update_time, create_by, update_by, disabled
+        id, contract_id,contract_number, payable_fees_money, payable_fees_time, pay_fees_status, pay_fees_money, pay_fees_time, pay_fees_type, bill_type, over_days, payable_fees_penalty, start_time, end_time, bank_serial_number, outstanding_money, voucher, create_time, update_time, create_by, update_by, disabled
     </sql>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml
index 7702ec8..cb2bf60 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml
@@ -22,7 +22,7 @@
         SELECT <include refid="Base_Column_List"></include>
         FROM t_fault_area_dic
         WHERE disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
-        ORDER BY create_time DESC
+        ORDER BY sort_by,create_time DESC
     </select>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultDescribeDicMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultDescribeDicMapper.xml
index 7baa338..e59678a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFaultDescribeDicMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFaultDescribeDicMapper.xml
@@ -24,7 +24,7 @@
         <include refid="Base_Column_List"/>
         from t_fault_describe_dic
         where disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
-        ORDER BY create_time DESC
+        ORDER BY sort_by,create_time DESC
     </select>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
index afc5584..12c6526 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
@@ -11,6 +11,7 @@
         <result column="release_time" property="releaseTime" />
         <result column="content" property="content" />
         <result column="attachment" property="attachment" />
+        <result column="attachment_name" property="attachmentName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
         <result column="create_by" property="createBy" />
@@ -20,7 +21,19 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, title_name, sort_by, info_source, release_time, content, attachment, create_time, update_time, create_by, update_by, disabled
+        id, title_name, sort_by, info_source, release_time, content, attachment,attachment_name, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.model.TInformation">
+        select
+        <include refid="Base_Column_List"/>
+        from t_information
+        <where>
+            <if test="query.titleName != null and query.titleName != ''">
+                and title_name like concat('%',#{query.titleName},'%')
+            </if>
+            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+        </where>
+        ORDER BY sort_by,create_time DESC
+    </select>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml
index 2bdea94..84d057e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml
@@ -20,5 +20,22 @@
     <sql id="Base_Column_List">
         id, type_id, item_name, sort_by, pictures, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.vo.TItemVO">
+        select
+        t.id, t.type_id, t.item_name, t.sort_by, t.pictures, t.create_time, t.update_time, t.create_by, t.update_by, t.disabled
+        tt.type_name
+        from t_item t
+        left join t_item_type tt on t.type_id = tt.id
+        <where>
+            <if test="query.itemName != null and query.itemName != ''">
+                and t.item_name like concat('%', #{query.itemName}, '%')
+            </if>
+            <if test="query.typeId != null and query.typeId != ''">
+                and t.type_id = #{query.typeId}
+            </if>
+            and t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+        </where>
+        order by t.sort_by, t.create_time desc
+    </select>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml
index d39ad76..51d9e9a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml
@@ -18,5 +18,12 @@
     <sql id="Base_Column_List">
         id, type_name, sort_by, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.model.TItemType">
+        select
+        <include refid="Base_Column_List"/>
+        from t_item_type
+        where disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+        ORDER BY sort_by,create_time DESC
+    </select>
 
 </mapper>

--
Gitblit v1.7.1