问题修改

src/main/java/com/tld/controller/GsAccessController.java

@@ -140,4 +140,37 @@ public class GsAccessController {
         return inviteService.transferNotice(mapList);
     }
 
+    /**
+     * 入库通知（其他收货通知_青岛工厂）/入库通知（其他收货）
+     * @param mapList 参数
+     * @return 返回结果
+     */
+    @PostMapping("otherReceivingGoods")
+    @PassToken
+    public Map<String, Object> otherReceivingGoods(@RequestBody List<Map<String,Object>> mapList){
+        return inviteService.otherReceivingGoods(mapList);
+    }
+
+    /**
+     * 要货申请制单（其他发货通知_青岛工厂）/其他出库
+     * @param mapList 参数
+     * @return 返回结果
+     */
+    @PostMapping("otherShipments")
+    @PassToken
+    public Map<String, Object> otherShipments(@RequestBody List<Map<String,Object>> mapList){
+        return inviteService.otherShipments(mapList);
+    }
+
+
+    /**
+     * 要货申请制单（补领料申请_青岛工厂）/补领料申请
+     * @param mapList 参数
+     * @return 返回结果
+     */
+    @PostMapping("sStoresRequisition")
+    @PassToken
+    public Map<String, Object> sStoresRequisition(@RequestBody List<Map<String,Object>> mapList){
+        return inviteService.sStoresRequisition(mapList);
+    }
 }

src/main/java/com/tld/controller/QueryListController.java

@@ -236,5 +236,16 @@ public class QueryListController {
     public void onOffExcel(Access access, HttpServletResponse response){
         queryListService.onOffExcel(access, response);
     }
+
+    /**
+     * 查询其它入库
+     * @param notice 参数
+     * @return 返回结果
+     */
+    @GetMapping("getOtherReceivingGoods")
+    public Map<String, Object> getOtherReceivingGoods(Notice notice){
+        return queryListService.getOtherReceivingGoods(notice);
+    }
+
 }
 

src/main/java/com/tld/mapper/InviteMapper.java

@@ -91,4 +91,10 @@ public interface InviteMapper {
     Map<String, Object> getDelAskGoods(String id);
 
     void delAskGoods(String id);
+
+    void otherReceivingGoods(List<Map<String, Object>> mapList);
+
+    void otherShipments(List<Map<String, Object>> mapList);
+
+    void sStoresRequisition(List<Map<String, Object>> mapList);
 }

src/main/java/com/tld/mapper/QueryListMapper.java

@@ -55,4 +55,6 @@ public interface QueryListMapper {
     String getAmount(AskGoods goods);
 
     String getAmounts(Delivery delivery1);
+
+    List<Notice> getOtherReceivingGoods(Notice notice);
 }

src/main/java/com/tld/service/InviteService.java

@@ -27,4 +27,10 @@ public interface InviteService {
     Map<String, Object> transferNotice(List<Map<String, Object>> mapList);
 
     Map<String, Object> delAskGoods(String id, HttpServletRequest request);
+
+    Map<String, Object> otherReceivingGoods(List<Map<String, Object>> mapList);
+
+    Map<String, Object> otherShipments(List<Map<String, Object>> mapList);
+
+    Map<String, Object> sStoresRequisition(List<Map<String, Object>> mapList);
 }

src/main/java/com/tld/service/QueryListService.java

@@ -53,4 +53,6 @@ public interface QueryListService {
     void getErrorExcel(Error error, HttpServletResponse response);
 
     Map<String, Object> anew(Error error);
+
+    Map<String, Object> getOtherReceivingGoods(Notice notice);
 }

src/main/java/com/tld/service/impl/InviteServiceImpl.java

@@ -295,6 +295,81 @@ public class InviteServiceImpl implements InviteService {
         return map;
     }
 
