|
@@ -179,7 +179,7 @@ public class WorkOrderController {
|
|
|
* 导出工单
|
|
* 导出工单
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/export")
|
|
@GetMapping("/export")
|
|
|
- public void export(String nickname, HttpServletResponse response) {
|
|
|
|
|
|
|
+ public void export(String nickname, String ids, HttpServletResponse response) {
|
|
|
long adminId = StpUtil.getLoginIdAsLong();
|
|
long adminId = StpUtil.getLoginIdAsLong();
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
//是不是客服
|
|
//是不是客服
|
|
@@ -187,6 +187,10 @@ public class WorkOrderController {
|
|
|
.field(CmsUserVO::getRoleNames, "客服").op(Operator.Contain)
|
|
.field(CmsUserVO::getRoleNames, "客服").op(Operator.Contain)
|
|
|
.field(CmsUserVO::getId, adminId)
|
|
.field(CmsUserVO::getId, adminId)
|
|
|
.build());
|
|
.build());
|
|
|
|
|
+ if (StrUtil.isNotBlank(ids)) {
|
|
|
|
|
+ String[] idAr = ids.split(",");
|
|
|
|
|
+ builder.field(ExcelWorkOrderData::getId, idAr).op(Operator.InList);
|
|
|
|
|
+ }
|
|
|
if (isCustomer != null) {
|
|
if (isCustomer != null) {
|
|
|
builder.field(ExcelWorkOrderData::getAssignCustomerServiceId, isCustomer.getId());
|
|
builder.field(ExcelWorkOrderData::getAssignCustomerServiceId, isCustomer.getId());
|
|
|
}
|
|
}
|