diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/Feedback.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/Feedback.java index 58446f556..3424dd423 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/Feedback.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/Feedback.java @@ -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; - } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/FeedbackMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/FeedbackMapper.java index 29c7692e4..24fba1922 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/FeedbackMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/FeedbackMapper.java @@ -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 { @@ -13,5 +14,5 @@ public interface FeedbackMapper extends BaseMapper { * @param feedback * @return */ - public IPage selectFeedbackList(Page page,@Param("feedback") Feedback feedback); + public IPage selectFeedbackList(Page page, @Param("feedback") FeedbackVo feedback); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml index aaef81ea2..21094c581 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml @@ -2,23 +2,23 @@ - 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 - - and store_id = #{feedback.storeId} + and fb.store_id = #{feedback.storeId} - and user_id = #{feedback.userId} + and fb.user_id = #{feedback.userId} - and date_format(create_time,'%y%m%d') >= date_format(#{feedback.params.beginTime},'%y%m%d') + and date_format(fb.create_time,'%y%m%d') >= date_format(#{feedback.params.beginTime},'%y%m%d') - and date_format(create_time,'%y%m%d') <= date_format(#{feedback.params.endTime},'%y%m%d') + and date_format(fb.create_time,'%y%m%d') <= date_format(#{feedback.params.endTime},'%y%m%d') order by create_time desc diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/FeedbackService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/FeedbackService.java index 8453f936b..ef3811be3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/FeedbackService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/FeedbackService.java @@ -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 { * @param feedback * @return */ - IPage selectFeedbackList(Page page, Feedback feedback); + IPage selectFeedbackList(Page page, FeedbackVo feedback); /** * 添加意见反馈信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FeedbackServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FeedbackServiceImpl.java index 664c77544..ce4b77878 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FeedbackServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FeedbackServiceImpl.java @@ -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 implements FeedbackService { @Override - public IPage selectFeedbackList(Page page, Feedback feedback) { + public IPage selectFeedbackList(Page page, FeedbackVo feedback) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); feedback.setStoreId(nowAccountInfo.getStoreId()); return baseMapper.selectFeedbackList(page,feedback); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java new file mode 100644 index 000000000..9a9cdfa84 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java @@ -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; +}