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

计划培训期数/人次计算规则修改

master
徐杰盟 2024-11-14 16:01:48 +08:00
parent 1335e14e0b
commit 0704035698
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,10 +166,11 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
int month = calendar.get(Calendar.MONTH) + 1;
if (CollectionUtils.isNotEmpty(planLogs)) { if (CollectionUtils.isNotEmpty(planLogs)) {
vo.setNumberOfPeriods1(planLogs.size()); vo.setNumberOfPeriods1(planLogs.size());
vo.setPersonNum1(planLogs.stream().mapToInt(PersonnelPlanLog::getNumPeople).sum()); vo.setPersonNum1(planLogs.stream().mapToInt(PersonnelPlanLog::getNumPeople).sum());
for (int i = 1; i <= 12; i++) { for (int i = 1; i <= month; i++) {
PersonnelPlanLogStatisticsVo.EchartsData echartsData1 = map1.get(i); PersonnelPlanLogStatisticsVo.EchartsData echartsData1 = map1.get(i);
PersonnelPlanLogStatisticsVo.EchartsData echartsData2 = map2.get(i); PersonnelPlanLogStatisticsVo.EchartsData echartsData2 = map2.get(i);
@ -184,7 +185,7 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
.filter(item -> .filter(item ->
{ {
calendar.setTime(item.getPlanDate()); calendar.setTime(item.getPlanDate());
return calendar.get(Calendar.MONTH) + 1 == finalI; return month == finalI;
}) })
.toList(); .toList();
@ -202,7 +203,8 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
if (CollectionUtils.isNotEmpty(plans)) { if (CollectionUtils.isNotEmpty(plans)) {
vo.setNumberOfPeriods2(plans.stream().mapToInt(PersonnelPlan::getNum).sum()); vo.setNumberOfPeriods2(plans.stream().mapToInt(PersonnelPlan::getNum).sum());
vo.setPersonNum2(plans.stream().mapToInt(PersonnelPlan::getNumPeople).sum()); vo.setPersonNum2(plans.stream().mapToInt(PersonnelPlan::getNumPeople).sum());
for (int i = 1; i <= 12; i++) {
for (int i = 1; i <= month; i++) {
PersonnelPlanLogStatisticsVo.EchartsData echartsData1 = map1.get(i); PersonnelPlanLogStatisticsVo.EchartsData echartsData1 = map1.get(i);
if (Objects.isNull(echartsData1)) { if (Objects.isNull(echartsData1)) {
echartsData1 = new PersonnelPlanLogStatisticsVo.EchartsData(); echartsData1 = new PersonnelPlanLogStatisticsVo.EchartsData();
@ -216,7 +218,7 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
.filter(item -> .filter(item ->
{ {
calendar.setTime(item.getStm()); calendar.setTime(item.getStm());
return calendar.get(Calendar.MONTH) + 1 == finalI; return month == finalI;
}).toList(); }).toList();
echartsData1.setMonth(finalI) echartsData1.setMonth(finalI)