mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改汇总页面可见性

master
OathK1per 2021-11-19 15:50:00 +08:00
parent 2879417e56
commit fef4b2220f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/cn/palmte/work/service/ProjectSummaryService.java
View File

@ -53,7 +53,7 @@ public class ProjectSummaryService {
List<Project> projects = new ArrayList<>();
List<Integer> projectInt = new ArrayList<>();
for (Project project : projectList) {
if (project.getApproveStatusBudget() == 2) {
if (project.getApproveStatusSettle() == 2) {
projects.add(project);
projectInt.add(project.getId());
continue;
@ -177,7 +177,8 @@ public class ProjectSummaryService {
private void setProfitMargin(SettleBean monthSettle) {
BigDecimal divide2 = monthSettle.getIncomeTotal();
if (divide2.equals(new BigDecimal(0))) {
BigDecimal min = new BigDecimal(0.01);
if (divide2.compareTo(min) < 0) {
divide2 = new BigDecimal(1);
}
monthSettle.setGrossProfitProfitMargin(monthSettle.getGrossProfit().multiply(new BigDecimal(100).divide(divide2, BigDecimal.ROUND_HALF_UP)));