diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/result/SearchCustomerResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/result/SearchCustomerResult.java index b635b77..714770c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/result/SearchCustomerResult.java +++ b/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; + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/Hsoa.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/Hsoa.java index d50c930..479cd3a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/Hsoa.java +++ b/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); diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/HsoaProperties.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/HsoaProperties.java index 8fe6d1f..78d4c94 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/HsoaProperties.java +++ b/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; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java index 852ccf4..d2fd38f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java +++ b/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; /** * 车牌号 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 04b0cc9..a8067e1 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -223,6 +223,7 @@ public class OrderInfoService extends ServiceImpl page = pageParam.toPage(); Long stationId = orderPagingSearchParam.getStationId(); + String area = orderPagingSearchParam.getArea(); QueryWrapper ew = Wrappers.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 Exceptions.clierr("订单类型不能为空")); diff --git a/njzscloud-svr/src/main/resources/mapper/customer/CustomerMapper.xml b/njzscloud-svr/src/main/resources/mapper/customer/CustomerMapper.xml index e3204bd..5107b8a 100644 --- a/njzscloud-svr/src/main/resources/mapper/customer/CustomerMapper.xml +++ b/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