diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java index 8eb5a774a..dd6d912f4 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java @@ -13,7 +13,6 @@ import java.util.List; * 针对表【device_check_detail(巡检任务明细)】的数据库操作Mapper */ public interface DeviceCheckDetailMapper extends BaseMapperPlus { - List pageListDetail(CheckDetailQuery query); } diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceReceiveOrderDetailDao.java b/src/main/java/com/glxp/api/dao/dev/DeviceReceiveOrderDetailDao.java index 22c191a24..85d6535fa 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceReceiveOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceReceiveOrderDetailDao.java @@ -50,17 +50,4 @@ public interface DeviceReceiveOrderDetailDao extends BaseMapper details); - - /** - * 重置code字段和序列号字段值 - * - * @param orderId - */ - void resetCode(@Param("orderId") String orderId); } diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java index 2a34897da..2decd42fc 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery; import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,6 +16,7 @@ import java.util.List; * @createDate 2023-12-07 17:15:49 * @Entity com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity */ +@Mapper public interface DeviceRepairApplyDetailMapper extends BaseMapperPlus { List miniPage(@Param("param") DeviceRepairApplyDetailMiniQuery query); diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java index d86b7a28a..206dafcf0 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java @@ -3,6 +3,7 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceRepairApplyEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * @author Administrator @@ -10,6 +11,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-12-07 17:15:49 * @Entity com.glxp.api.entity.dev.DeviceRepairApplyEntity */ + +@Mapper public interface DeviceRepairApplyMapper extends BaseMapperPlus { } diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java index 1b49be573..0729ac6c2 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java @@ -3,6 +3,7 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceRepairEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * @author Administrator @@ -10,6 +11,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-12-07 17:15:49 * @Entity com.glxp.api.entity.dev.DeviceRepairEntity */ + +@Mapper public interface DeviceRepairMapper extends BaseMapperPlus { } diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceRepairOrderDao.java b/src/main/java/com/glxp/api/dao/dev/DeviceRepairOrderDao.java index 13e143a46..737370dea 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceRepairOrderDao.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceRepairOrderDao.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.dev.DeviceRepairOrderEntity; import com.glxp.api.req.dev.FilterDeviceRepairOrderRequest; import com.glxp.api.res.dev.DeviceRepairOrderResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface DeviceRepairOrderDao extends BaseMapper { /** diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailItemMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailItemMapper.java index 59cba6bcc..824f16114 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailItemMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailItemMapper.java @@ -2,10 +2,13 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity; +import org.apache.ibatis.annotations.Mapper; /** * 针对表【device_upkeep_detail_item(设备保养项目)】的数据库操作Mapper */ + +@Mapper public interface DeviceUpkeepDetailItemMapper extends BaseMapperPlus { } diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailMapper.java index 00eda3c76..32666c234 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailMapper.java @@ -2,10 +2,13 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceUpkeepDetailEntity; +import org.apache.ibatis.annotations.Mapper; /** * 针对表【device_upkeep_detail(保养任务明细)】的数据库操作Mapper */ + +@Mapper public interface DeviceUpkeepDetailMapper extends BaseMapperPlus { } diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java index 388268766..562e701a0 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java @@ -8,6 +8,7 @@ import com.glxp.api.req.dev.DeviceUpkeepQuery; import com.glxp.api.vo.dev.DeviceCheckVo; import com.glxp.api.vo.dev.DeviceUpkeepDetailVo; import com.glxp.api.vo.dev.DeviceUpkeepVo; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,6 +16,8 @@ import java.util.List; /** * 针对表【device_upkeep(保养任务表)】的数据库操作Mapper */ + +@Mapper public interface DeviceUpkeepMapper extends BaseMapperPlus { List pageVo(DeviceUpkeepQuery query); diff --git a/src/main/java/com/glxp/api/dao/dev/InvMAExplanationDao.java b/src/main/java/com/glxp/api/dao/dev/InvMAExplanationDao.java index f902a4b99..5f85f0989 100644 --- a/src/main/java/com/glxp/api/dao/dev/InvMAExplanationDao.java +++ b/src/main/java/com/glxp/api/dao/dev/InvMAExplanationDao.java @@ -2,7 +2,10 @@ package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.dev.InvMAExplanationEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper public interface InvMAExplanationDao extends BaseMapper { /** diff --git a/src/main/java/com/glxp/api/dao/dev/InvMAOrderDao.java b/src/main/java/com/glxp/api/dao/dev/InvMAOrderDao.java index 9ed41b4a3..e44cf3cd6 100644 --- a/src/main/java/com/glxp/api/dao/dev/InvMAOrderDao.java +++ b/src/main/java/com/glxp/api/dao/dev/InvMAOrderDao.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.dev.InvMAOrderEntity; import com.glxp.api.req.dev.FilterInvMAOrderRequest; import com.glxp.api.res.dev.InvMAOrderResponse; +import org.apache.ibatis.annotations.Mapper; import java.util.List; +@Mapper + public interface InvMAOrderDao extends BaseMapper { /** diff --git a/src/main/java/com/glxp/api/dao/dev/InvMAOrderDetailDao.java b/src/main/java/com/glxp/api/dao/dev/InvMAOrderDetailDao.java index c3d5d9515..451e29f89 100644 --- a/src/main/java/com/glxp/api/dao/dev/InvMAOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/dev/InvMAOrderDetailDao.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.dev.InvMAOrderDetailEntity; import com.glxp.api.req.dev.FilterInvMAOrderDetailRequest; import com.glxp.api.res.dev.InvMAOrderDetailResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface InvMAOrderDetailDao extends BaseMapper { /** diff --git a/src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDetailDao.xml b/src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDetailDao.xml index 106ecdd58..929a7795e 100644 --- a/src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDetailDao.xml @@ -101,23 +101,4 @@ limit 1 - - - update device_receive_order_detail - - - code = #{item.code} - - - where id = #{item.id} - - - - - update device_receive_order_detail - set code = null, - serialNo = null - where orderIdFk = #{orderId} - and code like '%#' - diff --git a/src/main/resources/mybatis/mapper/dev/DeviceUpkeepDetailItemMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceUpkeepDetailItemMapper.xml new file mode 100644 index 000000000..8c3140a24 --- /dev/null +++ b/src/main/resources/mybatis/mapper/dev/DeviceUpkeepDetailItemMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/main/resources/mybatis/mapper/dev/DeviceUpkeepDetailMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceUpkeepDetailMapper.xml new file mode 100644 index 000000000..8173d9614 --- /dev/null +++ b/src/main/resources/mybatis/mapper/dev/DeviceUpkeepDetailMapper.xml @@ -0,0 +1,6 @@ + + + + + +