|
@@ -1103,16 +1103,16 @@ public class OrderController : BaseController
|
|
|
{
|
|
{
|
|
|
query.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.OrderVisit.Order.Title.Contains(dto.Keyword!) || d.OrderVisit.Order.No.Contains(dto.Keyword!))
|
|
query.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.OrderVisit.Order.Title.Contains(dto.Keyword!) || d.OrderVisit.Order.No.Contains(dto.Keyword!))
|
|
|
.Where(d => d.VisitTarget == EVisitTarget.Org && d.VisitOrgCode == _sessionContext.OrgId && (
|
|
.Where(d => d.VisitTarget == EVisitTarget.Org && d.VisitOrgCode == _sessionContext.OrgId && (
|
|
|
- SqlFunc.JsonField(d.OrgProcessingResults, "Value") == "不满意" || SqlFunc.JsonField(d.OrgProcessingResults, "Value") == "非常不满意" ||
|
|
|
|
|
- SqlFunc.JsonField(d.OrgHandledAttitude, "Value") == "不满意" || SqlFunc.JsonField(d.OrgHandledAttitude, "Value") == "非常不满意"
|
|
|
|
|
|
|
+ SqlFunc.JsonField(d.OrgProcessingResults, "Key") == "1" || SqlFunc.JsonField(d.OrgProcessingResults, "Key") == "2" ||
|
|
|
|
|
+ SqlFunc.JsonField(d.OrgHandledAttitude, "Key") == "1" || SqlFunc.JsonField(d.OrgHandledAttitude, "Key") == "2"
|
|
|
));
|
|
));
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
query.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.OrderVisit.Order.Title.Contains(dto.Keyword!) || d.OrderVisit.Order.No.Contains(dto.Keyword!))
|
|
query.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.OrderVisit.Order.Title.Contains(dto.Keyword!) || d.OrderVisit.Order.No.Contains(dto.Keyword!))
|
|
|
.Where(d => d.VisitTarget == EVisitTarget.Org && (
|
|
.Where(d => d.VisitTarget == EVisitTarget.Org && (
|
|
|
- SqlFunc.JsonField(d.OrgProcessingResults, "Value") == "不满意" || SqlFunc.JsonField(d.OrgProcessingResults, "Value") == "非常不满意" ||
|
|
|
|
|
- SqlFunc.JsonField(d.OrgHandledAttitude, "Value") == "不满意" || SqlFunc.JsonField(d.OrgHandledAttitude, "Value") == "非常不满意"
|
|
|
|
|
|
|
+ SqlFunc.JsonField(d.OrgProcessingResults, "Key") == "1" || SqlFunc.JsonField(d.OrgProcessingResults, "Key") == "2" ||
|
|
|
|
|
+ SqlFunc.JsonField(d.OrgHandledAttitude, "Key") == "1" || SqlFunc.JsonField(d.OrgHandledAttitude, "Key") == "2"
|
|
|
));
|
|
));
|
|
|
}
|
|
}
|
|
|
var (total, items) = await query
|
|
var (total, items) = await query
|
