完成 经纪人

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

@@ -5,9 +5,11 @@ 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.SysUser;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaCustomerTransfer;
 import com.huiju.welcome.model.TdGoodsType;
+import com.huiju.welcome.service.ISysUserService;
 import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaCustomerTransferService;
 import io.swagger.annotations.ApiImplicitParams;
@@ -17,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
 
 
@@ -38,6 +41,8 @@ public class TaCustomerTransferController extends BaseController {
     public ITaCustomerTransferService iTaCustomerTransferService;
     @Autowired
     public ITaCustomerService iTaCustomerService;
+    @Autowired
+    public ISysUserService iSysUserService;
 
 
     /**
@@ -46,9 +51,22 @@ public class TaCustomerTransferController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerTransfer/add",method= RequestMethod.POST)
-    public ResponseBean tpShopImgAdd(@RequestBody TaCustomerTransfer taCustomerTransfer){
+    public ResponseBean tpShopImgAdd(@RequestBody TaCustomerTransfer taCustomerTransfer, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Integer formUserId = (Integer) session.getAttribute("token-id");
+            TaCustomer customer = iTaCustomerService.getById(taCustomerTransfer.getCustomerId());
+            SysUser toUser = iSysUserService.getById(taCustomerTransfer.getToUserId());
+            SysUser fromUser = iSysUserService.getById(formUserId);
+
+            taCustomerTransfer.setFromUserId(formUserId);
+            taCustomerTransfer.setFromUserName(fromUser.getUsername());
+            taCustomerTransfer.setCustomerId(taCustomerTransfer.getCustomerId());
+            taCustomerTransfer.setCustomerName(customer.getCustomerName());
+            taCustomerTransfer.setToUserId(taCustomerTransfer.getToUserId());
+            taCustomerTransfer.setToUserName(toUser.getUsername());
+
+
             taCustomerTransfer.setTransferTime(LocalDateTime.now());
             Boolean flag = iTaCustomerTransferService.save(taCustomerTransfer);
             Boolean flagUpdate = false;
@@ -95,9 +113,22 @@ public class TaCustomerTransferController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerTransfer/update",method= RequestMethod.PUT)
-    public ResponseBean tpShopImgUpdate(@RequestBody TaCustomerTransfer taCustomerTransfer){
+    public ResponseBean tpShopImgUpdate(@RequestBody TaCustomerTransfer taCustomerTransfer, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         try {
+
+            Integer formUserId = (Integer) session.getAttribute("token-id");
+            TaCustomer customer = iTaCustomerService.getById(taCustomerTransfer.getCustomerId());
+            SysUser toUser = iSysUserService.getById(taCustomerTransfer.getToUserId());
+            SysUser fromUser = iSysUserService.getById(formUserId);
+
+            taCustomerTransfer.setFromUserId(formUserId);
+            taCustomerTransfer.setFromUserName(fromUser.getUsername());
+            taCustomerTransfer.setCustomerId(taCustomerTransfer.getCustomerId());
+            taCustomerTransfer.setCustomerName(customer.getCustomerName());
+            taCustomerTransfer.setToUserId(taCustomerTransfer.getToUserId());
+            taCustomerTransfer.setToUserName(toUser.getUsername());
+
             if (iTaCustomerTransferService.updateById(taCustomerTransfer)){
                 responseBean.addSuccess("success");
             }else {

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

@@ -216,8 +216,9 @@ public class TaMainUsherRecordController extends BaseController {
                                  @RequestParam(defaultValue = "10") int pageSize,
                                  @RequestParam(value = "customerName" ,required = false)String customerName,
                                  @RequestParam(value = "phone" ,required = false)String phone,
-                                 @RequestParam(value = "platNumber" ,required = false)String platNumber){
-        ResponseBean result = iTaMainUsherRecordService.customerPage(pageNum, pageSize,customerName,phone,platNumber);
+                                 @RequestParam(value = "platNumber" ,required = false)String platNumber,
+                                 @RequestParam(value = "agentUserId", required = false) Integer agentUserId){
+        ResponseBean result = iTaMainUsherRecordService.customerPage(pageNum, pageSize,customerName,phone,platNumber, agentUserId);
         return result;
     }
 }

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

@@ -20,7 +20,7 @@ import java.util.List;
 public interface TaCustomerMapper extends BaseMapper<TaCustomer> {
 
     TaCustomer getCustomerOf(@Param("personId") Integer personId, @Param("realId") Integer realId);
-    IPage<TaCustomer> customerPage(IPage<TaCustomer> pg, @Param("customerName") String customerName, @Param("phone") String phone, @Param("platNumber") String platNumber);
+    IPage<TaCustomer> customerPage(IPage<TaCustomer> pg, @Param("customerName") String customerName, @Param("phone") String phone, @Param("platNumber") String platNumber, @Param("agentUserId") Integer agentUserId);
 
     List<TaCustomer> getSomeCustMayBe(@Param("plateNumber") String plateNumber, @Param("phone") String phone);
 

src/main/java/com.huiju.welcome/model/TaCustomer.java

@@ -187,4 +187,22 @@ public class TaCustomer implements Serializable {
      * 身份证号
      */
     private String idcard;
+
+    /**
+     * 经纪人名称
+     */
+    @TableField(exist = false)
+    private String agentUserName;
+
+    /**
+     * 经纪人ID
+     */
+    @TableField(exist = false)
+    private Integer agentUserId;
+
+    /**
+     * 关联经纪人的编号表ID
+     */
+    @TableField(exist = false)
+    private Integer transferId;
 }

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

