代码提交

This commit is contained in:
huangzj
2023-08-28 16:17:47 +08:00
parent 18ea80ab50
commit 993712afb4
9 changed files with 76 additions and 6 deletions

View File

@@ -8,6 +8,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.cssystem.pojo.param.CsFeedbackAddParm;
import com.njcn.cssystem.pojo.param.CsFeedbackAuditParm;
import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm;
import com.njcn.cssystem.pojo.vo.CsFeedbackDetailVO;
import com.njcn.cssystem.pojo.vo.CsFeedbackVO;
@@ -50,6 +51,16 @@ public class FeedBackController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/auditFeedBack")
@ApiOperation("更新反馈")
public HttpResult<Boolean> auditFeedBack(@Validated CsFeedbackAuditParm csFeedbackAuditParm){
String methodDescribe = getMethodDescribe("auditFeedBack");
Boolean flag = csFeedbackService.auditFeedBack(csFeedbackAuditParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryFeedBackPage")
@ApiOperation("查询反馈列表")

View File

@@ -3,6 +3,7 @@ package com.njcn.cssystem.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.cssystem.pojo.param.CsFeedbackAddParm;
import com.njcn.cssystem.pojo.param.CsFeedbackAuditParm;
import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm;
import com.njcn.cssystem.pojo.po.CsFeedbackPO;
import com.njcn.cssystem.pojo.vo.CsFeedbackDetailVO;
@@ -44,4 +45,6 @@ public interface CsFeedbackService extends IService<CsFeedbackPO>{
* @Date: 2023/4/7
*/
CsFeedbackDetailVO queryFeedBackDetail(String id);
Boolean auditFeedBack(CsFeedbackAuditParm csFeedbackAuditParm);
}

View File

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.cssystem.mapper.CsFeedbackMapper;
import com.njcn.cssystem.pojo.param.CsFeedbackAddParm;
import com.njcn.cssystem.pojo.param.CsFeedbackAuditParm;
import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm;
import com.njcn.cssystem.pojo.po.CsFeedbackChatPO;
import com.njcn.cssystem.pojo.po.CsFeedbackPO;
@@ -47,7 +49,7 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
private final CsFilePathService csFilePathService;
private final CsFeedbackChatService csFeedbackChatService;
private final UserFeignClient userFeignClient;
private final RoleEngineerDevFeignClient roleEngineerDevFeignClient;
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean addFeedBack(CsFeedbackAddParm csFeedbackAddParm) {
@@ -80,10 +82,14 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
public IPage<CsFeedbackVO> queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm) {
Page<CsFeedbackPO> page = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( ));
Page<CsFeedbackVO> returnpage = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( ));
List<String> data = roleEngineerDevFeignClient.getRoleengineer().getData();
if(CollectionUtils.isEmpty(data)){
return returnpage;
}
QueryWrapper<CsFeedbackPO> queryWrapper = new QueryWrapper<> ();
queryWrapper.eq ("user_id",RequestUtil.getUserIndex()).
queryWrapper.
eq (StringUtils.isNotBlank (csFeedbackQueryParm.getType ()),"type",csFeedbackQueryParm.getType ()).
in("engineering_id",data).
eq (StringUtils.isNotBlank (csFeedbackQueryParm.getStatus ()),"status",csFeedbackQueryParm.getStatus ()).orderByDesc("create_time");
Page<CsFeedbackPO> csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper);
QueryWrapper<CsFeedbackChatPO> csFeedbackChatPOQueryWrapper = new QueryWrapper<> ();
@@ -135,4 +141,10 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
csFeedbackDetailVO.setCsFeedbackChatPOList (list1);
return csFeedbackDetailVO;
}
@Override
public Boolean auditFeedBack(CsFeedbackAuditParm csFeedbackAuditParm) {
boolean update = this.lambdaUpdate().eq(CsFeedbackPO::getId, csFeedbackAuditParm.getId()).set(CsFeedbackPO::getStatus, csFeedbackAuditParm.getStatus()).update();
return update;
}
}