|
@@ -43,6 +43,8 @@ import cn.ezhizao.project.system.domain.SysDictData;
|
|
|
import cn.ezhizao.project.system.domain.SysFileStorage;
|
|
|
import cn.ezhizao.project.system.service.ISysDictDataService;
|
|
|
import cn.ezhizao.project.system.service.ISysFileStorageService;
|
|
|
+import cn.hutool.core.date.DateField;
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -134,7 +136,7 @@ public class WorkOrderServiceController extends BaseController {
|
|
|
List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
|
|
|
list.forEach(v -> {
|
|
|
v.setRecords(records.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));
|
|
|
- v.setEntrusts(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));
|
|
|
+ v.setEntrusts(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId()) && null!=e.getWorkMonth() && e.getWorkMonth().toString().equals(DateTime.now().setField(DateField.DAY_OF_MONTH,1).toString("yyyy-MM-dd"))).collect(Collectors.toList()));
|
|
|
});
|
|
|
return getDataTable(list);
|
|
|
}
|