fix 常用人员

ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java

@@ -69,7 +69,7 @@ public class CaptchaController {
             log.error("验证码短信发送异常 => {}", smsResponse);
             return R.fail(smsResponse.getData().toString());
         }*/
-        return R.ok();
+        return R.ok(code);
     }
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java

@@ -151,6 +151,7 @@ public class SysProfileController extends BaseController {
     @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public AjaxResult avatar(@RequestPart("avatarfile") MultipartFile avatarfile) throws Exception{
         if (!avatarfile.isEmpty()) {
+            String name = avatarfile.getName();
             String extension = FileUtil.extName(avatarfile.getOriginalFilename());
             if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
                 return AjaxResult.error("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");

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

@@ -2,6 +2,7 @@ package org.dromara.domain.checkPoint;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
@@ -42,6 +43,7 @@ public class CheckPointManage extends TenantEntity {
     /**
      * 巡更时间
      */
+    @JsonFormat(pattern = "HH:mm:ss")
     private Date checkTime;
 
     /**

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

@@ -48,7 +48,7 @@ public class CheckPointRecord extends TenantEntity {
     /**
      * 巡更设定时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     private Date checkTime;
 
     /**

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

@@ -1,5 +1,6 @@
 package org.dromara.domain.checkPoint.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -10,7 +11,6 @@ import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.domain.checkPoint.CheckPointManage;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -44,7 +44,8 @@ public class CheckPointManageBo extends BaseEntity {
     /**
      * 巡更时间
      */
-    private Date checkTime;
+    @JsonFormat(pattern = "HH:mm:ss")
+    private String checkTime;
 
     /**
      * 巡更路线

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

@@ -51,8 +51,7 @@ public class CheckPointRecordBo extends BaseEntity {
     /**
      * 巡更设定时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     private Date checkTime;
 
     /**

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

@@ -2,6 +2,7 @@ package org.dromara.domain.checkPoint.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.domain.checkPoint.CheckPointManage;
@@ -48,6 +49,7 @@ public class CheckPointManageVo implements Serializable {
      * 巡更时间
      */
     @ExcelProperty(value = "巡更时间")
+    @JsonFormat(pattern = "HH:mm:ss")
     private Date checkTime;
 
     /**

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

@@ -2,6 +2,7 @@ package org.dromara.domain.checkPoint.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.domain.checkPoint.CheckPointRecord;
@@ -54,6 +55,7 @@ public class CheckPointRecordVo implements Serializable {
      * 巡更设定时间
      */
     @ExcelProperty(value = "巡更设定时间")
+    @JsonFormat(pattern = "HH:mm:ss")
     private Date checkTime;
 
     /**

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

@@ -11,8 +11,6 @@ import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.domain.communityNews.CommunityNews;
 
-import java.util.Date;
-
 /**
  * 社区资讯业务对象 community_news
  *
@@ -56,7 +54,7 @@ public class CommunityNewsBo extends BaseEntity {
      * 发布时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date publishTime;
+    private String publishTime;
 
     /**
      * 用户id

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/complaintSuggestion/ComplaintSuggestion.java

@@ -2,6 +2,7 @@ package org.dromara.domain.complaintSuggestion;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
@@ -47,7 +48,14 @@ public class ComplaintSuggestion extends TenantEntity {
     /**
      * 投诉建议提交时间
      */
-    private Date createdTime;
+    @JsonFormat(pattern = "yyyy-MM-dd ")
+    private Date pushTime;
+
+    /**
+     * 回复时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date replyTime;
 
     /**
      * 投诉建议状态：1（待回复）、2（已回复）

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/complaintSuggestion/bo/ComplaintSuggestionBo.java

@@ -1,6 +1,7 @@
 package org.dromara.domain.complaintSuggestion.bo;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -48,7 +49,14 @@ public class ComplaintSuggestionBo extends BaseEntity {
     /**
      * 投诉建议提交时间
      */
-    private Date createdTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date pushTime;
+
+    /**
+     * 回复时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date replyTime;
 
     /**
      * 投诉建议状态：1（待回复）、2（已回复）

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/complaintSuggestion/vo/ComplaintSuggestionVo.java

@@ -2,6 +2,7 @@ package org.dromara.domain.complaintSuggestion.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -58,8 +59,14 @@ public class ComplaintSuggestionVo implements Serializable {
      * 投诉建议提交时间
      */
     @ExcelProperty(value = "投诉建议提交时间")
-    private Date createdTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date pushTime;
 
+    /**
+     * 回复时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date replyTime;
     /**
      * 投诉建议状态：1（待回复）、2（已回复）
      */

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/vo/HouseInfoVo.java

@@ -3,8 +3,6 @@ package org.dromara.domain.houseInfo.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.common.excel.annotation.Excel;
-import org.dromara.common.excel.annotation.Excels;
 import org.dromara.domain.houseInfo.HouseInfo;
 import org.dromara.domain.residentInfo.vo.ResidentInfoVo;
 
@@ -36,108 +34,108 @@ public class HouseInfoVo implements Serializable {
     /**
      * 权利人姓名
      */
-    @Excel(name = "权利人姓名")
+    //@Excel(name = "权利人姓名")
     private String ownerName;
 
     /**
      * 房屋坐落位置
      */
-    @Excel(name = "房屋坐落位置")
+    //@Excel(name = "房屋坐落位置")
     private String location;
 
     /**
      * 权利类型，如所有权、使用权等
      */
-    @Excel(name = "权利类型，如所有权、使用权等")
+    //@Excel(name = "权利类型，如所有权、使用权等")
     private String rightType;
 
     /**
      * 房屋面积，单位为平方米
      */
-    @Excel(name = "房屋面积，单位为平方米")
+    //@Excel(name = "房屋面积，单位为平方米")
     private Long area;
 
     /**
      * 房屋相关的字第号
      */
-    @Excel(name = "房屋相关的字第号")
+    //@Excel(name = "房屋相关的字第号")
     private String documentNumber;
 
     /**
      * 不动产单元号，唯一标识不动产单元
      */
-    @Excel(name = "不动产单元号，唯一标识不动产单元")
+    //@Excel(name = "不动产单元号，唯一标识不动产单元")
     private String propertyUnitNumber;
 
     /**
      * 房屋的共有情况，如共有比例等
      */
-    @Excel(name = "房屋的共有情况，如共有比例等")
+    //@Excel(name = "房屋的共有情况，如共有比例等")
     private String coOwnership;
 
     /**
      * 房屋用途，如住宅、商业等
      */
-    @Excel(name = "房屋用途，如住宅、商业等")
+    //@Excel(name = "房屋用途，如住宅、商业等")
     private String usageType;
 
     /**
      * 房屋使用期限
      */
-    @Excel(name = "房屋使用期限")
+    //@Excel(name = "房屋使用期限")
     private String usagePeriod;
 
     /**
      * 房屋登记日期
      */
-    @Excel(name = "房屋登记日期")
+    //@Excel(name = "房屋登记日期")
     private Date registrationDate;
 
     /**
      * 共有人姓名，多个共有人可以用逗号分隔
      */
-    @Excel(name = "共有人姓名，多个共有人可以用逗号分隔")
+    //@Excel(name = "共有人姓名，多个共有人可以用逗号分隔")
     private String coOwner;
 
     /**
      * 房屋的详细门牌号
      */
-    @Excel(name = "房屋的详细门牌号")
+    //@Excel(name = "房屋的详细门牌号")
     private String detailedAddress;
 
     /**
      * 是否有车位，Y表示有，N表示无
      */
-    @Excel(name = "是否有车位",readConverterExp = "Y=有,N=无")
+    //@Excel(name = "是否有车位",readConverterExp = "Y=有,N=无")
     private String hasParkingSpace;
 
     /**
      * 车位编号
      */
-    @Excel(name = "车位编号")
+    //@Excel(name = "车位编号")
     private String parkingNumber;
 
     /**
      * 房屋所在小区名称
      */
-    @Excel(name = "房屋所在小区名称")
+   // @Excel(name = "房屋所在小区名称")
     private String communityName;
 
     /**
      * 房屋状态：1-自住，2-空闲，3-待售空闲，4-出租
      */
-    @Excel(name = "房屋状态",readConverterExp = "1=自住,2=空闲,3待售空闲,4=出租")
+    //@Excel(name = "房屋状态",readConverterExp = "1=自住,2=空闲,3待售空闲,4=出租")
     private Long houseStatus;
 
     /**
      * 备注
      */
-    @Excel(name = "备注")
+    //@Excel(name = "备注")
     private String remark;
 
 
     /** 房屋住户信息 */
-    @Excels({
+/*    @Excels({
         @Excel(name = "居住人员的详细门牌号", targetAttr = "detailedAddress", type = Excel.Type.IMPORT),
         @Excel(name = "居住人员姓名", targetAttr = "residentName", type = Excel.Type.IMPORT),
         @Excel(name = "居住人员身份证号码", targetAttr = "residentIdCard", type = Excel.Type.IMPORT),
@@ -149,7 +147,7 @@ public class HouseInfoVo implements Serializable {
         @Excel(name = "是否是租户", targetAttr = "isTenant", readConverterExp = "是=Y,否=N", type = Excel.Type.IMPORT),
         @Excel(name = "居住人员工作单位", targetAttr = "residentEmployer", type = Excel.Type.IMPORT),
         @Excel(name = "居住人员面貌", targetAttr = "residentAppearance", type = Excel.Type.IMPORT)
-    })
+    })*/
     private List<ResidentInfoVo> residentInfoList;
     /**
      * 房本照片

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

@@ -11,8 +11,6 @@ import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.domain.partyNews.PartyNews;
 
-import java.util.Date;
-
 /**
  * 党建资讯业务对象 party_news
  *
@@ -56,7 +54,7 @@ public class PartyNewsBo extends BaseEntity {
      * 发布时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date publishTime;
+    private String publishTime;
 
     /**
      * 作者，记录资讯的发布者

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/propertyRepair/PropertyRepair.java

@@ -1,13 +1,13 @@
 package org.dromara.domain.propertyRepair;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
-import java.util.Date;
 
 /**
  * 物业报修对象 property_repair
@@ -42,7 +42,7 @@ public class PropertyRepair extends TenantEntity {
     /**
      * 报修时间，记录报修提交的时间
      */
-    private Date repairTime;
+    private String repairTime;
 
     /**
      * 报修用户id
@@ -89,6 +89,11 @@ public class PropertyRepair extends TenantEntity {
      */
     private Long staffId;
 
+    /**维修人员用户id
+     *
+     */
+    private Long staffUserId;
+
     /**
      * 维修人员手机号
      */
@@ -97,11 +102,11 @@ public class PropertyRepair extends TenantEntity {
     /**
      * 上门时间，记录维修人员上门的时间
      */
-    private Date visitTime;
+    private String visitTime;
     /**
      * 指派时间
      */
-    private Date assignTime;
+    private String assignTime;
 
     /**
      * 上门拍照，存储图片路径或URL
@@ -111,7 +116,7 @@ public class PropertyRepair extends TenantEntity {
     /**
      * 维修结束时间，记录维修完成的时间
      */
-    private Date completionTime;
+    private String completionTime;
 
     /**
      * 维修结束拍照，存储图片路径或URL
@@ -128,5 +133,9 @@ public class PropertyRepair extends TenantEntity {
      */
     private String remark;
 
-
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/propertyRepair/bo/PropertyRepairBo.java

@@ -1,17 +1,14 @@
 package org.dromara.domain.propertyRepair.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-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.propertyRepair.PropertyRepair;
 
-import java.util.Date;
-
 /**
  * 物业报修业务对象 property_repair
  *
@@ -37,18 +34,20 @@ public class PropertyRepairBo extends BaseEntity {
     /**
      * 详细门牌号
      */
-    @NotBlank(message = "详细门牌号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "详细门牌号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String houseAddress;
 
     /**
      * 指派时间
      */
-    private Date assignTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String assignTime;
 
     /**
      * 报修时间，记录报修提交的时间
      */
-    private Date repairTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String repairTime;
 
     /**
      * 报修用户id
@@ -94,6 +93,10 @@ public class PropertyRepairBo extends BaseEntity {
      * 维修人员ID
      */
     private Long staffId;
+    /**
+     *维修人员用户id
+     */
+    private Long staffUserId;
 
     /**
      * 维修人员手机号
@@ -103,7 +106,8 @@ public class PropertyRepairBo extends BaseEntity {
     /**
      * 上门时间，记录维修人员上门的时间
      */
-    private Date visitTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String visitTime;
 
     /**
      * 上门拍照，存储图片路径或URL
@@ -113,7 +117,8 @@ public class PropertyRepairBo extends BaseEntity {
     /**
      * 维修结束时间，记录维修完成的时间
      */
-    private Date completionTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String completionTime;
 
     /**
      * 维修结束拍照，存储图片路径或URL

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/propertyRepair/vo/PropertyRepairVo.java

@@ -8,7 +8,6 @@ import org.dromara.domain.propertyRepair.PropertyRepair;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -41,7 +40,7 @@ public class PropertyRepairVo implements Serializable {
     /**
      * 指派时间
      */
-    private Date assignTime;
+    private String assignTime;
 
     /**
      * 详细门牌号
@@ -53,7 +52,7 @@ public class PropertyRepairVo implements Serializable {
      * 报修时间，记录报修提交的时间
      */
     @ExcelProperty(value = "报修时间，记录报修提交的时间")
-    private Date repairTime;
+    private String repairTime;
 
     /**
      * 报修用户id
@@ -109,6 +108,11 @@ public class PropertyRepairVo implements Serializable {
     @ExcelProperty(value = "维修人员ID")
     private Long staffId;
 
+    /**维修人员用户id
+     *
+     */
+    private Long staffUserId;
+
     /**
      * 维修人员手机号
      */
@@ -119,7 +123,7 @@ public class PropertyRepairVo implements Serializable {
      * 上门时间，记录维修人员上门的时间
      */
     @ExcelProperty(value = "上门时间，记录维修人员上门的时间")
-    private Date visitTime;
+    private String visitTime;
 
     /**
      * 上门拍照，存储图片路径或URL
@@ -131,7 +135,7 @@ public class PropertyRepairVo implements Serializable {
      * 维修结束时间，记录维修完成的时间
      */
     @ExcelProperty(value = "维修结束时间，记录维修完成的时间")
-    private Date completionTime;
+    private String completionTime;
 
     /**
      * 维修结束拍照，存储图片路径或URL

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/residentInfo/ResidentInfo.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.dromara.common.excel.annotation.Excel;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
@@ -50,61 +49,61 @@ public class ResidentInfo extends TenantEntity {
     /**
      * 居住人员的详细门牌号
      */
-    @Excel(name = "居住人员的详细门牌号")
+    //@Excel(name = "居住人员的详细门牌号")
     private String detailedAddress;
 
     /**
      * 居住人员姓名
      */
-    @Excel(name = "居住人员姓名")
+    //@Excel(name = "居住人员姓名")
     private String residentName;
 
     /**
      * 居住人员身份证号码，18位
      */
-    @Excel(name = "居住人员身份证号码，18位")
+    //@Excel(name = "居住人员身份证号码，18位")
     private String residentIdCard;
 
     /**
      * 居住人员出生日期
      */
-    @Excel(name = "居住人员出生日期")
+    //@Excel(name = "居住人员出生日期")
     private String residentBirthday;
 
     /**
      * 居住人员手机号
      */
-    @Excel(name = "居住人员手机号")
+    //@Excel(name = "居住人员手机号")
     private String residentPhone;
 
     /**
      * 居住人员性别：1-男，2-女
      */
-    @Excel(name = "居住人员性别：1-男，2-女")
+    //@Excel(name = "居住人员性别：1-男，2-女")
     private Long residentGender;
 
     /**
      * 居住人员与户主的关系，如父子、夫妻等
      */
-    @Excel(name = "居住人员与户主的关系，如父子、夫妻等")
+    //@Excel(name = "居住人员与户主的关系，如父子、夫妻等")
     private String residentRelationship;
 
     /**
      * 是否是户主：Y-是，N-否
      */
-    @Excel(name = "是否是户主：Y-是，N-否")
+    //@Excel(name = "是否是户主：Y-是，N-否")
     private String isHouseholder;
 
     /**
      * 是否是租户：Y-是，N-否
      */
-    @Excel(name = "是否是租户：Y-是，N-否")
+    //@Excel(name = "是否是租户：Y-是，N-否")
     private String isTenant;
 
     /**
      * 居住人员工作单位
      */
-    @Excel(name = "居住人员工作单位")
+    //@Excel(name = "居住人员工作单位")
     private String residentEmployer;
 
     /**
@@ -120,7 +119,7 @@ public class ResidentInfo extends TenantEntity {
     /**
      * 居住人员面貌，如党员、群众等
      */
-    @Excel(name = "居住人员面貌")
+    //@Excel(name = "居住人员面貌")
     private String residentAppearance;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/residentInfo/vo/ResidentInfoVo.java

@@ -3,7 +3,6 @@ package org.dromara.domain.residentInfo.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.common.excel.annotation.Excel;
 import org.dromara.domain.houseInfo.HouseInfoRedident;
 import org.dromara.domain.residentInfo.ResidentInfo;
 
@@ -29,7 +28,7 @@ public class ResidentInfoVo implements Serializable {
     /**
      * 居住人员主键，唯一标识每条居住人员信息
      */
-    @Excel(name = "居住人员主键，唯一标识每条居住人员信息")
+    //@Excel(name = "居住人员主键，唯一标识每条居住人员信息")
     private Long residentId;
 
     /**
@@ -45,121 +44,121 @@ public class ResidentInfoVo implements Serializable {
     /**
      * 关联房屋信息表的house_id，标识居住人员所属房屋
      */
-    @Excel(name = "关联房屋信息表的house_id，标识居住人员所属房屋")
+    //@Excel(name = "关联房屋信息表的house_id，标识居住人员所属房屋")
     private Long houseId;
 
     /**
      * 关联sys_user表中user_id
      */
-    @Excel(name = "关联sys_user表中user_id")
+    //@Excel(name = "关联sys_user表中user_id")
     private Long userId;
 
     /**
      * 居住人员的详细门牌号
      */
-    @Excel(name = "居住人员的详细门牌号")
+    //@Excel(name = "居住人员的详细门牌号")
     private String detailedAddress;
 
     /**
      * 居住人员姓名
      */
-    @Excel(name = "居住人员姓名")
+    //@Excel(name = "居住人员姓名")
     private String residentName;
 
     /**
      * 居住人员身份证号码，18位
      */
-    @Excel(name = "居住人员身份证号码，18位")
+    //@Excel(name = "居住人员身份证号码，18位")
     private String residentIdCard;
 
     /**
      * 居住人员出生日期
      */
-    @Excel(name = "居住人员出生日期")
+    //@Excel(name = "居住人员出生日期")
     private String residentBirthday;
 
     /**
      * 居住人员手机号
      */
-    @Excel(name = "居住人员手机号")
+    //@Excel(name = "居住人员手机号")
     private String residentPhone;
 
     /**
      * 居住人员性别：1-男，2-女
      */
-    @Excel(name = "居住人员性别：1-男，2-女")
+    //@Excel(name = "居住人员性别：1-男，2-女")
     private Long residentGender;
 
     /**
      * 居住人员与户主的关系，如父子、夫妻等
      */
-    @Excel(name = "居住人员与户主的关系，如父子、夫妻等")
+    //@Excel(name = "居住人员与户主的关系，如父子、夫妻等")
     private String residentRelationship;
 
     /**
      * 是否是户主：Y-是，N-否
      */
-    @Excel(name = "是否是户主：Y-是，N-否")
+    //@Excel(name = "是否是户主：Y-是，N-否")
     private String isHouseholder;
 
     /**
      * 是否是租户：Y-是，N-否
      */
-    @Excel(name = "是否是租户：Y-是，N-否")
+    //@Excel(name = "是否是租户：Y-是，N-否")
     private String isTenant;
 
     /**
      * 居住人员工作单位
      */
-    @Excel(name = "居住人员工作单位")
+    //@Excel(name = "居住人员工作单位")
     private String residentEmployer;
 
     /**
      * 特殊类型
      */
-    @Excel(name = "特殊类型")
+    //@Excel(name = "特殊类型")
     private String specialType;
 
     /**
      * 爱好字典值多选
      */
-    @Excel(name = "爱好字典值多选")
+    //@Excel(name = "爱好字典值多选")
     private String residentHobby;
 
     /**
      * 居住人员面貌，如党员、群众等
      */
-    @Excel(name = "居住人员面貌，如党员、群众等")
+    //@Excel(name = "居住人员面貌，如党员、群众等")
     private String residentAppearance;
 
     /**
      * 身份证正面
      */
-    @Excel(name = "身份证正面")
+    //@Excel(name = "身份证正面")
     private String idCardFront;
 
     /**
      * 身份证反面
      */
-    @Excel(name = "身份证反面")
+    //@Excel(name = "身份证反面")
     private String idCardBack;
 
     /**
      * 身份证住址
      */
-    @Excel(name = "身份证住址")
+    //@Excel(name = "身份证住址")
     private String idCardAddress;
 
     /**
      * 人脸地址
      */
-    @Excel(name = "人脸地址")
+    //@Excel(name = "人脸地址")
     private String facePhoto;
 
     /**
      * 备注
      */
-    @Excel(name = "备注")
+    //@Excel(name = "备注")
     private String remark;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/staffTrain/StaffTrainManual.java

@@ -2,6 +2,7 @@ package org.dromara.domain.staffTrain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
@@ -52,6 +53,7 @@ public class StaffTrainManual extends TenantEntity {
     /**
      * 发布时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date publishTime;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/staffTrain/vo/StaffTrainManualVo.java

@@ -2,6 +2,7 @@ package org.dromara.domain.staffTrain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -66,6 +67,7 @@ public class StaffTrainManualVo implements Serializable {
      * 发布时间
      */
     @ExcelProperty(value = "发布时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date publishTime;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/FrequentlyVisitorManage.java

@@ -82,5 +82,17 @@ public class FrequentlyVisitorManage extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
 
+    /**
+     * 经度
+     */
+    private String lgt;
+    /**
+     * 纬度
+     */
+    private String lat;
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/bo/FrequentlyVisitorManageBo.java

@@ -85,5 +85,18 @@ public class FrequentlyVisitorManageBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 经度
+     */
+    private String lgt;
+    /**
+     * 纬度
+     */
+    private String lat;
 
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/vo/FrequentlyVisitorManageVo.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.domain.visitor.FrequentlyVisitorManage;
+
 import java.io.Serial;
 import java.io.Serializable;
 
@@ -98,5 +99,18 @@ public class FrequentlyVisitorManageVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 经度
+     */
+    private String lgt;
+    /**
+     * 纬度
+     */
+    private String lat;
 
 }

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

@@ -73,7 +73,7 @@ public class BlackManageServiceImpl implements IBlackManageService {
         LambdaQueryWrapper<BlackManage> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(BlackManage::getBlackManageId);
         lqw.eq(StringUtils.isNotBlank(bo.getBlackType()), BlackManage::getBlackType, bo.getBlackType());
-        lqw.eq(StringUtils.isNotBlank(bo.getBlackTitle()), BlackManage::getBlackTitle, bo.getBlackTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getBlackTitle()), BlackManage::getBlackTitle, bo.getBlackTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getBlackNum()), BlackManage::getBlackNum, bo.getBlackNum());
         lqw.eq(StringUtils.isNotBlank(bo.getIsDel()), BlackManage::getIsDel, bo.getIsDel());
         return lqw;

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

@@ -72,7 +72,7 @@ public class ButlerSettingsServiceImpl implements IButlerSettingsService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ButlerSettings> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(ButlerSettings::getSettingsId);
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), ButlerSettings::getTitle, bo.getTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), ButlerSettings::getTitle, bo.getTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getContent()), ButlerSettings::getContent, bo.getContent());
         lqw.eq(StringUtils.isNotBlank(bo.getIsDel()), ButlerSettings::getIsDel, bo.getIsDel());
         return lqw;

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

@@ -56,18 +56,18 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
      * @return 投诉建议
      */
     @Override
-    public ComplaintSuggestionVo queryById(Long suggestionId){
+    public ComplaintSuggestionVo queryById(Long suggestionId) {
         ComplaintSuggestionVo vo = baseMapper.selectVoById(suggestionId);
         SuggestionFjBo fjBo = new SuggestionFjBo();
         fjBo.setSuggestionId(suggestionId);
         List<SuggestionFjVo> suggestionFjVos = suggestionFjService.queryList(fjBo);
-        if (suggestionFjVos != null && !suggestionFjVos.isEmpty()){
+        if (suggestionFjVos != null && !suggestionFjVos.isEmpty()) {
             vo.setSuggestionFjList(suggestionFjVos);
         }
         //判断是否已读如果是未读设置成已读
         String isRead = vo.getIsRead();
         Long userId = vo.getUserId();
-        if (N.equals(isRead) && userId.equals(LoginHelper.getUserId())){
+        if (N.equals(isRead) && userId.equals(LoginHelper.getUserId())) {
             vo.setIsRead(Y);
             ComplaintSuggestion update = MapstructUtils.convert(vo, ComplaintSuggestion.class);
             baseMapper.updateById(update);
@@ -77,8 +77,8 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
             Object userNum = RedisUtils.getCacheObject(userSuggestionKey);
             if (ObjectUtils.isNotEmpty(userNum)) {
                 RedisUtils.setCacheObject(userSuggestionKey, Math.max((int) userNum - 1, 0));
-            }else {
-                RedisUtils.setCacheObject(userSuggestionKey,0);
+            } else {
+                RedisUtils.setCacheObject(userSuggestionKey, 0);
             }
         }
         return vo;
@@ -93,8 +93,26 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
      */
     @Override
     public TableDataInfo<ComplaintSuggestionVo> queryPageList(ComplaintSuggestionBo bo, PageQuery pageQuery) {
+        Long userId = LoginHelper.getUserId();
         LambdaQueryWrapper<ComplaintSuggestion> lqw = buildQueryWrapper(bo);
         Page<ComplaintSuggestionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        if (result.getTotal() > 0) {
+            List<ComplaintSuggestionVo> records = result.getRecords();
+            for (ComplaintSuggestionVo record : records) {
+                //添加附件信息
+                Long suggestionId = record.getSuggestionId();
+                SuggestionFjBo fjBo = new SuggestionFjBo();
+                fjBo.setSuggestionId(suggestionId);
+                List<SuggestionFjVo> suggestionFjVos = suggestionFjService.queryList(fjBo);
+                if (suggestionFjVos != null && !suggestionFjVos.isEmpty()) {
+                    record.setSuggestionFjList(suggestionFjVos);
+                }
+                //app首页统计减少一个数
+                String userSuggestionKey = COMPLAINT_SUGGESTION_NO + userId;
+                // 回复了这个用户的投诉数量变成0
+                RedisUtils.setCacheObject(userSuggestionKey, 0);
+            }
+        }
         return TableDataInfo.build(result);
     }
 
@@ -117,7 +135,7 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), ComplaintSuggestion::getTitle, bo.getTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getContent()), ComplaintSuggestion::getContent, bo.getContent());
         lqw.eq(StringUtils.isNotBlank(bo.getImages()), ComplaintSuggestion::getImages, bo.getImages());
-        lqw.eq(bo.getCreatedTime() != null, ComplaintSuggestion::getCreatedTime, bo.getCreatedTime());
+        lqw.eq(bo.getPushTime() != null, ComplaintSuggestion::getPushTime, bo.getPushTime());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ComplaintSuggestion::getStatus, bo.getStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getReplyContent()), ComplaintSuggestion::getReplyContent, bo.getReplyContent());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), ComplaintSuggestion::getType, bo.getType());
@@ -137,9 +155,9 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
     @Override
     public Boolean insertByBo(ComplaintSuggestionBo bo) {
         Long userId = LoginHelper.getUserId();
-        bo.setCreateTime(DateUtils.getNowDate());
         bo.setUserId(userId);
         ComplaintSuggestion add = MapstructUtils.convert(bo, ComplaintSuggestion.class);
+        add.setPushTime(DateUtils.getNowDate());
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
@@ -148,8 +166,8 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
             Object allNum = RedisUtils.getCacheObject(COMPLAINT_SUGGESTION_NO_ALL);
             if (ObjectUtils.isNotEmpty(allNum)) {
                 RedisUtils.setCacheObject(COMPLAINT_SUGGESTION_NO_ALL, Math.max((int) allNum + 1, 0));
-            }else {
-                RedisUtils.setCacheObject(COMPLAINT_SUGGESTION_NO_ALL,1);
+            } else {
+                RedisUtils.setCacheObject(COMPLAINT_SUGGESTION_NO_ALL, 1);
             }
         }
         return flag;
@@ -165,11 +183,12 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
     public Boolean updateByBo(ComplaintSuggestionBo bo) {
         Long userId = bo.getUserId();
         String status = bo.getStatus();
-        if (TWO.equals(status)){
+        ComplaintSuggestionVo complaintSuggestionVo = baseMapper.selectVoById(bo.getSuggestionId());
+        if (!complaintSuggestionVo.getStatus().equals(TWO) && TWO.equals(status)) {
+            bo.setReplyTime(DateUtils.getNowDate());
             //判断是否有附件
             List<SuggestionFj> suggestionFjList = bo.getSuggestionFjList();
-            if (suggestionFjList != null && !suggestionFjList.isEmpty()){
-
+            if (suggestionFjList != null && !suggestionFjList.isEmpty()) {
                 suggestionFjMapper.insertBatch(suggestionFjList);
             }
             String userSuggestionKey = COMPLAINT_SUGGESTION_NO + userId;
@@ -177,15 +196,15 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
             Object userNum = RedisUtils.getCacheObject(userSuggestionKey);
             if (ObjectUtils.isNotEmpty(userNum)) {
                 RedisUtils.setCacheObject(userSuggestionKey, Math.max((int) userNum + 1, 0));
-            }else {
-                RedisUtils.setCacheObject(userSuggestionKey,1);
+            } else {
+                RedisUtils.setCacheObject(userSuggestionKey, 1);
             }
             //往redis中新增 总数 投诉建议未回复的数量 app统计使用
             Object allNum = RedisUtils.getCacheObject(COMPLAINT_SUGGESTION_NO_ALL);
             if (ObjectUtils.isNotEmpty(allNum)) {
                 RedisUtils.setCacheObject(COMPLAINT_SUGGESTION_NO_ALL, Math.max((int) allNum - 1, 0));
-            }else {
-                RedisUtils.setCacheObject(COMPLAINT_SUGGESTION_NO_ALL,0);
+            } else {
+                RedisUtils.setCacheObject(COMPLAINT_SUGGESTION_NO_ALL, 0);
             }
         }
         ComplaintSuggestion update = MapstructUtils.convert(bo, ComplaintSuggestion.class);
@@ -196,7 +215,7 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ComplaintSuggestion entity){
+    private void validEntityBeforeSave(ComplaintSuggestion entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -209,7 +228,7 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;

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

@@ -125,20 +125,28 @@ public class IllegalParkingServiceImpl implements IIllegalParkingService {
         //从redis中查询车牌黑名单次数
         String key = BLACK_PLATE_NUMBER + LoginHelper.getTenantId();
         long blackNum = 0;
+        boolean flagBlack = true;
         if (!RedisUtils.hasKey(key)) {
             //没有就从数据库查询
             BlackManageVo blackManageVo = blackManageMapper.selectVoOne(new LambdaQueryWrapper<BlackManage>().eq(BlackManage::getBlackType, ONE));
-            blackNum = blackManageVo.getBlackNum();
-            RedisUtils.setAtomicValue(key, blackNum);
+            if (blackManageVo != null) {
+                blackNum = blackManageVo.getBlackNum();
+                RedisUtils.setAtomicValue(key, blackNum);
+            }else {
+                //说明没设置违停黑名单管理
+                flagBlack = false;
+            }
         } else {
             blackNum = RedisUtils.getAtomicValue(key);
         }
-        //查询该车牌号的违停次数
-        List<IllegalParkingVo> illegalParkingVos = baseMapper.selectVoList(new LambdaQueryWrapper<IllegalParking>().eq(IllegalParking::getPlateNumber, add.getPlateNumber()));
-        long count = illegalParkingVos == null ? 0 : illegalParkingVos.size();
-        if (count + 1 > blackNum) {
-            add.setIsBlack(Y);
-            //todo 给道闸下发黑名单
+        if (flagBlack){
+            //查询该车牌号的违停次数
+            List<IllegalParkingVo> illegalParkingVos = baseMapper.selectVoList(new LambdaQueryWrapper<IllegalParking>().eq(IllegalParking::getPlateNumber, add.getPlateNumber()));
+            long count = illegalParkingVos == null ? 0 : illegalParkingVos.size();
+            if (count + 1 > blackNum) {
+                add.setIsBlack(Y);
+                //todo 给道闸下发黑名单
+            }
         }
         //判断该车牌号
         boolean flag = baseMapper.insert(add) > 0;
@@ -161,20 +169,28 @@ public class IllegalParkingServiceImpl implements IIllegalParkingService {
         //从redis中查询车牌黑名单次数
         String key = BLACK_PLATE_NUMBER + LoginHelper.getTenantId();
         long blackNum = 0;
+        boolean flagBlack = true;
         if (!RedisUtils.hasKey(key)) {
             //没有就从数据库查询
             BlackManageVo blackManageVo = blackManageMapper.selectVoOne(new LambdaQueryWrapper<BlackManage>().eq(BlackManage::getBlackType, ONE));
-            blackNum = blackManageVo.getBlackNum();
-            RedisUtils.setAtomicValue(key, blackNum);
+            if (blackManageVo != null) {
+                blackNum = blackManageVo.getBlackNum();
+                RedisUtils.setAtomicValue(key, blackNum);
+            }else {
+                //说明没设置违停黑名单管理
+                flagBlack = false;
+            }
         } else {
             blackNum = RedisUtils.getAtomicValue(key);
         }
-        //查询该车牌号的违停次数
-        List<IllegalParkingVo> illegalParkingVos = baseMapper.selectVoList(new LambdaQueryWrapper<IllegalParking>().eq(IllegalParking::getPlateNumber, update.getPlateNumber()));
-        long count = illegalParkingVos == null ? 0 : illegalParkingVos.size();
-        if (count + 1 > blackNum) {
-            update.setIsBlack(Y);
-            //todo 给道闸下发黑名单
+        if (flagBlack){
+            //查询该车牌号的违停次数
+            List<IllegalParkingVo> illegalParkingVos = baseMapper.selectVoList(new LambdaQueryWrapper<IllegalParking>().eq(IllegalParking::getPlateNumber, update.getPlateNumber()));
+            long count = illegalParkingVos == null ? 0 : illegalParkingVos.size();
+            if (count + 1 > blackNum) {
+                update.setIsBlack(Y);
+                //todo 给道闸下发黑名单
+            }
         }
         return baseMapper.updateById(update) > 0;
     }

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

@@ -95,10 +95,10 @@ public class PropertyFeeServiceImpl implements IPropertyFeeService {
         lqw.like(StringUtils.isNotBlank(bo.getCommunityName()), PropertyFee::getCommunityName, bo.getCommunityName());
         lqw.eq(StringUtils.isNotBlank(bo.getYear()), PropertyFee::getYear, bo.getYear());
         lqw.eq(StringUtils.isNotBlank(bo.getTime()), PropertyFee::getTime, bo.getTime());
-        lqw.eq(bo.getTenementExpense() != null, PropertyFee::getTenementExpense, bo.getTenementExpense());
-        lqw.eq(bo.getParkingExpense() != null, PropertyFee::getParkingExpense, bo.getParkingExpense());
-        lqw.eq(bo.getEnergyExpense() != null, PropertyFee::getEnergyExpense, bo.getEnergyExpense());
-        lqw.eq(bo.getTotalExpense() != null, PropertyFee::getTotalExpense, bo.getTotalExpense());
+        lqw.like(bo.getTenementExpense() != null, PropertyFee::getTenementExpense, bo.getTenementExpense());
+        lqw.like(bo.getParkingExpense() != null, PropertyFee::getParkingExpense, bo.getParkingExpense());
+        lqw.like(bo.getEnergyExpense() != null, PropertyFee::getEnergyExpense, bo.getEnergyExpense());
+        lqw.like(bo.getTotalExpense() != null, PropertyFee::getTotalExpense, bo.getTotalExpense());
         lqw.eq(StringUtils.isNotBlank(bo.getIsExpense()), PropertyFee::getIsExpense, bo.getIsExpense());
         return lqw;
     }

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

@@ -85,7 +85,7 @@ public class PropertyRepairServiceImpl implements IPropertyRepairService {
         lqw.eq(StringUtils.isNotBlank(bo.getHouseAddress()), PropertyRepair::getHouseAddress, bo.getHouseAddress());
         lqw.eq(bo.getRepairTime() != null, PropertyRepair::getRepairTime, bo.getRepairTime());
         lqw.eq(bo.getUserId() != null, PropertyRepair::getUserId, bo.getUserId());
-        lqw.eq(StringUtils.isNotBlank(bo.getPhoneNumber()), PropertyRepair::getPhoneNumber, bo.getPhoneNumber());
+        lqw.like(StringUtils.isNotBlank(bo.getPhoneNumber()), PropertyRepair::getPhoneNumber, bo.getPhoneNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getRepairTitle()), PropertyRepair::getRepairTitle, bo.getRepairTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceCategory()), PropertyRepair::getMaintenanceCategory, bo.getMaintenanceCategory());
         lqw.eq(StringUtils.isNotBlank(bo.getRepairDetails()), PropertyRepair::getRepairDetails, bo.getRepairDetails());
@@ -93,6 +93,7 @@ public class PropertyRepairServiceImpl implements IPropertyRepairService {
         lqw.eq(StringUtils.isNotBlank(bo.getRepairStatus()), PropertyRepair::getRepairStatus, bo.getRepairStatus());
         lqw.like(StringUtils.isNotBlank(bo.getStaffName()), PropertyRepair::getStaffName, bo.getStaffName());
         lqw.eq(bo.getStaffId() != null, PropertyRepair::getStaffId, bo.getStaffId());
+        lqw.eq(bo.getStaffUserId() != null, PropertyRepair::getStaffUserId, bo.getStaffUserId());
         lqw.eq(StringUtils.isNotBlank(bo.getStaffPhone()), PropertyRepair::getStaffPhone, bo.getStaffPhone());
         lqw.eq(bo.getVisitTime() != null, PropertyRepair::getVisitTime, bo.getVisitTime());
         lqw.eq(StringUtils.isNotBlank(bo.getVisitPhoto()), PropertyRepair::getVisitPhoto, bo.getVisitPhoto());
@@ -191,7 +192,28 @@ public class PropertyRepairServiceImpl implements IPropertyRepairService {
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
-            //TODO 做一些业务上的校验,判断是否需要校验
+            if (ids.size() > 0) {
+                for (Long id : ids) {
+                    PropertyRepair propertyRepair = baseMapper.selectById(id);
+                    Long userId = propertyRepair.getUserId();
+                    //删除redis中的数据
+                    String userRepairKey = PROPERTY_REPAIR_NO + userId;
+                    //往redis中新增 个人 物业未完成的报修数量 app统计使用
+                    Object userNum = RedisUtils.getCacheObject(userRepairKey);
+                    if (ObjectUtils.isNotEmpty(userNum)) {
+                        RedisUtils.setCacheObject(userRepairKey, Math.max((int) userNum - 1, 0));
+                    } else {
+                        RedisUtils.setCacheObject(userRepairKey, 0);
+                    }
+                }
+            }
+            //往redis中新增 总数 物业未完成的报修数量 app统计使用
+            Object allNum = RedisUtils.getCacheObject(PROPERTY_REPAIR_NO_ALL);
+            if (ObjectUtils.isNotEmpty(allNum)) {
+                RedisUtils.setCacheObject(PROPERTY_REPAIR_NO_ALL, Math.max((int) allNum - ids.size(), 0));
+            } else {
+                RedisUtils.setCacheObject(PROPERTY_REPAIR_NO_ALL, 0);
+            }
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
@@ -238,7 +260,8 @@ public class PropertyRepairServiceImpl implements IPropertyRepairService {
         for (int i = 0; i < weekDays.size(); i++) {
             int num = 0;
             for (PropertyRepair propertyRepair : propertyRepairs) {
-                String day = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, propertyRepair.getRepairTime());
+                String repairTime = propertyRepair.getRepairTime();
+                String day = repairTime.substring(0, 10);
                 if (day.equals(weekDays.get(i))) {
                     num++;
                 }

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

@@ -81,7 +81,7 @@ public class ProprietorCarServiceImpl implements IProprietorCarService {
         lqw.eq(bo.getUserId() != null, ProprietorCar::getUserId, bo.getUserId());
         lqw.like(StringUtils.isNotBlank(bo.getUserName()), ProprietorCar::getUserName, bo.getUserName());
         lqw.eq(StringUtils.isNotBlank(bo.getResidentPhone()), ProprietorCar::getResidentPhone, bo.getResidentPhone());
-        lqw.eq(StringUtils.isNotBlank(bo.getPlateNumber()), ProprietorCar::getPlateNumber, bo.getPlateNumber());
+        lqw.like(StringUtils.isNotBlank(bo.getPlateNumber()), ProprietorCar::getPlateNumber, bo.getPlateNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getVehicleBrand()), ProprietorCar::getVehicleBrand, bo.getVehicleBrand());
         lqw.eq(StringUtils.isNotBlank(bo.getVehicleType()), ProprietorCar::getVehicleType, bo.getVehicleType());
         lqw.eq(StringUtils.isNotBlank(bo.getVehicleEnergy()), ProprietorCar::getVehicleEnergy, bo.getVehicleEnergy());

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

@@ -146,7 +146,7 @@ public class StaffManageServiceImpl implements IStaffManageService {
         lqw.eq(StringUtils.isNotBlank(bo.getGender()), StaffManage::getGender, bo.getGender());
         lqw.eq(StringUtils.isNotBlank(bo.getStaffCategory()), StaffManage::getStaffCategory, bo.getStaffCategory());
         lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceCategory()), StaffManage::getMaintenanceCategory, bo.getMaintenanceCategory());
-        lqw.eq(StringUtils.isNotBlank(bo.getPhoneNumber()), StaffManage::getPhoneNumber, bo.getPhoneNumber());
+        lqw.like(StringUtils.isNotBlank(bo.getPhoneNumber()), StaffManage::getPhoneNumber, bo.getPhoneNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getAvatarPhoto()), StaffManage::getAvatarPhoto, bo.getAvatarPhoto());
         lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), StaffManage::getIdCard, bo.getIdCard());
         lqw.eq(StringUtils.isNotBlank(bo.getIdCardFront()), StaffManage::getIdCardFront, bo.getIdCardFront());

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

@@ -121,7 +121,7 @@ public class StaffTrainManualServiceImpl implements IStaffTrainManualService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<StaffTrainManual> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(StaffTrainManual::getManualId);
-        lqw.eq(StringUtils.isNotBlank(bo.getManualTitle()), StaffTrainManual::getManualTitle, bo.getManualTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getManualTitle()), StaffTrainManual::getManualTitle, bo.getManualTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getManualType()), StaffTrainManual::getManualType, bo.getManualType());
         lqw.eq(StringUtils.isNotBlank(bo.getManualContent()), StaffTrainManual::getManualContent, bo.getManualContent());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), StaffTrainManual::getStatus, bo.getStatus());

ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/HouseInfoMapper.xml

@@ -109,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left JOIN
         resident_info r on h.house_id = r.house_id
         <where>
+                   r.examine = '2'
             <if test="residentName != null  and residentName != ''"> and r.resident_name like concat('%', #{residentName}, '%')</if>
             <if test="residentAppearance != null  and residentAppearance != ''"> and r.resident_appearance = #{residentAppearance}</if>
             <if test="userId != null  and userId != ''"> and r.user_id = #{userId}</if>