@@ -33,7 +33,7 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
      * 查询客户列表
      * @return
      */
-    ResponseBean customerPage(int pageNum, int pageSize, String customerName, String phone, String platNumber);
+    ResponseBean customerPage(int pageNum, int pageSize, String customerName, String phone, String platNumber, Integer agentUserId);
 
     boolean newRecordByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception;
 

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

@@ -16,6 +16,7 @@ import com.huiju.welcome.utils.StatusUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -95,7 +96,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         List<SysRoleMenu> sysRoleMenuList = Arrays.asList(menuIdArray).stream()
                 .map(e -> new SysRoleMenu(role.getRoleId(), e + ""))
                 .collect(Collectors.toList());
-        sysRoleMenuMapper.insertBeach(sysRoleMenuList);
+        if (!CollectionUtils.isEmpty(sysRoleMenuList)) {
+            sysRoleMenuMapper.insertBeach(sysRoleMenuList);
+        }
 
         responseBean.addSuccess("操作成功！");
         return responseBean;

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

@@ -229,10 +229,12 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             miniApp.sendTPLMessage(tplId, openid, page, dt2);
         }
     }
-    public ResponseBean customerPage(int pageNum, int pageSize, String customerName, String phone, String platNumber) {
+
+    @Override
+    public ResponseBean customerPage(int pageNum, int pageSize, String customerName, String phone, String platNumber, Integer agentUserId) {
         ResponseBean response = new ResponseBean();
         IPage<TaCustomer> pg = new Page<>(pageNum, pageSize);
-        IPage<TaCustomer> result = taCustomerMapper.customerPage(pg,customerName,phone,platNumber);
+        IPage<TaCustomer> result = taCustomerMapper.customerPage(pg,customerName,phone,platNumber,agentUserId);
         response.addSuccess(result);
         return response;
     }

src/main/resources/mapper/TaCustomerMapper.xml

@@ -19,18 +19,27 @@
             LIMIT 1
     </select>
     <select id="customerPage" resultType="com.huiju.welcome.model.TaCustomer">
-        select * from ta_customer
+        select
+        *,
+        tct.to_user_name as agentUserName,
+        tct.to_user_id as agentUserId,
+        tct.transfer_id as transferId
+        from ta_customer tac
+        left join ta_customer_transfer tct on tac.customer_id = tct.customer_id
         <where>
             <if test="customerName !=null and customerName != ''">
-                and customer_name LIKE CONCAT('%',#{customerName},'%')
+                and tac.customer_name LIKE CONCAT('%',#{customerName},'%')
             </if>
 
             <if test="phone !=null and phone != ''">
-                and phone LIKE CONCAT('%',#{phone},'%')
+                and tac.phone LIKE CONCAT('%',#{phone},'%')
             </if>
 
             <if test="platNumber !=null and platNumber != ''">
-                and   plate_number LIKE CONCAT('%',#{platNumber},'%')
+                and   tac.plate_number LIKE CONCAT('%',#{platNumber},'%')
+            </if>
+            <if test="agentUserId != null">
+                and tct.to_user_id = #{agentUserId}
             </if>
         </where>
         order by create_date desc