no message

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -52,6 +52,7 @@ import java.io.BufferedInputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -99,10 +100,19 @@ public class BizCollectionController extends BaseController {
     @GetMapping(value = "/detail/{id}")
     @ResponseBody
     public AjaxResult getCollectionDetailByInputId(@PathVariable Long id) {
+        ArrayList<BizCollectionDetail> bizCollectionDetails = new ArrayList<>();
         //实收金额
-        List<BizCollectionDetail> list = collectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>().eq(BizCollectionDetail::getContractId, id));
+        List<BizCollectionDetail> list = collectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>()
+                .eq(BizCollectionDetail::getContractId, id));
+        for (BizCollectionDetail detail : list) {
+            Long collectionId = detail.getCollectionId();
+            BizCollection byId = collectionService.getById(collectionId);
+            if (byId.getStatus()!=2){
+                bizCollectionDetails.add(detail);
+            }
+        }
 //        BigDecimal detailAmount  = list.stream().map(m -> m.getArriveAmount()).reduce(BigDecimal::add).get();
-        return success(list);
+        return success(bizCollectionDetails);
     }
 
     @ApiOperation(value = "主从保存", notes = "主从保存")