Răsfoiți Sursa

调整待审核订单

785834757 2 ani în urmă
părinte
comite
14cbe90e23

+ 10 - 5
src/main/java/com/ydtech/modules/fnc/controller/CarSettleController.java

@@ -62,11 +62,16 @@ public class CarSettleController extends BaseController {
     public HttpResult<OrderVo> queryFeeDetail(@RequestSingleParam(value = "orderNo") @Valid String orderNo) {
         //查询已承保的子订单号
         //测试使用
-        List<InsAreaCompany> areaList =insAreaCompanyService.query()
-                .eq(StringUtils.isNotEmpty(orderNo),"orderno",orderNo)
-                .eq("orderstatus","3")
-                .or()
-                .eq("orderstatus","2").list();//3已承保
+//        List<InsAreaCompany> areaList =insAreaCompanyService.query()
+//                .eq(StringUtils.isNotEmpty(orderNo),"orderno",orderNo)
+//                .eq("orderstatus","3")
+//                .or()
+//                .eq("orderstatus","2").list();//3已承保
+
+        List<InsAreaCompany> areaList = insAreaCompanyService.query()
+                .eq("orderno", orderNo)
+                .and(wrapper -> wrapper.eq("orderstatus", "3").or().eq("orderstatus", "2"))
+                .list();//3已承保
         if(areaList!=null && areaList.size()>0){
             return insOrdersService.getByCompanyId(areaList.get(0).getId(),"accountingUser");
         }else{