|
@@ -323,9 +323,12 @@ public class BizWorkOrderController extends BaseController {
|
|
|
List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
|
|
|
Set<String> bizEntrustSet;
|
|
|
for(BizWorkOrder v : list){
|
|
|
+ v.setEntrust(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"))).findFirst().orElse(null));
|
|
|
// bizEntrustSet = entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList())
|
|
|
// .stream().map(BizEntrust::getToAccountName).distinct().collect(Collectors.toSet());
|
|
|
- v.setEntrust(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).findFirst().orElse(null));
|
|
|
+ //v.setEntrust(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).findFirst().orElse(null));
|
|
|
v.setServiceName(v.getEntrust() == null ? v.getServiceName() : v.getEntrust().getToAccountName());
|
|
|
if(v.getType().equals(2)){
|
|
|
v.setTaskTypeName(v.getTaskTypeName()+"-"+v.getTaskTypeDetailName());
|