fix 常用人员

ruoyi-admin/src/main/resources/application.yml

@@ -223,6 +223,12 @@ xss:
   # 排除链接（多个用逗号分隔）
   excludeUrls:
     - /system/notice
+    - /wuYe/news
+    - /wuYe/news/put
+    - /wuYe/manual
+    - /wuYe/manual/put
+    - /wuYe/partyNews
+    - /wuYe/partyNews/put
 
 # 全局线程池相关配置
 # 如使用JDK21请直接使用虚拟线程 不要开启此配置

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/blackManage/BlackManageController.java

@@ -77,7 +77,7 @@ public class BlackManageController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody BlackManageBo bo) {
-        return toAjax(blackManageService.insertByBo(bo));
+        return (blackManageService.insertByBo(bo));
     }
 
     /**
@@ -88,7 +88,7 @@ public class BlackManageController extends BaseController {
     @RepeatSubmit()
     @PostMapping("/put")
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody BlackManageBo bo) {
-        return toAjax(blackManageService.updateByBo(bo));
+        return blackManageService.updateByBo(bo);
     }
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/checkPoint/CheckPointManage.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
-import java.util.Date;
 
 /**
  * 巡更点管理对象 check_point_manage
@@ -44,7 +43,7 @@ public class CheckPointManage extends TenantEntity {
      * 巡更时间
      */
     @JsonFormat(pattern = "HH:mm:ss")
-    private Date checkTime;
+    private String checkTime;
 
     /**
      * 巡更路线

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/checkPoint/CheckPointRecord.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
-import java.util.Date;
 
 /**
  * 巡更点记录对象 check_point_record
@@ -49,7 +48,7 @@ public class CheckPointRecord extends TenantEntity {
      * 巡更设定时间
      */
     @JsonFormat(pattern = "HH:mm:ss")
-    private Date checkTime;
+    private String checkTime;
 
     /**
      * 巡更路线
@@ -104,7 +103,7 @@ public class CheckPointRecord extends TenantEntity {
     /**
      * 巡更完成时间
      */
-    private Date checkResultTime;
+    private String checkResultTime;
 
     /**
      * 是否巡更 1:未巡更 2:已巡更

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/checkPoint/bo/CheckPointRecordBo.java

@@ -11,9 +11,6 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.domain.checkPoint.CheckPointRecord;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
 
 /**
  * 巡更点记录业务对象 check_point_record
@@ -52,7 +49,7 @@ public class CheckPointRecordBo extends BaseEntity {
      * 巡更设定时间
      */
     @JsonFormat(pattern = "HH:mm:ss")
-    private Date checkTime;
+    private String checkTime;
 
     /**
      * 巡更路线
@@ -107,7 +104,7 @@ public class CheckPointRecordBo extends BaseEntity {
     /**
      * 巡更完成时间
      */
-    private Date checkResultTime;
+    private String checkResultTime;
 
     /**
      * 是否巡更 1:未巡更 2:已巡更

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/checkPoint/vo/CheckPointManageVo.java

@@ -9,7 +9,6 @@ import org.dromara.domain.checkPoint.CheckPointManage;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -50,7 +49,7 @@ public class CheckPointManageVo implements Serializable {
      */
     @ExcelProperty(value = "巡更时间")
     @JsonFormat(pattern = "HH:mm:ss")
-    private Date checkTime;
+    private String checkTime;
 
     /**
      * 巡更路线

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/checkPoint/vo/CheckPointRecordVo.java

@@ -122,7 +122,7 @@ public class CheckPointRecordVo implements Serializable {
      * 巡更完成时间
      */
     @ExcelProperty(value = "巡更完成时间")
