|
@@ -463,11 +463,7 @@ public class BizWorkOrderController extends BaseController {
|
|
|
String lastdateTime = Time.setField(DateField.DAY_OF_MONTH,1).offset(DateField.MONTH, -1).toString("yyyy-MM-dd");
|
|
|
for(BizWorkOrder l : workOrders){
|
|
|
if(l.getType() == 1L){
|
|
|
- if(l.getTaskTypeId() == 1L){
|
|
|
- entrustList = entrusts.stream().filter(v -> v.getWorkOrderId().equals(l.getId()) && null!= v.getWorkMonth()&& v.getWorkMonth().toString().equals(lastdateTime)).collect(Collectors.toList());
|
|
|
- }else{
|
|
|
- entrustList = entrusts.stream().filter(v -> v.getWorkOrderId().equals(l.getId()) && null!= v.getWorkMonth()&& v.getWorkMonth().toString().equals(dateTime)).collect(Collectors.toList());
|
|
|
- }
|
|
|
+ entrustList = entrusts.stream().filter(v -> v.getWorkOrderId().equals(l.getId()) && null!= v.getWorkMonth()&& v.getWorkMonth().toString().equals(dateTime)).collect(Collectors.toList());
|
|
|
bizEntrust = entrustList.stream().min(comparator).orElse(null);
|
|
|
if(null != bizEntrust && bizEntrust.getDeleted() == 0L){
|
|
|
falsum++;
|