diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java index 6ad9e81..12cc3da 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java @@ -76,6 +76,19 @@ public class AssetCurrentController extends BaseController { return success(assetCurrentService.page(page, as)); } + /** + * 查询所有数据(带子表) + * + * @param as 查询实体 + * @return 所有数据 + */ + @ApiOperation(value = "查询所有数据(带子表)", response = AssetCurrent.class) + @GetMapping("/selectAllAsset") + public AjaxResult selectAllAsset(AssetCurrentPageRequest as) { + return success(assetCurrentService.selectAllAsset(as)); + } + + /** * 通过主键查询单条数据 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java index e76bc97..7bbfcd3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java @@ -41,5 +41,10 @@ public interface AssetCurrentMapper extends BaseMapper { * @param idList */ void deleteIdList(@Param("idList") List idList); + + /** + * 查询所有数据(带子表) + */ + List selectAllAsset(AssetCurrentPageRequest as); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java index ef7d486..00acdd8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java @@ -52,5 +52,10 @@ public interface AssetCurrentService extends IService { * @param idList */ void deleteIdList(List idList); + + /** + * 查询所有数据(带子表) + */ + List selectAllAsset(AssetCurrentPageRequest as); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java index d03aa56..d9a5f8c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java @@ -100,5 +100,13 @@ public class AssetCurrentServiceImpl extends ServiceImpl idList) { baseMapper.deleteIdList(idList); } + + /** + * 查询所有数据(带子表) + */ + @Override + public List selectAllAsset(AssetCurrentPageRequest as) { + return baseMapper.selectAllAsset(as); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml index e5d2696..f2b28e8 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml @@ -146,4 +146,7 @@ set del_flag = '2' where id = #{id} + \ No newline at end of file