+    /**
+    * @Description: 其他收货/其它入库
+    * @Param: List<Map<String, Object>> mapList
+    * @return: Map<String, Object> map
+    * @Author: XiaoChen
+    * @Date: 2023/4/11
+    */
+    @Override
+    public Map<String, Object> otherReceivingGoods(List<Map<String, Object>> mapList) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            inviteMapper.otherReceivingGoods(mapList);
+            //新增日志
+            Access access = new Access().setType("其他入库").setData(JSON.toJSONString(mapList)).setAccessType("0");
+            dictionaryMapper.addAccess(access);
+            map.put("status", "0000");
+            map.put("msg","成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("status", "0009");
+            map.put("msg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    /**
+    * @Description: 其它出库
+    * @Param: List<Map<String, Object>> mapList
+    * @return: Map<String, Object> map
+    * @Author: XiaoChen
+    * @Date: 2023/4/11
+    */
+    @Override
+    public Map<String, Object> otherShipments(List<Map<String, Object>> mapList) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            inviteMapper.otherShipments(mapList);
+            //新增日志
+            Access access = new Access().setType("其它出库").setData(JSON.toJSONString(mapList)).setAccessType("0");
+            dictionaryMapper.addAccess(access);
+            map.put("status", "0000");
+            map.put("msg","成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("status", "0009");
+            map.put("msg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    /**
+    * @Description: 补领料申请
+    * @Param: List<Map<String, Object>> mapList
+    * @return: Map<String, Object> map
+    * @Author: XiaoChen
+    * @Date: 2023/4/11
+    */
+    @Override
+    public Map<String, Object> sStoresRequisition(List<Map<String, Object>> mapList) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            inviteMapper.sStoresRequisition(mapList);
+            //新增日志
+            Access access = new Access().setType("领料申请").setData(JSON.toJSONString(mapList)).setAccessType("0");
+            dictionaryMapper.addAccess(access);
+            map.put("status", "0000");
+            map.put("msg","成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("status", "0009");
+            map.put("msg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 出库单生成
      * @return

src/main/java/com/tld/service/impl/QueryListServiceImpl.java

@@ -270,6 +270,9 @@ public class QueryListServiceImpl implements QueryListService {
         }
     }
 
+    /**
+     * 查询移库单
+     * */
     @Override
     public Map<String, Object> getWarehouseTransfer(WarehouseTransfer warehouseTransfer) {
         Map<String, Object> map = new HashMap<>();
@@ -607,4 +610,27 @@ public class QueryListServiceImpl implements QueryListService {
         }
         return mapVal;
     }
+
+    /**
+    * @Description: 查询其它入库
+    * @Param: notice 参数
+    * @return: Map<String, Object> map
+    * @Author: XiaoChen
+    * @Date: 2023/4/11
+    */
+    @Override
+    public Map<String, Object> getOtherReceivingGoods(Notice notice) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            PageHelper.startPage(notice.getPage(), notice.getLimit());
+            PageInfo<Notice> list = new PageInfo<>(queryListMapper.getOtherReceivingGoods(notice));
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

src/main/java/com/tld/service/impl/UserServiceImpl.java

@@ -164,7 +164,6 @@ public class UserServiceImpl implements UserService {
             //表头数据
             List<Object> head = Arrays.asList("用户编号", "用户名", "真实姓名","邮箱","电话", "手机", "部门", "角色");
             //查询数据
-            PageHelper.startPage(1, 10);
             List<Map<String, Object>> list = userMapper.getUserExportData(user);
             sheetDataList.add(head);
             for(Map<String, Object> userMap : list){

src/main/resources/mapper/ContainerMapper.xml

@@ -38,6 +38,9 @@
             <if test="containerName != null and containerName != ''">
                 and a.container_name like CONCAT(CONCAT('%', #{containerName}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and c.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="department != null and department != ''">
                 and b.name like CONCAT(CONCAT('%', #{department}), '%')
             </if>
@@ -90,6 +93,7 @@
             a.create_time
         from tld_container a
         left join tld_department b on a.department = b.code
+        left join tld_user c on a.modify_user = c.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="department != null and department != ''">
                 and a.department = #{department}
@@ -103,6 +107,9 @@
             <if test="containerName != null and containerName != ''">
                 and a.container_name = #{containerName}
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and c.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
         </trim>
         order by a.id desc
     </select>

src/main/resources/mapper/DictionaryMapper.xml

@@ -134,37 +134,41 @@
     <!--物料字典导出-->
     <select id="export" resultType="java.util.LinkedHashMap">
         select
-            code,
-            name,
-            if(part_type = '', null , part_type),
-            if(wllb_class = '', null , wllb_class),
-            if(size = '', null , size),
-            if(max_num = '', null , max_num),
-            if(min_num = '', null , min_num),
-            if(is_not_disable = '1', '是' , '否'),
-            if(is_recommend = '1', '是' , '否' )
-        from tld_material
+            a.code,
+            a.name,
+            if(a.part_type = '', null , a.part_type),
+            if(a.wllb_class = '', null ,a.wllb_class),
+            if(a.size = '', null , size),
+            if(a.max_num = '', null , a.max_num),
+            if(a.min_num = '', null , a.min_num),
+            if(a.is_not_disable = '1', '是' , '否'),
+            if(a.is_recommend = '1', '是' , '否' )
+        from tld_material a
+        left join tld_user f on a.modify_user = f.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="name != null and name != ''">
-                and name like CONCAT(CONCAT('%', #{name}), '%')
+                and a.name like CONCAT(CONCAT('%', #{name}), '%')
             </if>
             <if test="code != null and code != ''">
-                and code like CONCAT(CONCAT('%', #{code}), '%')
+                and a.code like CONCAT(CONCAT('%', #{code}), '%')
             </if>
             <if test="wllbClass != null and wllbClass != ''">
-                and wllb_class like CONCAT(CONCAT('%', #{wllbClass}), '%')
+                and a.wllb_class like CONCAT(CONCAT('%', #{wllbClass}), '%')
             </if>
             <if test="materialType != null and materialType != ''">
-                and part_type like CONCAT(CONCAT('%', #{materialType}), '%')
+                and a.part_type like CONCAT(CONCAT('%', #{materialType}), '%')
+            </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and f.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
             </if>
             <if test="isNotDisable != null and isNotDisable != ''">
-                and is_not_disable = #{isNotDisable}
+                and a.is_not_disable = #{isNotDisable}
             </if>
             <if test="isRecommend != null and isRecommend != ''">
-                and is_recommend = #{isRecommend}
+                and a.is_recommend = #{isRecommend}
             </if>
             <if test="tldId != null and tldId != ''">
-                and tld_id = #{tldId}
+                and a.tld_id = #{tldId}
             </if>
         </trim>
         order by id desc
@@ -189,6 +193,9 @@
             <if test="materialType != null and materialType != ''">
                 and a.part_type like CONCAT(CONCAT('%', #{materialType}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and f.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="isNotDisable != null and isNotDisable != ''">
                 and a.is_not_disable = #{isNotDisable}
             </if>

src/main/resources/mapper/InviteMapper.xml

@@ -370,6 +370,81 @@
         </foreach>
         ;
     </insert>
+    <!--其它入库-->
+    <insert id="otherReceivingGoods">
+        insert into tld_notices_f (notice_id, notice_code, company_number, notice_time, source_type, move_type,notification_type_number,notification_type_name)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (#{item.stockInNoticeId},#{item.stockInNoticeNo},#{item.companyNo},#{item.noticeDate},#{item.sourceType},#{item.moveType},#{item.notificationTypeNumber},#{item.notificationTypeName})
+        </foreach>
+        ;
+        insert into tld_notices ( notice_id, entry_number, material_id, wbs, measurement_id, num, type, warehousing_num )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.stockInNoticeId},#{items.entryNumber},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0)
+            </foreach>
+        </foreach>
+        ;
+        insert into tld_notices_log (notice_id, notice_code, company_number, notice_time, source_type, move_type,notification_type_number,notification_type_name,entry_number, material_id, wbs, measurement_id, num, type, warehousing_num)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.stockInNoticeId},#{item.stockInNoticeNo},#{item.companyNo},#{item.noticeDate},#{item.sourceType},#{item.moveType} ,#{item.notificationTypeNumber},#{item.notificationTypeName} ,#{items.entryNumber},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0)
+            </foreach>
+        </foreach>
+        ;
+    </insert>
+    <!--其他出库-->
+    <insert id="otherShipments">
+        insert into tld_enquiry_f (ask_goods_id, ask_goods_code, company_number, sqrq, department, request_type_number,request_type_name,source_type,move_type,if_commodity)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (#{item.requestOrderId},#{item.requestOrderNo},#{item.companyNo},#{item.applicationDate},#{item.useDepartment},#{item.requestTypeNumber},#{item.requestTypeName},#{item.sourceType},#{item.moveType},#{item.ifCommodity})
+        </foreach>
+        ;
+        insert into tld_enquiry ( ask_goods_id, entry_number, material_id, wbs, measurement_id, num, out_num, ask_goods_type )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.requestOrderId},#{items.entryNumber},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0)
+            </foreach>
+        </foreach>
+        ;
+        insert into tld_enquiry_log (ask_goods_id, ask_goods_code, company_number, sqrq, department, request_type_number,request_type_name,source_type,move_type,if_commodity, entry_number, material_id, wbs, measurement_id, num, out_num, ask_goods_type)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.requestOrderId},#{item.requestOrderNo},#{item.companyNo},#{item.applicationDate},#{item.useDepartment},#{item.requestTypeNumber},#{item.requestTypeName},#{item.sourceType},#{item.moveType},#{item.ifCommodity},#{items.entryNumber},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0)
+            </foreach>
+        </foreach>
+        ;
+    </insert>
+    <!--补领料申请-->
+    <insert id="sStoresRequisition">
+        insert into tld_enquirys_f (ask_goods_id, ask_goods_code, company_number, sqrq, department, request_type_number,request_type_name,source_type,move_type,if_commodity,product_code)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (#{item.requestOrderId},#{item.requestOrderNo},#{item.companyNo},#{item.applicationDate},#{item.useDepartment},#{item.requestTypeNumber},#{item.requestTypeName},#{item.sourceType},#{item.moveType},#{item.ifCommodity},#{item.productCode})
+        </foreach>
+        ;
+        insert into tld_enquirys ( ask_goods_id, entry_number,production_code, material_id, wbs, measurement_id, num, out_num, ask_goods_type )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.requestOrderId},#{items.entryNumber},#{items.prodOrderNo},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0)
+            </foreach>
+        </foreach>
+        ;
+        insert into tld_enquirys_log (ask_goods_id, ask_goods_code, company_number, sqrq, department, request_type_number,request_type_name,source_type,move_type,if_commodity, entry_number, material_id, wbs, measurement_id, num, out_num, ask_goods_type,product_code,production_code)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.requestOrderId},#{item.requestOrderNo},#{item.companyNo},#{item.applicationDate},#{item.useDepartment},#{item.requestTypeNumber},#{item.requestTypeName},#{item.sourceType},#{item.moveType},#{item.ifCommodity},#{items.entryNumber},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0,#{item.productCode},#{items.prodOrderNo})
+            </foreach>
+        </foreach>
+        ;
+    </insert>
     <!-- 查询当天出库数量 -->
     <select id="getReturnRemovalCount" resultType="int">
         select count(*) from tld_return_gs_removal where scrq BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59');

src/main/resources/mapper/MaterialClassMapper.xml

@@ -27,6 +27,9 @@
            <if test="wllbName != null and wllbName != ''">
                and c.name like CONCAT(CONCAT('%', #{wllbName}), '%')
            </if>
+           <if test="modifyUser != null and modifyUser != ''">
+               and f.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+           </if>
            <if test="id != null and id != ''">
                and a.id = #{id}
            </if>
@@ -108,6 +111,7 @@
         from tld_material_class a
         left join tld_storage_location b on a.storage_location_code = b.storage_location_code
         left join tld_material c on a.wllb_code = c.code
+        left join tld_user f on a.modify_user = f.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="storageLocationCode != null and storageLocationCode != ''">
                 and a.storage_location_code like CONCAT(CONCAT('%', #{storageLocationCode}), '%')
@@ -124,6 +128,9 @@
             <if test="wllbCode != null and wllbCode != ''">
                 and a.wllb_code like CONCAT(CONCAT('%', #{wllbCode}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and f.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
         </trim>
         order by a.id desc
     </select>

src/main/resources/mapper/MenuMapper.xml

@@ -40,6 +40,9 @@
             <if test="name != null and name != ''">
                 and a.name like CONCAT(CONCAT('%', #{name}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and b.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="type != null and type != ''">
                 and a.type = #{type}
             </if>

src/main/resources/mapper/QueryListMappeer.xml

@@ -15,6 +15,7 @@
         b.code as wllbCode,
         a.wbs as wbs,
         e.name as ustomerName,
+        a.account_sleeve as accountSleeve,
         f.name as companyName
         FROM tld_inventory a
         JOIN tld_material b ON a.material_id = b.tld_id
@@ -654,6 +655,7 @@
         c.code as materialCode,
         f.name as askGoodsWarehouseName,
         e.name as supplyWarehouseName,
+        a.account_sleeve as accountSleeve,
         k.name as companyName
         from tld_warehouse_transfer a
         join tld_warehouse_transfer_f b on a.warehouse_transfer_id = b.warehouse_transfer_id
@@ -937,5 +939,65 @@
         </trim>
         ORDER BY a.scrq DESC
     </select>
-
+    <!--查询库存数量-->
+    <select id="getAmount" resultType="java.lang.String">
+        select ifnull(sum(amount),'0') as amount from tld_inventory where wbs = #{wbs} and account_sleeve = #{companyNumber} and wllb_code = #{materialCode}
+    </select>
+    <!--查询库存数量-->
+    <select id="getAmounts" resultType="java.lang.String">
+        select ifnull(sum(amount),'0') as amount from tld_inventory where wbs = #{wbs} and account_sleeve = #{companyNumber} and wllb_code = #{materialCode}
+    </select>
+    <!--查询其它入库信息-->
+    <select id="getOtherReceivingGoods" resultType="com.tld.model.Notice">
+        select
+            a.id,
+            a.notice_id,
+            a.entry_number,
+            a.production_code,
+            a.material_id,
+            a.wbs,
+            a.measurement_id,
+            a.num,
+            b.notice_code,
+            b.company_number,
+            b.notice_time,
+            b.source_type,
+            b.move_type,
+            b.notification_type_number,
+            b.notification_type_name,
+            c.name as materialName,
+            c.code as materialCode,
+            k.name as companyName
+        from tld_notices a
+        join tld_notices_f b on a.notice_id = b.notice_id
+        join tld_material c on a.material_id = c.tld_id
+        join tld_company k on b.company_number = k.code
+        <trim prefix="WHERE" prefixOverrides="and |or">
+            <if test="type != null and type != ''">
+                and a.type = #{type}
+            </if>
+            <if test="materialCode != null and materialCode != ''">
+                and c.code like CONCAT(CONCAT('%', #{materialCode}), '%')
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and c.name like CONCAT(CONCAT('%', #{materialName}), '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and b.notice_time <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and b.notice_time <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="companyNumber != null and companyNumber != ''">
+                and b.company_number = #{companyNumber}
+            </if>
+            <if test="entryNumber != null and entryNumber != ''">
+                and a.entry_number like CONCAT(CONCAT('%', #{entryNumber}), '%')
+            </if>
+            <if test="wbs != null and wbs != ''">
+                and a.wbs like CONCAT(CONCAT('%', #{wbs}), '%')
+            </if>
+        </trim>
+        order by a.id desc
+    </select>
 </mapper>

src/main/resources/mapper/RoleMapper.xml

@@ -64,6 +64,9 @@
             <if test="roleName != null and roleName != ''">
                 and a.role_name like CONCAT(CONCAT('%', #{roleName}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and b.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="id != null and id != ''">
                 and a.id = #{id}
             </if>
@@ -82,12 +85,16 @@
         a.create_time,
         if(a.remarks = '', null , a.remarks) as remarks,
         from tld_role a
+        left join tld_user b on a.modify_user = b.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="roleCode != null and roleCode != ''">
-                and role_code like CONCAT(CONCAT('%', #{roleCode}), '%')
+                and a.role_code like CONCAT(CONCAT('%', #{roleCode}), '%')
             </if>
             <if test="roleName != null and roleName != ''">
-                and role_name like CONCAT(CONCAT('%', #{roleName}), '%')
+                and a.role_name like CONCAT(CONCAT('%', #{roleName}), '%')
+            </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and b.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
             </if>
         </trim>
         order by a.id desc

src/main/resources/mapper/StorageLocationMapper.xml

@@ -37,6 +37,9 @@
             <if test="storageLocationType != null and storageLocationType != ''">
                 and a.storage_location_type like CONCAT(CONCAT('%', #{storageLocationType}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and f.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="isNotDisable != null and isNotDisable != ''">
                 and a.is_not_disable = #{isNotDisable}
             </if>
@@ -105,6 +108,7 @@
         a.create_time
         from tld_storage_location a
         left join tld_warehouse b on a.warehouse_where = b.tld_id
+        left join tld_user f on a.modify_user = f.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="storageLocationCode != null and storageLocationCode != ''">
                 and a.storage_location_code like CONCAT(CONCAT('%', #{storageLocationCode}), '%')
@@ -115,6 +119,9 @@
             <if test="storageLocationType != null and storageLocationType != ''">
                 and a.storage_location_type like CONCAT(CONCAT('%', #{storageLocationType}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and f.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="isNotDisable != null and isNotDisable != ''">
                 and a.is_not_disable = #{isNotDisable}
             </if>

src/main/resources/mapper/UserMapper.xml

@@ -56,6 +56,9 @@
             <if test="realName != null and realName != ''">
                 and a.real_name like CONCAT(CONCAT('%', #{realName}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and f.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="role != null and role != ''">
                 and b.role_name like CONCAT(CONCAT('%', #{role}), '%')
             </if>
@@ -144,6 +147,7 @@
         from tld_user a
         left join tld_role b on a.role = b.id
         left join tld_department c on a.department = c.code
+        left join tld_user f on a.modify_user = f.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="code != null and code != ''">
                 and a.code like CONCAT(CONCAT('%', #{code}), '%')
@@ -166,6 +170,9 @@
             <if test="phone != null and phone != ''">
                 and a.phone like CONCAT(CONCAT('%', #{phone}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and f.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="department != null and department != ''">
                 and a.department = #{department}
             </if>

src/main/resources/mapper/UserMaterialMapper.xml

@@ -36,6 +36,9 @@
             <if test="realName != null and realName != ''">
                 and f.real_name like CONCAT(CONCAT('%', #{realName}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and f.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="userId != null and userId != ''">
                 and a.user_id = #{userId}
             </if>
@@ -121,6 +124,9 @@
             <if test="realName != null and realName != ''">
                 and f.real_name like CONCAT(CONCAT('%', #{realName}), '%')
             </if>
+            <if test="modifyUser != null and modifyUser != ''">
+                and c.user_name like CONCAT(CONCAT('%', #{modifyUser}), '%')
+            </if>
             <if test="id != null and id != ''">
                 and a.id = #{id}
             </if>