admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加差额

Browse Source
This commit is contained in:
pengjie 2024-11-15 14:37:25 +08:00
parent f3a4ddbeeb
commit 3f2f00b8c7
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/cost/entity/CostBudget.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.cost.entity; package com.zhgd.xmgl.modules.cost.entity;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
@ -108,4 +109,8 @@ public class CostBudget implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "是否为合计") @ApiModelProperty(value = "是否为合计")
private Boolean isCount; private Boolean isCount;
@TableField(exist = false)
@ApiModelProperty(value = "差额")
private BigDecimal subtract;
} }

8
src/main/java/com/zhgd/xmgl/modules/cost/service/impl/CostBudgetServiceImpl.java
View File

@ -74,7 +74,9 @@ public class CostBudgetServiceImpl extends ServiceImpl<CostBudgetMapper, CostBud
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
costBudget.setActualCost(reduce.toString()); costBudget.setActualCost(reduce.toString());
if (!costBudget.getActualCost().equals("0")) { if (!costBudget.getActualCost().equals("0")) {
BigDecimal ratio = reduce.subtract(new BigDecimal(costBudget.getBudgetCost())).divide(new BigDecimal(costBudget.getBudgetCost()), 2, BigDecimal.ROUND_HALF_UP); BigDecimal subtract = new BigDecimal(costBudget.getBudgetCost()).subtract(reduce);
costBudget.setSubtract(subtract);
BigDecimal ratio = subtract.divide(new BigDecimal(costBudget.getBudgetCost()), 2, BigDecimal.ROUND_HALF_UP);
costBudget.setCostDifference(ratio.multiply(new BigDecimal(100)).toString()); costBudget.setCostDifference(ratio.multiply(new BigDecimal(100)).toString());
} }
} else { } else {
@ -83,7 +85,9 @@ public class CostBudgetServiceImpl extends ServiceImpl<CostBudgetMapper, CostBud
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
costBudget.setActualCost(reduce.toString()); costBudget.setActualCost(reduce.toString());
if (!costBudget.getActualCost().equals("0")) { if (!costBudget.getActualCost().equals("0")) {
BigDecimal ratio = reduce.subtract(new BigDecimal(costBudget.getBudgetCost())).divide(new BigDecimal(costBudget.getBudgetCost()), 2, BigDecimal.ROUND_HALF_UP); BigDecimal subtract = new BigDecimal(costBudget.getBudgetCost()).subtract(reduce);
BigDecimal ratio = subtract.divide(new BigDecimal(costBudget.getBudgetCost()), 2, BigDecimal.ROUND_HALF_UP);
costBudget.setSubtract(subtract);
costBudget.setCostDifference(ratio.multiply(new BigDecimal(100)).toString()); costBudget.setCostDifference(ratio.multiply(new BigDecimal(100)).toString());
} }
} }

2
src/main/java/com/zhgd/xmgl/modules/project/entity/ProgressPanoramaNodePlan.java
View File

@ -89,7 +89,7 @@ public class ProgressPanoramaNodePlan implements Serializable {
* 状态 * 状态
*/ */
@Excel(name = "状态", width = 15) @Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态(1:未开始[默认状态]；2：进行中；3：正常完成；4：延期完成)") @ApiModelProperty(value = "状态(1:未开始[默认状态]；2：进行中；3：延期完成；4：按期完成)")
private Integer status; private Integer status;
/** /**
* 实际偏差 * 实际偏差