任务列表顺序修改
This commit is contained in:
parent
74d34c8351
commit
7ea07d45c9
@ -1,6 +1,7 @@
|
|||||||
package com.red.circle.other.app.command.admintask;
|
package com.red.circle.other.app.command.admintask;
|
||||||
|
|
||||||
import com.red.circle.other.domain.admintask.AdminTaskRecord;
|
import com.red.circle.other.domain.admintask.AdminTaskRecord;
|
||||||
|
import com.red.circle.other.domain.admintask.AdminTaskType;
|
||||||
import com.red.circle.other.domain.gateway.AdminTaskGateway;
|
import com.red.circle.other.domain.gateway.AdminTaskGateway;
|
||||||
import com.red.circle.other.app.dto.cmd.AdminTaskQueryCmd;
|
import com.red.circle.other.app.dto.cmd.AdminTaskQueryCmd;
|
||||||
import com.red.circle.other.infra.database.mongo.service.team.TeamBillCycleUtils;
|
import com.red.circle.other.infra.database.mongo.service.team.TeamBillCycleUtils;
|
||||||
@ -9,7 +10,10 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 管理员任务查询执行器
|
* 管理员任务查询执行器
|
||||||
@ -26,7 +30,17 @@ public class AdminTaskQueryCmdExe {
|
|||||||
public List<AdminTaskRecord> execute(AdminTaskQueryCmd cmd) {
|
public List<AdminTaskRecord> execute(AdminTaskQueryCmd cmd) {
|
||||||
LocalDate cycleStartDate = cmd.getCycleStartDate() != null ? cmd.getCycleStartDate() :
|
LocalDate cycleStartDate = cmd.getCycleStartDate() != null ? cmd.getCycleStartDate() :
|
||||||
LocalDate.parse(TeamBillCycleUtils.getCalcBillBelong().toString(), DateTimeFormatter.ofPattern("yyyyMMdd"));
|
LocalDate.parse(TeamBillCycleUtils.getCalcBillBelong().toString(), DateTimeFormatter.ofPattern("yyyyMMdd"));
|
||||||
return adminTaskGateway.findByUserIdAndCycle(cmd.getUserId(), cycleStartDate);
|
List<AdminTaskRecord> records = adminTaskGateway.findByUserIdAndCycle(cmd.getUserId(), cycleStartDate);
|
||||||
|
Map<String, AdminTaskRecord> taskRecordMap = records.stream().collect(Collectors.toMap(AdminTaskRecord::getTaskType, e -> e));
|
||||||
|
|
||||||
|
List<AdminTaskRecord> recordList = new ArrayList<>();
|
||||||
|
for (AdminTaskType value : AdminTaskType.values()) {
|
||||||
|
AdminTaskRecord record = taskRecordMap.get(value.getCode());
|
||||||
|
if (record != null) {
|
||||||
|
recordList.add(record);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return recordList;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user