查询条件

njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/result/SearchCustomerResult.java

@@ -61,4 +61,12 @@ public class SearchCustomerResult {
     private SearchCompanyResult company;
 
     private String settlementWay;
+
+
+    private String idcard;
+    private String idcardStartTime;
+    private String idcardEndTime;
+    private String idcardFront;
+    private String idcardBack;
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/Hsoa.java

@@ -24,7 +24,7 @@ public class Hsoa {
     private static String refTnt = "";
     private static String tnt = "";
     private static long lastLoginTime = 0;
-    private static AppProperties appProperties;
+    private static final AppProperties appProperties;
 
     static {
         HttpClientDecorator httpClientDecorator = SpringUtil.getBean(HttpClientDecorator.class);

njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/HsoaProperties.java

@@ -15,5 +15,5 @@ public class HsoaProperties {
     private String baseUrl;
     private String username;
     private String password;
-    private int expire = 72 * 24 * 3600;
+    private int expire = 3 * 24 * 3600;
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java

@@ -45,6 +45,7 @@ public class OrderPagingSearchParam {
      * 订单编号
      */
     private String sn;
+    private String area;
 
     /**
      * 车牌号

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -223,6 +223,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Long goodsId = orderPagingSearchParam.getGoodsId();
         Page<OrderPagingResult> page = pageParam.toPage();
         Long stationId = orderPagingSearchParam.getStationId();
+        String area = orderPagingSearchParam.getArea();
         QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
                 .eq(stationId != null && stationId > 0, "a.station_id", stationId)
                 .like(StrUtil.isNotBlank(sn), "a.sn", sn)
@@ -233,6 +234,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 .le(endTime != null, "a.create_time", endTime)
                 .eq(null != transCompanyId, "a.trans_company_id", transCompanyId)
                 .eq("a.deleted", 0)
+                .eq(StrUtil.isNotBlank(area), "b.area", area)
                 .eq(null != goodsId, "c.origin_goods_id", goodsId);
         OrderViewType type = orderPagingSearchParam.getType();
         Assert.notNull(type, () -> Exceptions.clierr("订单类型不能为空"));

njzscloud-svr/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -47,7 +47,12 @@
         c.phone contacts_phone,
         c.audit_status,
         c.audit_memo,
-        c.settlement_way
+        c.settlement_way,
+        c.idcard,
+        c.idcard_Start_Time,
+        c.idcard_end_time,
+        c.idcard_front,
+        c.idcard_back
         FROM sys_user a
         INNER JOIN sys_user_account b ON b.user_id = a.id AND b.deleted = 0
         LEFT JOIN biz_company c ON c.user_id = a.id AND c.station = 0 AND c.deleted = 0