-    private Date checkResultTime;
+    private String checkResultTime;
 
     /**
      * 是否巡更 1:未巡更 2:已巡更

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/communityNews/CommunityNews.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
-import java.util.Date;
 
 /**
  * 社区资讯对象 community_news
@@ -54,7 +53,7 @@ public class CommunityNews extends TenantEntity {
      * 发布时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date publishTime;
+    private String publishTime;
 
     /**
      * 用户id

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/communityNews/vo/CommunityNewsVo.java

@@ -13,7 +13,6 @@ import org.dromara.domain.communityNews.CommunityNews;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -68,7 +67,7 @@ public class CommunityNewsVo implements Serializable {
      */
     @ExcelProperty(value = "发布时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date publishTime;
+    private String publishTime;
 
     /**
      * 用户id

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/illegalParking/vo/IllegalParkingVo.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.domain.illegalParking.IllegalParking;
 
 import java.io.Serial;
@@ -20,7 +21,7 @@ import java.util.List;
 @Data
 @ExcelIgnoreUnannotated
 @AutoMapper(target = IllegalParking.class)
-public class IllegalParkingVo implements Serializable {
+public class IllegalParkingVo extends BaseEntity implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/partyNews/PartyNews.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
-import java.util.Date;
 
 /**
  * 党建资讯对象 party_news
@@ -54,7 +53,7 @@ public class PartyNews extends TenantEntity {
      * 发布时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date publishTime;
+    private String publishTime;
 
     /**
      * 作者，记录资讯的发布者

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/partyNews/vo/PartyNewsVo.java

@@ -13,7 +13,6 @@ import org.dromara.domain.partyNews.PartyNews;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -68,7 +67,7 @@ public class PartyNewsVo implements Serializable {
      */
     @ExcelProperty(value = "发布时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date publishTime;
+    private String publishTime;
 
     /**
      * 作者，记录资讯的发布者

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/IBlackManageService.java

@@ -1,6 +1,7 @@
 package org.dromara.service;
 
 
+import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.domain.blackManage.bo.BlackManageBo;
@@ -48,7 +49,7 @@ public interface IBlackManageService {
      * @param bo 黑名单管理
      * @return 是否新增成功
      */
-    Boolean insertByBo(BlackManageBo bo);
+    R<Void> insertByBo(BlackManageBo bo);
 
     /**
      * 修改黑名单管理
@@ -56,7 +57,7 @@ public interface IBlackManageService {
      * @param bo 黑名单管理
      * @return 是否修改成功
      */
-    Boolean updateByBo(BlackManageBo bo);
+    R<Void> updateByBo(BlackManageBo bo);
 
     /**
      * 校验并批量删除黑名单管理信息

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/BlackManageServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -19,6 +20,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import static org.dromara.common.core.constant.Constants.ONE;
+import static org.dromara.common.core.constant.Constants.Y;
+
 /**
  * 黑名单管理Service业务层处理
  *
@@ -86,14 +90,18 @@ public class BlackManageServiceImpl implements IBlackManageService {
      * @return 是否新增成功
      */
     @Override
-    public Boolean insertByBo(BlackManageBo bo) {
+    public R<Void> insertByBo(BlackManageBo bo) {
         BlackManage add = MapstructUtils.convert(bo, BlackManage.class);
         validEntityBeforeSave(add);
+        List<BlackManage> blackManages = baseMapper.selectList(new LambdaQueryWrapper<BlackManage>().eq(BlackManage::getBlackType, ONE).eq(BlackManage::getIsDel, Y));
+        if (!blackManages.isEmpty() && blackManages.size() > 1) {
+            return R.fail("当前类型已存在，请勿重复新增");
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setBlackManageId(add.getBlackManageId());
         }
-        return flag;
+        return R.ok();
     }
 
     /**
@@ -103,10 +111,16 @@ public class BlackManageServiceImpl implements IBlackManageService {
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(BlackManageBo bo) {
+    public R<Void> updateByBo(BlackManageBo bo) {
         BlackManage update = MapstructUtils.convert(bo, BlackManage.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        List<BlackManage> blackManages = baseMapper.selectList(new LambdaQueryWrapper<BlackManage>().eq(BlackManage::getBlackType, ONE).eq(BlackManage::getIsDel, Y));
+        if (!blackManages.isEmpty() && blackManages.size() > 1) {
+            return R.fail("当前类型已存在，请勿重复修改");
+        }
+         baseMapper.updateById(update);
+
+        return R.ok();
     }
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/CheckPointManageServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -136,10 +135,6 @@ public class CheckPointManageServiceImpl implements ICheckPointManageService {
 
     @Override
     public Boolean batchCheckPointManage(List<CheckPointManage> checkPointManageList) {
-        for (CheckPointManage pointManage : checkPointManageList) {
-            pointManage.setCreateTime(DateUtils.getNowDate());
-        }
-        boolean flag = baseMapper.insertBatch(checkPointManageList);
-        return flag;
+        return baseMapper.insertBatch(checkPointManageList);
     }
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/CheckPointRecordServiceImpl.java

@@ -19,10 +19,7 @@ import org.dromara.mapper.CheckPointRecordMapper;
 import org.dromara.service.ICheckPointRecordService;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.dromara.common.core.constant.Constants.TWO;
 
@@ -45,7 +42,7 @@ public class CheckPointRecordServiceImpl implements ICheckPointRecordService {
      * @return 巡更点记录
      */
     @Override
-    public CheckPointRecordVo queryById(Long checkPointRecordId){
+    public CheckPointRecordVo queryById(Long checkPointRecordId) {
         return baseMapper.selectVoById(checkPointRecordId);
     }
 
@@ -77,6 +74,7 @@ public class CheckPointRecordServiceImpl implements ICheckPointRecordService {
 
     private LambdaQueryWrapper<CheckPointRecord> buildQueryWrapper(CheckPointRecordBo bo) {
         LambdaQueryWrapper<CheckPointRecord> lqw = Wrappers.lambdaQuery();
+        Map<String, Object> params = bo.getParams();
         lqw.orderByAsc(CheckPointRecord::getCheckPointRecordId);
         lqw.eq(bo.getCheckPointManageId() != null, CheckPointRecord::getCheckPointManageId, bo.getCheckPointManageId());
         lqw.eq(StringUtils.isNotBlank(bo.getDateTimeNum()), CheckPointRecord::getDateTimeNum, bo.getDateTimeNum());
@@ -94,6 +92,10 @@ public class CheckPointRecordServiceImpl implements ICheckPointRecordService {
         lqw.eq(StringUtils.isNotBlank(bo.getCheckResultPhoto()), CheckPointRecord::getCheckResultPhoto, bo.getCheckResultPhoto());
         lqw.eq(bo.getCheckResultTime() != null, CheckPointRecord::getCheckResultTime, bo.getCheckResultTime());
         lqw.eq(StringUtils.isNotBlank(bo.getCheckStatus()), CheckPointRecord::getCheckStatus, bo.getCheckStatus());
+        Object createTime = params.get("createTime");
+        if (createTime != null) {
+            lqw.apply("date_format(check_result_time,'%Y-%m-%d')= '" + createTime + "'");
+        }
         return lqw;
     }
 
@@ -126,7 +128,7 @@ public class CheckPointRecordServiceImpl implements ICheckPointRecordService {
         //获取当前登录人的员工信息
         StaffManageDTO staffManage = LoginHelper.getLoginUser().getStaffManage();
         bo.setUpdateTime(DateUtils.getNowDate());
-        if (staffManage != null){
+        if (staffManage != null) {
             bo.setCheckUserName(staffManage.getStaffName());
             bo.setCheckUsePhone(staffManage.getPhoneNumber());
             bo.setCheckStaffId(staffManage.getStaffId());
@@ -139,7 +141,7 @@ public class CheckPointRecordServiceImpl implements ICheckPointRecordService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(CheckPointRecord entity){
+    private void validEntityBeforeSave(CheckPointRecord entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -152,7 +154,7 @@ public class CheckPointRecordServiceImpl implements ICheckPointRecordService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
@@ -160,19 +162,19 @@ public class CheckPointRecordServiceImpl implements ICheckPointRecordService {
 
     @Override
     public R<Map<String, Object>> getCheckPointRecordCount(CheckPointRecordBo bo) {
-        Map<String,Object> resultMap = new HashMap<>(3);
-        resultMap.put("checkPoint",0);
-        resultMap.put("yCheckPoint",0);
-        resultMap.put("wCheckPoint",0);
+        Map<String, Object> resultMap = new HashMap<>(3);
+        resultMap.put("checkPoint", 0);
+        resultMap.put("yCheckPoint", 0);
+        resultMap.put("wCheckPoint", 0);
         bo.setCreateTime(DateUtils.getNowDate());
         //查询出今日所有巡更点记录
         List<CheckPointRecordVo> checkPointRecords = queryList(bo);
-        if (checkPointRecords != null && !checkPointRecords.isEmpty()){
+        if (checkPointRecords != null && !checkPointRecords.isEmpty()) {
             //判断巡更时间不为null的代表已经巡更
-            resultMap.put("checkPoint",checkPointRecords.size());
+            resultMap.put("checkPoint", checkPointRecords.size());
             long checkCount = checkPointRecords.stream().filter(e -> TWO.equals(e.getCheckStatus())).count();
-            resultMap.put("yCheckPoint",checkCount);
-            resultMap.put("wCheckPoint",checkPointRecords.size()-checkCount);
+            resultMap.put("yCheckPoint", checkCount);
+            resultMap.put("wCheckPoint", checkPointRecords.size() - checkCount);
         }
         return R.ok(resultMap);
     }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/IllegalParkingServiceImpl.java

@@ -101,7 +101,7 @@ public class IllegalParkingServiceImpl implements IIllegalParkingService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<IllegalParking> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(IllegalParking::getIllegalParkingId);
-        lqw.eq(StringUtils.isNotBlank(bo.getPlateNumber()), IllegalParking::getPlateNumber, bo.getPlateNumber());
+        lqw.like(StringUtils.isNotBlank(bo.getPlateNumber()), IllegalParking::getPlateNumber, bo.getPlateNumber());
         lqw.eq(bo.getHouseId() != null, IllegalParking::getHouseId, bo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(bo.getVisitPortal()), IllegalParking::getVisitPortal, bo.getVisitPortal());
         lqw.eq(StringUtils.isNotBlank(bo.getMobileNumber()), IllegalParking::getMobileNumber, bo.getMobileNumber());
@@ -109,6 +109,10 @@ public class IllegalParkingServiceImpl implements IIllegalParkingService {
         lqw.eq(StringUtils.isNotBlank(bo.getIllegalPhoto()), IllegalParking::getIllegalPhoto, bo.getIllegalPhoto());
         lqw.eq(StringUtils.isNotBlank(bo.getCarType()), IllegalParking::getCarType, bo.getCarType());
         lqw.eq(StringUtils.isNotBlank(bo.getIsBlack()), IllegalParking::getIsBlack, bo.getIsBlack());
+        Object createTime = params.get("createTime");
+        if (createTime != null) {
+            lqw.apply("date_format(create_time,'%Y-%m-%d')= '" + createTime + "'");
+        }
         return lqw;
     }
 
@@ -128,7 +132,7 @@ public class IllegalParkingServiceImpl implements IIllegalParkingService {
         boolean flagBlack = true;
         if (!RedisUtils.hasKey(key)) {
             //没有就从数据库查询
-            BlackManageVo blackManageVo = blackManageMapper.selectVoOne(new LambdaQueryWrapper<BlackManage>().eq(BlackManage::getBlackType, ONE));
+            BlackManageVo blackManageVo = blackManageMapper.selectVoOne(new LambdaQueryWrapper<BlackManage>().eq(BlackManage::getBlackType, ONE).eq(BlackManage::getIsDel, Y));
             if (blackManageVo != null) {
                 blackNum = blackManageVo.getBlackNum();
                 RedisUtils.setAtomicValue(key, blackNum);

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/ReservRecordServiceImpl.java

@@ -73,7 +73,7 @@ public class ReservRecordServiceImpl implements IReservRecordService {
         LambdaQueryWrapper<ReservRecord> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(ReservRecord::getReservRecordId);
         lqw.eq(bo.getHouseId() != null, ReservRecord::getHouseId, bo.getHouseId());
-        lqw.eq(StringUtils.isNotBlank(bo.getHouseAddress()), ReservRecord::getHouseAddress, bo.getHouseAddress());
+        lqw.like(StringUtils.isNotBlank(bo.getHouseAddress()), ReservRecord::getHouseAddress, bo.getHouseAddress());
         lqw.eq(StringUtils.isNotBlank(bo.getDetailAddress()), ReservRecord::getDetailAddress, bo.getDetailAddress());
         lqw.eq(StringUtils.isNotBlank(bo.getLgt()), ReservRecord::getLgt, bo.getLgt());
         lqw.eq(StringUtils.isNotBlank(bo.getLat()), ReservRecord::getLat, bo.getLat());
@@ -88,6 +88,10 @@ public class ReservRecordServiceImpl implements IReservRecordService {
         lqw.eq(bo.getVisitorTime() != null, ReservRecord::getVisitorTime, bo.getVisitorTime());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ReservRecord::getStatus, bo.getStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getPhoto()), ReservRecord::getPhoto, bo.getPhoto());
+        Object createTime = params.get("createTime");
+        if (createTime != null) {
+            lqw.apply("date_format(visitor_time,'%Y-%m-%d')= '" + createTime + "'");
+        }
         return lqw;
     }
 

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/StatisticsServiceImpl.java

@@ -110,15 +110,15 @@ public class StatisticsServiceImpl implements IStatisticsService {
         }
         //查询巡更
         CheckPointRecordBo checkPointRecord = new CheckPointRecordBo();
-        checkPointRecord.setCheckTime(DateUtils.getNowDate());
+        checkPointRecord.setParams(params);
         List<CheckPointRecordVo> checkPointRecords = checkPointRecordService.queryList(checkPointRecord);
         if (checkPointRecords != null && !checkPointRecords.isEmpty()) {
             Map<String, List<CheckPointRecordVo>> collects = checkPointRecords.stream().collect(Collectors.groupingBy(CheckPointRecordVo::getCheckStatus));
-            if (collects.containsKey("1")) {
-                wxg = collects.get("1").size();
+            if (collects.containsKey(ONE)) {
+                wxg = collects.get(ONE).size();
             }
-            if (collects.containsKey("2")) {
-                yxg = collects.get("2").size();
+            if (collects.containsKey(TWO)) {
+                yxg = collects.get(TWO).size();
             }
         }
 
@@ -393,8 +393,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
         if (previousMonth == 0) {
             // 处理上月为0的特殊情况
             percentageChange = (currentMonth == 0)
-                    ? 0.0          // 两月都为0 → 0%变化
-                    : 100.0;       // 上月为0且本月非0 → 视为100%增长
+                ? 0.0          // 两月都为0 → 0%变化
+                : 100.0;       // 上月为0且本月非0 → 视为100%增长
         } else {
             // 常规计算并取绝对值确保正数
             double change = currentMonth - previousMonth;
@@ -405,16 +405,16 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
     @Override
     public AjaxResult numCar() {
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         //总数
         int zs = 1237;
         //外来
         int wl = 396;
         //内部
         int nb = 841;
-        map.put("zs",zs);
-        map.put("wl",wl);
-        map.put("nb",nb);
+        map.put("zs", zs);
+        map.put("wl", wl);
+        map.put("nb", nb);
         return AjaxResult.success(map);
     }
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/VisitorManageServiceImpl.java

@@ -79,7 +79,7 @@ public class VisitorManageServiceImpl implements IVisitorManageService {
         LambdaQueryWrapper<VisitorManage> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(VisitorManage::getVisitorManageId);
         lqw.eq(bo.getHouseId() != null, VisitorManage::getHouseId, bo.getHouseId());
-        lqw.eq(StringUtils.isNotBlank(bo.getHouseAddress()), VisitorManage::getHouseAddress, bo.getHouseAddress());
+        lqw.like(StringUtils.isNotBlank(bo.getHouseAddress()), VisitorManage::getHouseAddress, bo.getHouseAddress());
         lqw.like(StringUtils.isNotBlank(bo.getName()), VisitorManage::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getNum()), VisitorManage::getNum, bo.getNum());
         lqw.eq(StringUtils.isNotBlank(bo.getReason()), VisitorManage::getReason, bo.getReason());
@@ -90,6 +90,10 @@ public class VisitorManageServiceImpl implements IVisitorManageService {
         lqw.eq(bo.getVisitorTime() != null, VisitorManage::getVisitorTime, bo.getVisitorTime());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), VisitorManage::getStatus, bo.getStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getPhoto()), VisitorManage::getPhoto, bo.getPhoto());
+        Object createTime = params.get("createTime");
+        if (createTime != null) {
+            lqw.apply("date_format(visitor_time,'%Y-%m-%d')= '" + createTime + "'");
+        }
         return lqw;
     }