ly 1 rok pred
rodič
commit
12c8cda66d

+ 9 - 2
src/main/java/cn/ezhizao/project/business/order/controller/BizArchiveInputController.java

@@ -700,12 +700,19 @@ public class BizArchiveInputController extends BaseController {
         if (typeOne != null) {
             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::getDeleted, 0)
                     .eq(BizWorkOrderDetail::getIsStop, 0)
                     .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())) {
                 flag = true;
             } else {

+ 4 - 0
src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrderDetail.java

@@ -69,5 +69,9 @@ public class BizWorkOrderDetail extends BaseEntity
     @TableField(exist = false)
     private BigDecimal monthPrice;
 
+    @TableField(exist = false)
+    //合同状态
+    private Integer status;
+
 
 }