车险结算费用审核

src/main/java/com/ydtech/modules/fnc/controller/CarSettleController.java

@@ -102,7 +102,7 @@ public class CarSettleController extends BaseController {
         if(areaList!=null && areaList.size()>0){
             InsFeeAudit insFeeAudit=new InsFeeAudit();
             insFeeAudit.setOrderno(orderNo);
-            insFeeAudit.setInsOrderNo(areaList.get(0).getInsOrderNo());
+            insFeeAudit.setInsOrderNo(areaList.get(0).getId());
             insFeeAudit.setAuditstatus("1");
             insFeeAudit.setAudittime(LocalDateTime.now());
             insFeeAudit.setAudituser(getUserId());

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -252,7 +252,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                     list.stream().map(InsAreaCompany::getOrderno).distinct().collect(Collectors.toList());
             wrapper.in(InsOrders::getOrderno, collect);
         }
-        if (StringUtils.isNotEmpty(orderQueryVo.getAuditStatus())) {
+        if (StringUtils.isNotEmpty(orderQueryVo.getAuditStatus())
+        &&orderQueryVo.getAuditStatus().equals("1")) {
             List<InsFeeAudit> list = insFeeAuditService.query()
                     .select("DISTINCT orderno")
                     .eq("auditstatus", orderQueryVo.getAuditStatus())
@@ -262,6 +263,17 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 wrapper.in(InsOrders::getOrderno, collect);
             }
         }
+        if (StringUtils.isNotEmpty(orderQueryVo.getAuditStatus())
+                &&orderQueryVo.getAuditStatus().equals("0")) {
+            List<InsFeeAudit> list = insFeeAuditService.query()
+                    .select("DISTINCT orderno")
+                    .eq("auditstatus", "1")
+                    .list();
+            List<String> collect = list.stream().map(InsFeeAudit::getOrderno).distinct().collect(Collectors.toList());
+            if(collect!=null && collect.size()>0){
+                wrapper.notIn(InsOrders::getOrderno, collect);
+            }
+        }
         Page<InsOrders> insOrdersPage = page(page, wrapper);
         return new BasePageResult<>(orderQueryVo.getPageNum(), page.getSize(), insOrdersPage.getTotal(),
                 page.getPages(), insOrdersPage.getRecords());