|
|
|
@ -413,9 +413,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> { |
|
|
|
.eq(StrUtil.isNotBlank(mailQuery.getSource()), "m.source", mailQuery.getSource()) |
|
|
|
.eq(StrUtil.isNotBlank(mailQuery.getSource()), "m.source", mailQuery.getSource()) |
|
|
|
.eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel()) |
|
|
|
.eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel()) |
|
|
|
// .eq(StrUtil.isNotBlank(todoQuery.getAppealState()), "m.appeal_state", todoQuery.getAppealState())
|
|
|
|
// .eq(StrUtil.isNotBlank(todoQuery.getAppealState()), "m.appeal_state", todoQuery.getAppealState())
|
|
|
|
.eq("m.satisfaction_status", "不满意") |
|
|
|
.and(qw -> qw.eq("m.satisfaction_status", "不满意").or().eq("m.verify_feedback", "不满意")); |
|
|
|
.or() |
|
|
|
|
|
|
|
.eq("m.verify_feedback", "不满意"); |
|
|
|
|
|
|
|
mailCategorySearch(mailQuery, queryWrapper); |
|
|
|
mailCategorySearch(mailQuery, queryWrapper); |
|
|
|
deptSearch(mailQuery, queryWrapper); |
|
|
|
deptSearch(mailQuery, queryWrapper); |
|
|
|
roleCheck(queryWrapper); |
|
|
|
roleCheck(queryWrapper); |
|
|
|
|