SQL

src/main/java/com.huiju.welcome/controller/TaCustomerTransferController.java

@@ -1,21 +1,21 @@
 package com.huiju.welcome.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaCustomerTransfer;
+import com.huiju.welcome.model.TdGoodsType;
 import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaCustomerTransferService;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 
@@ -125,4 +125,21 @@ public class TaCustomerTransferController extends BaseController {
         }
         return responseBean;
     }
+
+    @ApiOperation(value = "人员流转记录", notes = "人员流转记录")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/taCustomerTransfer", method = RequestMethod.GET)
+    public ResponseBean customerTransferList(@RequestParam(defaultValue = "1") int pageNum,
+                                 @RequestParam(defaultValue = "10") int pageSize,
+                                 @RequestParam(value = "fromUserName",required = false) String fromUserName,
+                                             @RequestParam(value = "fromUserId",required = false) Integer fromUserId,
+                                             @RequestParam(value = "toUserName",required = false) String toUserName,
+                                             @RequestParam(value = "toUserId",required = false) Integer toUserId) {
+        IPage<TaCustomerTransfer> pg = new Page<>(pageNum, pageSize);
+
+        ResponseBean userManagement= iTaCustomerTransferService.customerTransferList(pg,fromUserName,fromUserId,toUserName,toUserId);
+
+        return userManagement;
+    }
 }

src/main/java/com.huiju.welcome/controller/TdGoodsTypeController.java

@@ -123,7 +123,6 @@ public class TdGoodsTypeController extends BaseController {
 
     @ApiOperation(value = "商品类型列表", notes = "商品类型列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "typeName", value = "商品类型名称")
     })
     @RequestMapping(value = "/tdGoodsType", method = RequestMethod.GET)
     public ResponseBean typeList(@RequestParam(defaultValue = "1") int pageNum,

src/main/java/com.huiju.welcome/mapper/TaCustomerTransferMapper.java

@@ -2,8 +2,12 @@ package com.huiju.welcome.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaCustomerTransfer;
+import com.huiju.welcome.model.TdGoodsType;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +20,18 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaCustomerTransferMapper extends BaseMapper<TaCustomerTransfer> {
 
+    /**
+     *
+     * @param pg
+     * @param fromUserName
+     * @param fromUserId
+     * @param toUserName
+     * @param toUserId
+     * @return
+     */
+    IPage<TaCustomerTransfer> customerTransferList(IPage<TaCustomerTransfer> pg,
+                                                   @Param("fromUserName") String fromUserName,
+                                                   @Param("fromUserId") Integer fromUserId,
+                                                   @Param("toUserName") String toUserName,
+                                                   @Param("toUserId") Integer toUserId);
 }

src/main/java/com.huiju.welcome/service/ITaCustomerTransferService.java

@@ -1,7 +1,9 @@
 package com.huiju.welcome.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaCustomerTransfer;
 
 /**
@@ -14,4 +16,14 @@ import com.huiju.welcome.model.TaCustomerTransfer;
  */
 public interface ITaCustomerTransferService extends IService<TaCustomerTransfer> {
 
+    /**
+     * 商品类型列表
+     * @param pg
+     * @param fromUserName
+     * @param fromUserId
+     * @param toUserName
+     * @param toUserId
+     * @return
+     */
+    ResponseBean customerTransferList(IPage<TaCustomerTransfer> pg, String fromUserName,Integer fromUserId,String toUserName,Integer toUserId);
 }

src/main/java/com.huiju.welcome/service/impl/TaCustomerTransferServiceImpl.java

@@ -1,10 +1,13 @@
 package com.huiju.welcome.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaCustomerTransferMapper;
 import com.huiju.welcome.model.TaCustomerTransfer;
 import com.huiju.welcome.service.ITaCustomerTransferService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,5 +20,15 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaCustomerTransferServiceImpl extends ServiceImpl<TaCustomerTransferMapper, TaCustomerTransfer> implements ITaCustomerTransferService {
+    @Autowired
+    private TaCustomerTransferMapper taCustomerTransferMapper;
+
+    @Override
+    public ResponseBean customerTransferList(IPage<TaCustomerTransfer> pg, String fromUserName,Integer fromUserId,String toUserName,Integer toUserId) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<TaCustomerTransfer> list= taCustomerTransferMapper.customerTransferList(pg,fromUserName,fromUserId,toUserName,toUserId);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 
 }

src/main/resources/mapper/TaCustomerTransferMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.TaCustomerTransferMapper">
+    <select id="customerTransferList" resultType="com.huiju.welcome.model.TaCustomerTransfer">
+        select
+        *
+        from ta_customer_transfer
+        <where>
+            1=1
+            <if test="fromUserId !=null and fromUserId !=''">
+                and from_user_id = #{fromUserId}
+            </if>
+            <if test="fromUserName !=null and fromUserName !=''">
+                and from_user_name LIKE CONCAT('%',#{fromUserName},'%')
+            </if>
+            <if test="toUserId !=null and toUserId !=''">
+                and to_user_id = #{toUserId}
+            </if>
+            <if test="toUserName !=null and toUserName !=''">
+                and to_user_name LIKE CONCAT('%',#{toUserName},'%')
+            </if>
+        </where>
+        order by transfer_time desc
+    </select>
+
+</mapper>

src/main/resources/mapper/TaGoodsMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.huiju.welcome.mapper.TaGoodsMapper">
     <select id="goodsList" resultType="com.huiju.welcome.model.TaGoods">
         select
-        g.*
-        i.img_url as imgUrl
+        g.*,
+        i.img_url as imgUrl,
         t.type_name as typeName
         from ta_goods g
         left join ta_goods_img i on g.goods_id = i.goods_id