|
@@ -700,12 +700,19 @@ public class BizArchiveInputController extends BaseController {
|
|
if (typeOne != null) {
|
|
if (typeOne != null) {
|
|
Long workOrderId = typeOne.getWorkOrderId();
|
|
Long workOrderId = typeOne.getWorkOrderId();
|
|
//获取时间最后一个
|
|
//获取时间最后一个
|
|
- BizWorkOrderDetail bizWorkOrderDetail = bizWorkOrderDetailService.list(new LambdaQueryWrapper<BizWorkOrderDetail>()
|
|
|
|
|
|
+ List<BizWorkOrderDetail> list1 = bizWorkOrderDetailService.list(new LambdaQueryWrapper<BizWorkOrderDetail>()
|
|
.eq(BizWorkOrderDetail::getWorkOrderId, workOrderId)
|
|
.eq(BizWorkOrderDetail::getWorkOrderId, workOrderId)
|
|
.eq(BizWorkOrderDetail::getDeleted, 0)
|
|
.eq(BizWorkOrderDetail::getDeleted, 0)
|
|
.eq(BizWorkOrderDetail::getIsStop, 0)
|
|
.eq(BizWorkOrderDetail::getIsStop, 0)
|
|
.orderByDesc(BizWorkOrderDetail::getCreateTime)
|
|
.orderByDesc(BizWorkOrderDetail::getCreateTime)
|
|
- ).get(0);
|
|
|
|
|
|
+ );
|
|
|
|
+ for (BizWorkOrderDetail detail : list1) {
|
|
|
|
+ Long contractId = detail.getContractId();
|
|
|
|
+ Integer status = bizArchiveInputService.getById(contractId).getStatus();
|
|
|
|
+ detail.setStatus(status);
|
|
|
|
+ }
|
|
|
|
+ BizWorkOrderDetail bizWorkOrderDetail = list1.stream().filter(m -> !m.getStatus().equals(9)).collect(Collectors.toList()).get(0);
|
|
|
|
+
|
|
if (bizWorkOrderDetail.getId().equals(typeOne.getId())) {
|
|
if (bizWorkOrderDetail.getId().equals(typeOne.getId())) {
|
|
flag = true;
|
|
flag = true;
|
|
} else {
|
|
} else {
|