commit
This commit is contained in:
@@ -218,6 +218,7 @@ public class WelfareProject extends ViBaseModel implements Serializable, SysHome
|
||||
|
||||
@Column
|
||||
@Comment("是否禁用")
|
||||
@Default("0")
|
||||
@ColDefine(type = ColType.BOOLEAN)
|
||||
private Boolean isDisabled;
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ public class zczjlbController {
|
||||
Double surplusMoney = zcxxes.stream().filter(z -> !List.of("报废", "丢失").contains(z.getZczt())).mapToDouble(Zgfw_Zcxx::getSurplusMoney).sum();
|
||||
//累计折旧
|
||||
Double depreciationMoney = allMoney - surplusMoney;
|
||||
return Map.of("allMoney", allMoney, "surplusMoney", surplusMoney, "depreciationMoney", String.format("%.2f", depreciationMoney));
|
||||
return Map.of("allMoney", String.format("%.2f", allMoney), "surplusMoney", String.format("%.2f", surplusMoney), "depreciationMoney", String.format("%.2f", depreciationMoney));
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user