|
@@ -128,6 +128,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
public Map<String, Object> planTask(MaintenanceRecordRequest request) {
|
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
|
Map<String, Long> countMap = new HashMap<>();
|
|
|
+ request.setEndTime(request.getCurrentTime().with(TemporalAdjusters.lastDayOfMonth()));
|
|
|
IPage<MaintenanceAppResponse> page = maintenancePlanMapper.findPlanByWorkerId(request.getPage(), request);
|
|
|
|
|
|
List<MaintenanceAppResponse> records = page.getRecords();
|
|
@@ -179,6 +180,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
public Map<String, Object> recordTask(MaintenanceRecordRequest request) {
|
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
|
Map<String, Long> countMap = new HashMap<>();
|
|
|
+ request.setEndTime(request.getCurrentTime().with(TemporalAdjusters.lastDayOfMonth()));
|
|
|
IPage<MaintenanceAppResponse> page = maintenanceRecordMapper.findRecordByWorkerId(request.getPage(), request);
|
|
|
List<MaintenanceAppResponse> records = page.getRecords();
|
|
|
if (CollUtil.isNotEmpty(records)) {
|