autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new

Browse Source
This commit is contained in:
Guoqs
2024-12-26 10:04:45 +08:00
parent df90509fc6 302d359783
commit 0cc0e17b8a
37 changed files with 3758 additions and 2207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -650,7 +650,7 @@ public class TempService {
return Lists.newArrayList();
}
BigDecimal multiple = new BigDecimal("2");
BigDecimal multiple = new BigDecimal("0.5");
// 查询订单主表数据
List<OrderBasicInfo> orderBasicInfos = orderBasicInfoService.queryOrderList(orderCodeList);
for (OrderBasicInfo orderBasicInfo : orderBasicInfos) {

7
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java
View File

@@ -54,9 +54,10 @@ public class OrderPileOccupyController extends BaseController {
@PreAuthorize("@ss.hasPermi('pile:occupy:export')")
@Log(title = "占桩订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OrderPileOccupy orderPileOccupy) {
List<OrderPileOccupy> list = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy);
ExcelUtil<OrderPileOccupy> util = new ExcelUtil<OrderPileOccupy>(OrderPileOccupy.class);
public void export(HttpServletResponse response, OrderPileOccupyDTO dto) {
// List<OrderPileOccupy> list = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy);
List<OccupyOrderVO> list = orderPileOccupyService.getOrderPileOccupyListWithAuth(dto);
ExcelUtil<OccupyOrderVO> util = new ExcelUtil<>(OccupyOrderVO.class);
util.exportExcel(response, list, "占桩订单数据");
}