Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交

Browse Source
This commit is contained in:
huangzj
2023-09-21 15:58:38 +08:00
parent a53561c07f
commit b86cb8ddd8
24 changed files with 336 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java
View File

@@ -28,6 +28,13 @@ public class CsFeedbackQueryParm {
@NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
private Integer pageSize;
@ApiModelProperty("搜索值")
private String searchValue;
@ApiModelProperty("开始时间")
private String searchBeginTime;
@ApiModelProperty("结束时间")
private String searchEndTime;
// /**
// * 用户id
// */

4
cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackVO.java
View File

@@ -57,8 +57,8 @@ public class CsFeedbackVO {
private String status;
@ApiModelProperty(value = "未读消息条数")
private int chatCount;
// @ApiModelProperty(value = "未读消息条数")
// private int chatCount;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

6
cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.csdevice.api.RoleEngineerDevFeignClient;
import com.njcn.csdevice.pojo.po.CsLogsPO;
import com.njcn.cssystem.mapper.CsFeedbackChatMapper;
import com.njcn.cssystem.mapper.CsFeedbackMapper;
import com.njcn.cssystem.pojo.param.CsFeedbackAddParm;
@@ -91,7 +92,10 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
queryWrapper.
eq (StringUtils.isNotBlank (csFeedbackQueryParm.getType ()),"type",csFeedbackQueryParm.getType ()).
in("engineering_id",data).
eq (StringUtils.isNotBlank (csFeedbackQueryParm.getStatus ()),"status",csFeedbackQueryParm.getStatus ()).orderByDesc("create_time");
ge(StringUtils.isNotBlank(csFeedbackQueryParm.getSearchBeginTime()), "create_time",csFeedbackQueryParm.getSearchBeginTime()).
le(StringUtils.isNotBlank(csFeedbackQueryParm.getSearchEndTime()),"create_time",csFeedbackQueryParm.getSearchEndTime()).
like(StringUtils.isNotBlank(csFeedbackQueryParm.getSearchValue()),"title",csFeedbackQueryParm.getSearchValue()).
eq(StringUtils.isNotBlank (csFeedbackQueryParm.getStatus ()),"status",csFeedbackQueryParm.getStatus ()).orderByDesc("create_time");
Page<CsFeedbackPO> csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper);
QueryWrapper<CsFeedbackChatPO> csFeedbackChatPOQueryWrapper = new QueryWrapper<> ();
List<CsFeedbackVO> collect = csFeedbackPOPage.getRecords ( ).stream ( ).map (temp -> {