From 13fba7dc8a5f596605ff3d7ea5f182555d70f8da Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Mon, 1 Dec 2025 13:22:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervisory/order/pojo/param/OrderPagingSearchParam.java | 2 ++ .../njzscloud/supervisory/order/service/OrderInfoService.java | 4 ++++ 2 files changed, 6 insertions(+) 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 9e88cba..af53689 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 @@ -40,6 +40,8 @@ public class OrderPagingSearchParam { * 清运公司ID */ private Long transCompanyId; + private String transCompanyName; + private String driverName; /** * 产品ID 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 dfec9b9..ffbfd79 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 @@ -228,12 +228,16 @@ public class OrderInfoService extends ServiceImpl ew = Wrappers.query() .eq(stationId != null && stationId > 0, "a.station_id", stationId) .like(StrUtil.isNotBlank(sn), "a.sn", sn) .like(StrUtil.isNotBlank(licensePlate), "e.license_plate", licensePlate) .like(StrUtil.isNotBlank(nickname), "a.contacts", nickname) .like(StrUtil.isNotBlank(phone), "a.phone", phone) + .like(StrUtil.isNotBlank(transCompanyName), "g.company_name", transCompanyName) + .like(StrUtil.isNotBlank(driverName), "f.driver_name", driverName) .ge(startTime != null, "a.create_time", startTime) .le(endTime != null, "a.create_time", endTime) .eq(orderCategory != null, "a.order_category", orderCategory) From 2ad627983b589af7bbb2d9c4e23edaa7b238b1b8 Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Mon, 8 Dec 2025 12:48:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervisory/biz/pojo/entity/BizCompanyEntity.java | 2 ++ .../supervisory/biz/pojo/entity/BizDriverEntity.java | 2 ++ .../sys/user/controller/UserController.java | 10 ++++++++++ .../supervisory/sys/user/service/UserService.java | 6 ++++++ 4 files changed, 20 insertions(+) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java index e8dbec8..db44ced 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java @@ -62,11 +62,13 @@ public class BizCompanyEntity { /** * 营业执照有效期 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) private LocalDate licenseStartTime; /** * 营业执照有效期 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) private LocalDate licenseEndTime; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizDriverEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizDriverEntity.java index 55050df..9357e42 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizDriverEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizDriverEntity.java @@ -58,8 +58,10 @@ public class BizDriverEntity { */ private String drivingLicence; + @TableField(updateStrategy = FieldStrategy.ALWAYS) private LocalDate licenceStartTime; + @TableField(updateStrategy = FieldStrategy.ALWAYS) private LocalDate licenceEndTime; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/controller/UserController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/controller/UserController.java index 1dc33c8..6b1240f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/controller/UserController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/controller/UserController.java @@ -105,4 +105,14 @@ public class UserController { userService.modifyPasswd(modifyPasswdParam); return R.success(); } + + /** + * 重置密码 + */ + @GetMapping("/reset_passwd") + public R resetPasswd(@RequestParam("id") Long id) { + userService.resetPasswd(id); + return R.success(true, "重置成功，新密码：6个6"); + } + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java index c7b0c6f..8dd51f1 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.common.security.util.EncryptUtil; import com.njzscloud.common.security.util.SecurityUtil; import com.njzscloud.supervisory.biz.constant.BizObj; import com.njzscloud.supervisory.biz.pojo.param.AddBizCompanyParam; @@ -219,4 +220,9 @@ public class UserService extends ServiceImpl implements Long userId = SecurityUtil.currentUserId(); userAccountService.modifyPasswd(userId, modifyPasswdParam); } + + public void resetPasswd(Long id) { + userAccountService.update(Wrappers.lambdaUpdate().eq(UserAccountEntity::getUserId, id) + .set(UserAccountEntity::getSecret, EncryptUtil.encrypt("666666"))); + } }