dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-01-31 18:41:47 +08:00
parent 8a943fdb10
commit 79d073b26c
6 changed files with 26 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/Feedback.java
View File

@ -45,97 +45,6 @@ public class Feedback extends BaseEntity implements Serializable {
* 反馈内容
*/
private String content;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
/**
* 创建人
*/
private String createBy;
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
/**
* 更新人
*/
private String updateBy;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getStoreId() {
return storeId;
}
public void setStoreId(Integer storeId) {
this.storeId = storeId;
}
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public String getScreenshotUrl() {
return screenshotUrl;
}
public void setScreenshotUrl(String screenshotUrl) {
this.screenshotUrl = screenshotUrl;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/FeedbackMapper.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.userManager.entity.Feedback;
import com.fuint.business.userManager.vo.FeedbackVo;
import org.apache.ibatis.annotations.Param;
public interface FeedbackMapper extends BaseMapper<Feedback> {
@ -13,5 +14,5 @@ public interface FeedbackMapper extends BaseMapper<Feedback> {
* @param feedback
* @return
*/
public IPage<Feedback> selectFeedbackList(Page page,@Param("feedback") Feedback feedback);
public IPage<FeedbackVo> selectFeedbackList(Page page, @Param("feedback") FeedbackVo feedback);
}

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml
View File

@ -2,23 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.userManager.mapper.FeedbackMapper">
<sql id="selectFeedback">
select * from feedback
select fb.*,mu.name name,mu.mobile mobile from feedback fb left join mt_user mu on fb.user_id = mu.id
</sql>
<select id="selectFeedbackList" resultType="com.fuint.business.userManager.entity.Feedback">
<select id="selectFeedbackList" resultType="com.fuint.business.userManager.vo.FeedbackVo">
<include refid="selectFeedback"></include>
<where>
<if test="feedback.storeId != null and feedback.storeId != ''">
and store_id = #{feedback.storeId}
and fb.store_id = #{feedback.storeId}
</if>
<if test="feedback.userId != null and feedback.userId != ''">
and user_id = #{feedback.userId}
and fb.user_id = #{feedback.userId}
</if>
<if test="feedback.params.beginTime != null and feedback.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{feedback.params.beginTime},'%y%m%d')
and date_format(fb.create_time,'%y%m%d') &gt;= date_format(#{feedback.params.beginTime},'%y%m%d')
</if>
<if test="feedback.params.endTime != null and feedback.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{feedback.params.endTime},'%y%m%d')
and date_format(fb.create_time,'%y%m%d') &lt;= date_format(#{feedback.params.endTime},'%y%m%d')
</if>
</where>
order by create_time desc

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/FeedbackService.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.userManager.entity.Feedback;
import com.fuint.business.userManager.vo.FeedbackVo;
/**
* 意见反馈信息 业务层
@ -15,7 +16,7 @@ public interface FeedbackService extends IService<Feedback> {
* @param feedback
* @return
*/
IPage<Feedback> selectFeedbackList(Page page, Feedback feedback);
IPage<FeedbackVo> selectFeedbackList(Page page, FeedbackVo feedback);
/**
* 添加意见反馈信息

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FeedbackServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.userManager.entity.Feedback;
import com.fuint.business.userManager.mapper.FeedbackMapper;
import com.fuint.business.userManager.service.FeedbackService;
import com.fuint.business.userManager.vo.FeedbackVo;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import org.springframework.stereotype.Service;
@ -13,7 +14,7 @@ import org.springframework.stereotype.Service;
@Service
public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper,Feedback> implements FeedbackService {
@Override
public IPage<Feedback> selectFeedbackList(Page page, Feedback feedback) {
public IPage<FeedbackVo> selectFeedbackList(Page page, FeedbackVo feedback) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
feedback.setStoreId(nowAccountInfo.getStoreId());
return baseMapper.selectFeedbackList(page,feedback);

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java Normal file
View File

@ -0,0 +1,14 @@
package com.fuint.business.userManager.vo;
import com.fuint.business.userManager.entity.Feedback;
public class FeedbackVo extends Feedback {
/**
* 用户昵称
*/
private String name;
/**
* 用户电话
*/
private String mobile;
}