|
@@ -502,7 +502,7 @@ public class WorkOrderCurrentController extends BaseController {
|
|
bizEntrust.setWorkMonth(currentMonth.offset(DateField.MONTH, 1).toSqlDate());
|
|
bizEntrust.setWorkMonth(currentMonth.offset(DateField.MONTH, 1).toSqlDate());
|
|
List<BizEntrust> list = bizEntrustService.list(new LambdaQueryWrapper<BizEntrust>()
|
|
List<BizEntrust> list = bizEntrustService.list(new LambdaQueryWrapper<BizEntrust>()
|
|
.eq(BizEntrust::getDeleted, 0)
|
|
.eq(BizEntrust::getDeleted, 0)
|
|
- .eq(BizEntrust::getWorkMonth, currentMonth.offset(DateField.MONTH, 1).toSqlDate())
|
|
|
|
|
|
+ .eq(BizEntrust::getWorkMonth, bizEntrust.getWorkMonth())
|
|
.in(BizEntrust::getWorkOrderId, bizEntrust.getWorkOrderIds()));
|
|
.in(BizEntrust::getWorkOrderId, bizEntrust.getWorkOrderIds()));
|
|
List<Long> needWorkIds = list.stream().filter(l ->
|
|
List<Long> needWorkIds = list.stream().filter(l ->
|
|
{
|
|
{
|