From b87c91473946009a31df19eabb77de1239e43c7c Mon Sep 17 00:00:00 2001 From: syruan <1555146157@163.com> Date: Sat, 23 Dec 2023 15:24:52 +0800 Subject: [PATCH] =?UTF-8?q?maCode=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/LeaseOutDetailsController.java | 6 +++--- .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java | 4 ++-- .../src/main/resources/mapper/base/MaMachineMapper.xml | 5 +---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index 597e4426..44bdd5f1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -34,13 +34,13 @@ public class LeaseOutDetailsController extends BaseController { /** * 根据code编码查询设备信息 - * @param mCode 机具编码 + * @param maCode 机具编码 * @return 设备信息 */ @Log(title = "根据code编码获取设备信息", businessType = BusinessType.QUERY) @GetMapping("/getMaMachineByCode") - public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String mCode) { - return getDataTable(leaseOutDetailsService.getMaMachineByCode(mCode)); + public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String maCode) { + return getDataTable(leaseOutDetailsService.getMaMachineByCode(maCode)); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 204ed090..e856eba9 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -83,8 +83,8 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { } /** - * @param maMachine - * @return + * @param maCode 编码ID + * @return 数据 */ @Override public List getMaMachineByCode(String maCode) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml index 0d3c7320..745aa5fa 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml @@ -69,10 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ma_type mt1 on mt.parent_id = mt1.type_id left join ma_type mt2 on mt1.parent_id = mt2.type_id left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id - - m.ma_code = #{maCode} - - order by m.ma_id desc + where m.ma_code = #{maCode}