|
@@ -195,9 +195,12 @@ public class WorkOrderOnceController extends BaseController {
|
|
|
// 当前月的委托信息
|
|
|
List<BizEntrust> currEntrustList = bizEntrustService.getList(bizEntrust);
|
|
|
// 当前月的委托日期
|
|
|
- DateTime currentMonth = DateTime.of(bizEntrust.getWorkMonth());
|
|
|
+ DateTime currMonth = DateTime.of(bizEntrust.getWorkMonth());
|
|
|
+ // 下月的委托工作日期
|
|
|
+ Date nextMonth = currMonth.offset(DateField.MONTH, 1).toSqlDate();
|
|
|
+
|
|
|
// 下个月的委托日期
|
|
|
- bizEntrust.setWorkMonth(currentMonth.offset(DateField.MONTH, 1).toSqlDate());
|
|
|
+ bizEntrust.setWorkMonth(nextMonth);
|
|
|
// 下个月的委托日期
|
|
|
List<BizEntrust> nextEntrustList = bizEntrustService.getList(bizEntrust);
|
|
|
|
|
@@ -216,12 +219,10 @@ public class WorkOrderOnceController extends BaseController {
|
|
|
bizWorkOrderRecordService.remove(currWrapper);
|
|
|
|
|
|
// 删除下个月的委托工单信息,要看业务是否生成,或者说有更多的委托工单信息 TOOD
|
|
|
- /**
|
|
|
LambdaQueryWrapper<BizWorkOrderRecord> nextWrapper = new LambdaQueryWrapper<>();
|
|
|
- nextWrapper.eq(BizWorkOrderRecord::getMonth, currentMonth.offset(DateField.MONTH, 1).toSqlDate());
|
|
|
+ nextWrapper.eq(BizWorkOrderRecord::getMonth, nextMonth);
|
|
|
nextWrapper.in(BizWorkOrderRecord::getWorkOrderId, workOrderIds);
|
|
|
bizWorkOrderRecordService.remove(nextWrapper);
|
|
|
- **/
|
|
|
|
|
|
// 删除当前月份的委托信息和下个月的委托信息
|
|
|
boolean status = (currEntrustList.isEmpty()
|