|
@@ -320,8 +320,9 @@ public class BizArchiveInputController extends BaseController {
|
|
|
.eq(BizWorkOrderDetail::getContractDetailId, detail.getId())
|
|
|
.eq(BizWorkOrderDetail::getIsStop, 0)
|
|
|
.eq(BizWorkOrderDetail::getTaskTypeId, detail.getTaskTypeId()));
|
|
|
+ List<BizWorkOrderRecord> list = null;
|
|
|
if (one != null) {
|
|
|
- List<BizWorkOrderRecord> list = workOrderRecordService.list(new LambdaQueryWrapper<BizWorkOrderRecord>()
|
|
|
+ list = workOrderRecordService.list(new LambdaQueryWrapper<BizWorkOrderRecord>()
|
|
|
.eq(BizWorkOrderRecord::getWorkOrderId, one.getWorkOrderId()));
|
|
|
if (CollectionUtils.isNotEmpty(list)) {
|
|
|
detail.setDisabled(true);
|
|
@@ -333,6 +334,16 @@ public class BizArchiveInputController extends BaseController {
|
|
|
TimeVo time = getTime(detail.getContractId(), detail.getId(), detail.getTaskTypeId(), detail.getCompanyId());
|
|
|
if (time != null) {
|
|
|
detail.setTimeVo(time);
|
|
|
+ if (list != null &&
|
|
|
+ list.stream()
|
|
|
+ .anyMatch(record ->
|
|
|
+ DateTime.of(detail.getTimeVo().getStartTime())
|
|
|
+ .toString("yyyyMM")
|
|
|
+ .compareTo(record.getYear() + record.getMonth()) <= 0)) {
|
|
|
+ detail.setMonthDisabled(true);
|
|
|
+ }else{
|
|
|
+ detail.setMonthDisabled(false);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|