Merge branch 'dev' of https://git.njzscloud.com/lzq/njzscloud into dev

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;
 
 

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;
 
     /**

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

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

@@ -228,12 +228,16 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Long stationId = orderPagingSearchParam.getStationId();
         String area = orderPagingSearchParam.getArea();
         OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory();
+        String transCompanyName = orderPagingSearchParam.getTransCompanyName();
+        String driverName = orderPagingSearchParam.getDriverName();
         QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>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)

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");
+    }
+
 }

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<UserMapper, UserEntity> implements
         Long userId = SecurityUtil.currentUserId();
         userAccountService.modifyPasswd(userId, modifyPasswdParam);
     }
+
+    public void resetPasswd(Long id) {
+        userAccountService.update(Wrappers.<UserAccountEntity>lambdaUpdate().eq(UserAccountEntity::getUserId, id)
+                .set(UserAccountEntity::getSecret, EncryptUtil.encrypt("666666")));
+    }
 }