From bf44ae2dd15b2b139ce56b1ba1294fdfd220c763 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 25 十二月 2024 17:13:34 +0800 Subject: [PATCH] #问题修复 1. 列表字段空间调整 2. 地址链接放至配置文件中 3. 定时任务执行完成后,状态修改补上 4. 修改状态时,需校验上一步状态是否对应 5. 下发任务完成后,查看是否修改状态为2 7. 任务状态列表,数据显示不全问题修复 8. 波次列表,表格合并问题导致多订单出库问题 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java | 55 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java index c1a46c8..f8c6e67 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java @@ -1,26 +1,29 @@ -package com.zy.asrs.wms.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zy.asrs.wms.system.entity.User; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Map; - -@Mapper -@Repository -public interface UserMapper extends BaseMapper<User> { - - List<User> selectPageRel(@Param("page") IPage<User> page, @Param("param") Map<String, Object> param); - - @InterceptorIgnore(tenantLine = "true") - User selectByUsername(@Param("username") String username, @Param("hostId") Long hostId); - - @InterceptorIgnore(tenantLine = "true") - User superGetById(@Param("id") Long id); - -} +package com.zy.asrs.wms.system.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zy.asrs.wms.system.entity.User; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +@Mapper +@Repository +public interface UserMapper extends BaseMapper<User> { + + List<User> selectPageRel(@Param("page") IPage<User> page, @Param("param") Map<String, Object> param); + + @InterceptorIgnore(tenantLine = "true") + User selectByUsername(@Param("username") String username, @Param("hostId") Long hostId); + + @InterceptorIgnore(tenantLine = "true") + User superGetById(@Param("id") Long id); + + @InterceptorIgnore(tenantLine = "true") + int removeByHostId(Long hostId); + +} -- Gitblit v1.9.1