guoyujia há 8 meses atrás
pai
commit
d84396c514

+ 2 - 0
src/main/java/cn/ezhizao/project/business/domain/BizStorageRetrieval.java

@@ -102,5 +102,7 @@ public class BizStorageRetrieval extends BaseEntity
     private String endRetrievalTime;
     private String endRetrievalTime;
     @TableField(exist = false)
     @TableField(exist = false)
     private String remark;
     private String remark;
+    @TableField(exist = false)
+    private String storagerUserName;
 
 
 }
 }

+ 2 - 1
src/main/resources/mybatis/business/BizStorageRetrievalMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
 
     <select id="getList" parameterType="BizStorageRetrieval" resultMap="BizStorageRetrievalResult">
     <select id="getList" parameterType="BizStorageRetrieval" resultMap="BizStorageRetrievalResult">
-        SELECT t1.*,t2.dept_name,(select nick_name from sys_user where t1.storager_id = user_id) as storagerName,(select nick_name from sys_user where t1.retrievaler_id = user_id) as retrievalerName FROM biz_storage_retrieval t1
+        SELECT t1.*,t2.dept_name,(select nick_name from sys_user where t1.storager_id = user_id) as storagerName,(select user_name from sys_user where t1.storager_id = user_id) as storagerUserName,(select nick_name from sys_user where t1.retrievaler_id = user_id) as retrievalerName FROM biz_storage_retrieval t1
         left join sys_dept t2 on t1.dept_id = t2.dept_id
         left join sys_dept t2 on t1.dept_id = t2.dept_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             t1.deleted = 0
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="retrievalLotCode != null  and retrievalLotCode != ''"> AND t1.retrieval_lot_code like concat('%',#{retrievalLotCode},'%')</if>
             <if test="retrievalLotCode != null  and retrievalLotCode != ''"> AND t1.retrieval_lot_code like concat('%',#{retrievalLotCode},'%')</if>
             <if test="retrievalerName != null"> AND exists(select 1 from sys_user t3 where t3.user_id = t1.retrieval_id and t3.nick_name like concat('%',#{retrievalerName},'%'))</if>
             <if test="retrievalerName != null"> AND exists(select 1 from sys_user t3 where t3.user_id = t1.retrieval_id and t3.nick_name like concat('%',#{retrievalerName},'%'))</if>
             <if test="storagerName != null"> AND exists(select 1 from sys_user t4 where t4.user_id = t1.storager_id and t4.nick_name like concat('%',#{storagerName},'%'))</if>
             <if test="storagerName != null"> AND exists(select 1 from sys_user t4 where t4.user_id = t1.storager_id and t4.nick_name like concat('%',#{storagerName},'%'))</if>
+            <if test="storagerUserName != null"> AND exists(select 1 from sys_user t5 where t5.user_id = t1.storager_id and t5.user_name like concat('%',#{storagerUserName},'%'))</if>
             <if test="startStorageTime != null ">AND t1.create_time &gt; #{startStorageTime}</if>
             <if test="startStorageTime != null ">AND t1.create_time &gt; #{startStorageTime}</if>
             <if test="endStorageTime != null ">AND t1.create_time &lt; #{endStorageTime}</if>
             <if test="endStorageTime != null ">AND t1.create_time &lt; #{endStorageTime}</if>
             <if test="startRetrievalTime != null ">AND t1.retrieval_time &gt; #{startRetrievalTime}</if>
             <if test="startRetrievalTime != null ">AND t1.retrieval_time &gt; #{startRetrievalTime}</if>