zoujiajian 3 tahun lalu
induk
melakukan
c931515c07

+ 4 - 0
netflix-dao/src/main/java/com/cyksj/model/excel/ExcelWorkOrderData.java

@@ -24,6 +24,10 @@ import java.util.Date;
 		" left join goods_don g on g.id = wo.goods_id" +
 		" left join goods_don_sku sku on sku.id = wo.sku_id")
 public class ExcelWorkOrderData {
+	@DbField("wo.id")
+	@ExcelIgnore
+	private Long id;
+
 	@DbField("wo.account")
 	@ExcelProperty("账号")
 	private String account;

+ 5 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/sys/WorkOrderController.java

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