|
|
|
|
@ -107,12 +107,15 @@ public class CustomMadeInfoController extends BladeController { |
|
|
|
|
* 分页 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/list") |
|
|
|
|
public R<IPage<CustomMadeInfo>> list(Query query, String orderNo, String username, String phone, String pillowMaterial, |
|
|
|
|
public R<IPage<CustomMadeInfo>> list(Query query, String orderNo, String purchaseChannel, String username, String phone, String pillowMaterial, |
|
|
|
|
String pillowHardness, String ageRange, String startTime, String endTime) { |
|
|
|
|
LambdaQueryWrapper<CustomMadeInfo> wrapper = Wrappers.lambdaQuery(); |
|
|
|
|
if (Func.isNotEmpty(orderNo)) { |
|
|
|
|
wrapper.like(CustomMadeInfo::getOrderNo, orderNo); |
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(purchaseChannel)) { |
|
|
|
|
wrapper.like(CustomMadeInfo::getPurchaseChannel, purchaseChannel); |
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(username)) { |
|
|
|
|
wrapper.like(CustomMadeInfo::getUsername, username); |
|
|
|
|
} |
|
|
|
|
@ -143,12 +146,15 @@ public class CustomMadeInfoController extends BladeController { |
|
|
|
|
* 导出 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/export") |
|
|
|
|
public void export(HttpServletResponse response, String orderNo, String username, String phone, String pillowMaterial, |
|
|
|
|
public void export(HttpServletResponse response, String orderNo, String purchaseChannel, String username, String phone, String pillowMaterial, |
|
|
|
|
String pillowHardness, String ageRange, String startTime, String endTime) { |
|
|
|
|
LambdaQueryWrapper<CustomMadeInfo> wrapper = Wrappers.lambdaQuery(); |
|
|
|
|
if (Func.isNotEmpty(orderNo)) { |
|
|
|
|
wrapper.like(CustomMadeInfo::getOrderNo, orderNo); |
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(purchaseChannel)) { |
|
|
|
|
wrapper.like(CustomMadeInfo::getPurchaseChannel, purchaseChannel); |
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(username)) { |
|
|
|
|
wrapper.like(CustomMadeInfo::getUsername, username); |
|
|
|
|
} |
|
|
|
|
@ -198,7 +204,7 @@ public class CustomMadeInfoController extends BladeController { |
|
|
|
|
int total = Func.toInt(iCustomMadeInfoService.count(wrapper)); |
|
|
|
|
info.setOrderNoSort(total + 1); |
|
|
|
|
} |
|
|
|
|
return R.status(iCustomMadeInfoService.save(info)); |
|
|
|
|
return R.status(iCustomMadeInfoService.saveOrUpdate(info)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|