dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/driver' into driver

Browse Source
This commit is contained in:
Lx 2025-04-24 17:24:36 +08:00
commit 678b3eb207
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -824,7 +824,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
if (ObjectUtil.isEmpty(item.getItemDiscount())) { if (ObjectUtil.isEmpty(item.getItemDiscount())) {
itemDiscount = new BigDecimal("1.00"); itemDiscount = new BigDecimal("1.00");
} }
project.put("repDiscount", itemDiscount.equals(new BigDecimal("1.00")) ? "1" : item.getItemDiscount()); project.put("repDiscount", itemDiscount.equals(new BigDecimal("1.00")) ? "1.00" : item.getItemDiscount());
// 工时费 项目打折后的费用 // 工时费 项目打折后的费用
// 取不到先给0 // 取不到先给0
project.put("labourAmount", item.getItemMoney()); project.put("labourAmount", item.getItemMoney());

2
dl-module-repair/src/main/resources/templates/modified_ticketTemplate.docx
View File

@ -27,7 +27,7 @@
{{insuranceName}} {{insuranceName}}
旧件处理： 旧件处理：
{{oldhandle}} {{oldhandle}}
维修内容 维修项目
{{projects}}序号 {{projects}}序号
维修项目 维修项目
单价 单价