yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

培训记录统计修改

master
徐杰盟 2024-09-26 10:06:16 +08:00
parent 9010e1e205
commit 4982f58106
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java
View File

@ -27,6 +27,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.*; import java.util.*;
@ -174,6 +176,9 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
if (Objects.isNull(echartsData1)) { if (Objects.isNull(echartsData1)) {
echartsData1 = new PersonnelPlanLogStatisticsVo.EchartsData(); echartsData1 = new PersonnelPlanLogStatisticsVo.EchartsData();
} }
if (Objects.isNull(echartsData2)) {
echartsData2 = new PersonnelPlanLogStatisticsVo.EchartsData();
}
int finalI = i; int finalI = i;
List<PersonnelPlanLog> list = planLogs.stream() List<PersonnelPlanLog> list = planLogs.stream()
.filter(item -> .filter(item ->
@ -216,11 +221,19 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
echartsData1.setMonth(finalI) echartsData1.setMonth(finalI)
.setNum2(list.stream().mapToInt(PersonnelPlan::getNumPeople).sum()); .setNum2(list.stream().mapToInt(PersonnelPlan::getNumPeople).sum());
if ( echartsData1.getNum1() > 0 && echartsData1.getNum2() > 0){
echartsData1.setRate(new BigDecimal(echartsData1.getNum1()).divide(new BigDecimal(echartsData1.getNum2()), 4, RoundingMode.HALF_UP));
}
map1.put(i, echartsData1); map1.put(i, echartsData1);
echartsData2 echartsData2
.setMonth(finalI) .setMonth(finalI)
.setNum2(list.size()); .setNum2(list.size());
if (echartsData1.getNum1() > 0 && echartsData1.getNum2() > 0){
echartsData2.setRate(new BigDecimal(echartsData2.getNum1()).divide(new BigDecimal(echartsData2.getNum2()), 4, RoundingMode.HALF_UP));
}
map2.put(i, echartsData2); map2.put(i, echartsData2);
} }
} }

2
src/main/java/com/gunshi/project/xyt/entity/vo/PersonnelPlanLogStatisticsVo.java
View File

@ -53,6 +53,6 @@ public class PersonnelPlanLogStatisticsVo {
private Integer num2 = 0; private Integer num2 = 0;
@Schema(description="完成率") @Schema(description="完成率")
private BigDecimal rate; private BigDecimal rate = BigDecimal.ZERO;
} }
} }