测试修改
This commit is contained in:
parent
8f4f27a769
commit
2a85cc7269
|
@ -42,7 +42,7 @@ public class BusReturnVisitInfoController extends BaseController
|
|||
public TableDataInfo list(BusReturnVisitInfo busReturnVisitInfo)
|
||||
{
|
||||
// startPage();
|
||||
List<BusReturnVisitInfo> list = busReturnVisitInfoService.selectBusReturnVisitInfoList(busReturnVisitInfo);
|
||||
List<BusReturnVisitInfo> list = busReturnVisitInfoService.selectBusReturnVisitInfoList1(busReturnVisitInfo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
|
|
|
@ -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<String> storeList;
|
||||
|
||||
public List<String> getStoreList() {
|
||||
return storeList;
|
||||
}
|
||||
|
||||
public void setStoreList(List<String> storeList) {
|
||||
this.storeList = storeList;
|
||||
}
|
||||
|
||||
/** 回访时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
|
|
|
@ -29,6 +29,7 @@ public interface BusReturnVisitInfoMapper
|
|||
* @return 回访数据集合
|
||||
*/
|
||||
public List<BusReturnVisitInfo> selectBusReturnVisitInfoList(BusReturnVisitInfo busReturnVisitInfo);
|
||||
public List<BusReturnVisitInfo> selectBusReturnVisitInfoList1(BusReturnVisitInfo busReturnVisitInfo);
|
||||
|
||||
/**
|
||||
* 新增回访数据
|
||||
|
|
|
@ -26,6 +26,7 @@ public interface IBusReturnVisitInfoService
|
|||
* @return 回访数据集合
|
||||
*/
|
||||
public List<BusReturnVisitInfo> selectBusReturnVisitInfoList(BusReturnVisitInfo busReturnVisitInfo);
|
||||
public List<BusReturnVisitInfo> selectBusReturnVisitInfoList1(BusReturnVisitInfo busReturnVisitInfo);
|
||||
|
||||
/**
|
||||
* 新增回访数据
|
||||
|
|
|
@ -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<BusReturnVisitInfo> selectBusReturnVisitInfoList(BusReturnVisitInfo busReturnVisitInfo)
|
||||
{
|
||||
return busReturnVisitInfoMapper.selectBusReturnVisitInfoList(busReturnVisitInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询回访数据列表
|
||||
*
|
||||
|
@ -45,15 +52,18 @@ public class BusReturnVisitInfoServiceImpl implements IBusReturnVisitInfoService
|
|||
* @return 回访数据
|
||||
*/
|
||||
@Override
|
||||
public List<BusReturnVisitInfo> selectBusReturnVisitInfoList(BusReturnVisitInfo busReturnVisitInfo)
|
||||
public List<BusReturnVisitInfo> selectBusReturnVisitInfoList1(BusReturnVisitInfo busReturnVisitInfo)
|
||||
{
|
||||
if(busReturnVisitInfo.getStoreCode() == null) {
|
||||
BusStoreInfo info = new BusStoreInfo();
|
||||
info.setBindId(SecurityUtils.getLoginUser().getUserId());
|
||||
List<BusStoreInfo> list = storeInfoMapper.selectBusStoreInfoList(info);
|
||||
if (list.size() != 0) {
|
||||
String storeCode = list.get(0).getStoreCode();
|
||||
busReturnVisitInfo.setStoreCode(storeCode);
|
||||
List<String> 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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -23,6 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<include refid="selectBusReturnVisitInfoVo"/>
|
||||
<where>
|
||||
<if test="storeCode != null and storeCode != ''"> and store_code = #{storeCode}</if>
|
||||
<if test="storeName != null and storeName != ''"> and store_name like concat('%', #{storeName}, '%')</if>
|
||||
<if test="phoneNumber != null and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
|
||||
<if test="phoneEndNumber != null and phoneEndNumber != ''"> and phone_end_number = #{phoneEndNumber}</if>
|
||||
<if test="returnVisitTime != null "> and return_visit_time = #{returnVisitTime}</if>
|
||||
<if test="finishTime != null "> and finish_time = #{finishTime}</if>
|
||||
and phone_number is not null
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectBusReturnVisitInfoList1" parameterType="BusReturnVisitInfo" resultMap="BusReturnVisitInfoResult">
|
||||
<include refid="selectBusReturnVisitInfoVo"/>
|
||||
<where>
|
||||
<if test="storeName != null and storeName != ''"> and store_name like concat('%', #{storeName}, '%')</if>
|
||||
<if test="phoneNumber != null and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
|
||||
<if test="phoneEndNumber != null and phoneEndNumber != ''"> and phone_end_number = #{phoneEndNumber}</if>
|
||||
|
@ -30,7 +42,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="finishTime != null "> and finish_time = #{finishTime}</if>
|
||||
<if test="beginTime != null and endTime != null"> and order_complete_time between #{beginTime} and #{endTime}</if>
|
||||
<if test="beginTime == null and endTime == null"> and date_format(order_complete_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')</if>
|
||||
and phone_number is not null
|
||||
<if test="storeList != null">
|
||||
and store_code in
|
||||
<foreach collection="storeList" open="(" close=")" item="item" separator="," index="i">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="storeCode != null and storeCode != ''"> and store_code = #{storeCode}</if>
|
||||
and phone_number is not null and return_visit_time is not null and finish_time is not null
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
|
Loading…
Reference in New Issue