From 2a85cc72694e9470da51ddf3caf5285a7ed964ec Mon Sep 17 00:00:00 2001 From: Lenovo Date: Wed, 17 Jul 2024 15:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusReturnVisitInfoController.java | 4 ++-- .../business/domain/BusReturnVisitInfo.java | 11 ++++++++++ .../mapper/BusReturnVisitInfoMapper.java | 1 + .../service/IBusReturnVisitInfoService.java | 1 + .../impl/BusReturnVisitInfoServiceImpl.java | 18 ++++++++++++---- .../business/BusReturnVisitInfoMapper.xml | 21 ++++++++++++++++++- 6 files changed, 49 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusReturnVisitInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusReturnVisitInfoController.java index 32679db..eaa43ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusReturnVisitInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusReturnVisitInfoController.java @@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 回访数据Controller - * + * * @author ruoyi * @date 2024-07-05 */ @@ -42,7 +42,7 @@ public class BusReturnVisitInfoController extends BaseController public TableDataInfo list(BusReturnVisitInfo busReturnVisitInfo) { // startPage(); - List list = busReturnVisitInfoService.selectBusReturnVisitInfoList(busReturnVisitInfo); + List list = busReturnVisitInfoService.selectBusReturnVisitInfoList1(busReturnVisitInfo); return getDataTable(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusReturnVisitInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusReturnVisitInfo.java index 518ce70..5ef6f06 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusReturnVisitInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusReturnVisitInfo.java @@ -1,6 +1,8 @@ package com.ruoyi.business.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -35,6 +37,15 @@ public class BusReturnVisitInfo extends BaseEntity /** 手机4位尾号 */ @Excel(name = "手机4位尾号") private String phoneEndNumber; + private List storeList; + + public List getStoreList() { + return storeList; + } + + public void setStoreList(List storeList) { + this.storeList = storeList; + } /** 回访时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusReturnVisitInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusReturnVisitInfoMapper.java index 8ae95ac..fb919d1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusReturnVisitInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusReturnVisitInfoMapper.java @@ -29,6 +29,7 @@ public interface BusReturnVisitInfoMapper * @return 回访数据集合 */ public List selectBusReturnVisitInfoList(BusReturnVisitInfo busReturnVisitInfo); + public List selectBusReturnVisitInfoList1(BusReturnVisitInfo busReturnVisitInfo); /** * 新增回访数据 diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusReturnVisitInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusReturnVisitInfoService.java index 7caadf7..cdb5656 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusReturnVisitInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusReturnVisitInfoService.java @@ -26,6 +26,7 @@ public interface IBusReturnVisitInfoService * @return 回访数据集合 */ public List selectBusReturnVisitInfoList(BusReturnVisitInfo busReturnVisitInfo); + public List selectBusReturnVisitInfoList1(BusReturnVisitInfo busReturnVisitInfo); /** * 新增回访数据 diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java index 27bba8e..cff138f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.business.service.impl; +import java.util.ArrayList; import java.util.List; import com.ruoyi.business.domain.BusStoreInfo; @@ -38,6 +39,12 @@ public class BusReturnVisitInfoServiceImpl implements IBusReturnVisitInfoService return busReturnVisitInfoMapper.selectBusReturnVisitInfoById(id); } + @Override + public List selectBusReturnVisitInfoList(BusReturnVisitInfo busReturnVisitInfo) + { + return busReturnVisitInfoMapper.selectBusReturnVisitInfoList(busReturnVisitInfo); + } + /** * 查询回访数据列表 * @@ -45,15 +52,18 @@ public class BusReturnVisitInfoServiceImpl implements IBusReturnVisitInfoService * @return 回访数据 */ @Override - public List selectBusReturnVisitInfoList(BusReturnVisitInfo busReturnVisitInfo) + public List selectBusReturnVisitInfoList1(BusReturnVisitInfo busReturnVisitInfo) { if(busReturnVisitInfo.getStoreCode() == null) { BusStoreInfo info = new BusStoreInfo(); info.setBindId(SecurityUtils.getLoginUser().getUserId()); List list = storeInfoMapper.selectBusStoreInfoList(info); if (list.size() != 0) { - String storeCode = list.get(0).getStoreCode(); - busReturnVisitInfo.setStoreCode(storeCode); + List sl = new ArrayList<>(); + for (BusStoreInfo storeInfo : list) { + sl.add(storeInfo.getStoreCode()); + } + busReturnVisitInfo.setStoreList(sl); } } PageUtils.startPage(); @@ -65,7 +75,7 @@ public class BusReturnVisitInfoServiceImpl implements IBusReturnVisitInfoService } busReturnVisitInfo.setBeginTime(beginTime); busReturnVisitInfo.setEndTime(endTime); - return busReturnVisitInfoMapper.selectBusReturnVisitInfoList(busReturnVisitInfo); + return busReturnVisitInfoMapper.selectBusReturnVisitInfoList1(busReturnVisitInfo); } /** diff --git a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml index e753630..683ffbd 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml @@ -23,6 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and store_code = #{storeCode} + and store_name like concat('%', #{storeName}, '%') + and phone_number = #{phoneNumber} + and phone_end_number = #{phoneEndNumber} + and return_visit_time = #{returnVisitTime} + and finish_time = #{finishTime} + and phone_number is not null + + + +