Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/communityNews/CommunityNewsController.java

@@ -81,7 +81,7 @@ public class CommunityNewsController extends BaseController {
     }
 
     /**
-     * 删除社区资讯
+     * 删除社区资讯 等于把资讯关闭status = 2
      */
     @PreAuthorize("@ss.hasPermi('wuYe:news:remove')")
     @Log(title = "社区资讯", businessType = BusinessType.DELETE)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/partyNews/PartyNewsController.java

@@ -80,7 +80,9 @@ public class PartyNewsController extends BaseController {
     }
 
     /**
-     * 删除党建资讯
+     * 批量关闭党建资讯
+     * @param partyIds
+     * @return
      */
     @PreAuthorize("@ss.hasPermi('wuYe:partyNews:remove')")
     @Log(title = "党建资讯", businessType = BusinessType.DELETE)

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ResidentInfo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.common.core.domain.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -21,6 +19,10 @@ public class ResidentInfo extends BaseEntity
     /** 关联房屋信息表的house_id，标识居住人员所属房屋 */
     @Excel(name = "关联房屋信息表的house_id，标识居住人员所属房屋")
     private Long houseId;
+    /**
+     * 房屋状态：1-自住，2-空闲，3-待售空闲，4-出租
+     */
+    private Long houseStatus;
 
     /** 关联sys_user表中user_id */
     @Excel(name = "关联sys_user表中user_id")
@@ -94,7 +96,15 @@ public class ResidentInfo extends BaseEntity
     @Excel(name = "人脸地址")
     private String facePhoto;
 
-    public void setResidentId(Long residentId) 
+    public Long getHouseStatus() {
+        return houseStatus;
+    }
+
+    public void setHouseStatus(Long houseStatus) {
+        this.houseStatus = houseStatus;
+    }
+
+    public void setResidentId(Long residentId)
     {
         this.residentId = residentId;
     }
@@ -277,32 +287,28 @@ public class ResidentInfo extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("residentId", getResidentId())
-            .append("houseId", getHouseId())
-            .append("userId", getUserId())
-            .append("detailedAddress", getDetailedAddress())
-            .append("residentName", getResidentName())
-            .append("residentIdCard", getResidentIdCard())
-            .append("residentBirthday", getResidentBirthday())
-            .append("residentPhone", getResidentPhone())
-            .append("residentGender", getResidentGender())
-            .append("residentRelationship", getResidentRelationship())
-            .append("isHouseholder", getIsHouseholder())
-            .append("isTenant", getIsTenant())
-            .append("residentEmployer", getResidentEmployer())
-            .append("specialType", getSpecialType())
-            .append("residentHobby", getResidentHobby())
-            .append("residentAppearance", getResidentAppearance())
-            .append("idCardFront", getIdCardFront())
-            .append("idCardBack", getIdCardBack())
-            .append("idCardAddress", getIdCardAddress())
-            .append("facePhoto", getFacePhoto())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "ResidentInfo{" +
+                "residentId=" + residentId +
+                ", houseId=" + houseId +
+                ", houseStatus=" + houseStatus +
+                ", userId=" + userId +
+                ", detailedAddress='" + detailedAddress + '\'' +
+                ", residentName='" + residentName + '\'' +
+                ", residentIdCard='" + residentIdCard + '\'' +
+                ", residentBirthday='" + residentBirthday + '\'' +
+                ", residentPhone='" + residentPhone + '\'' +
+                ", residentGender=" + residentGender +
+                ", residentRelationship='" + residentRelationship + '\'' +
+                ", isHouseholder='" + isHouseholder + '\'' +
+                ", isTenant='" + isTenant + '\'' +
+                ", residentEmployer='" + residentEmployer + '\'' +
+                ", specialType='" + specialType + '\'' +
+                ", residentHobby='" + residentHobby + '\'' +
+                ", residentAppearance='" + residentAppearance + '\'' +
+                ", idCardFront='" + idCardFront + '\'' +
+                ", idCardBack='" + idCardBack + '\'' +
+                ", idCardAddress='" + idCardAddress + '\'' +
+                ", facePhoto='" + facePhoto + '\'' +
+                '}';
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/CommentStarsMapper.java

@@ -66,4 +66,5 @@ public interface CommentStarsMapper
      * @return 结果
      */
     public int deleteCommentStarsByStarsIds(Long[] starsIds);
+    public int deleteCommentStarsByCommunityIds(Long[] communityIds);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/CommunityNewsMapper.java

@@ -61,6 +61,13 @@ public interface CommunityNewsMapper
      * @return 结果
      */
     public int deleteCommunityNewsByCommunityIds(Long[] communityIds);
+    /**
+     * 批量删除社区资讯 等于把资讯关闭status = 2
+     *
+     * @param communityIds 需要删除的社区资讯主键
+     * @return 结果
+     */
+    public int updateCommunityNewsStarsByCommunityId(Long[] communityIds);
 
     /**
      * 更新收藏数量

ruoyi-system/src/main/java/com/ruoyi/system/mapper/PartyNewsMapper.java

@@ -45,6 +45,13 @@ public interface PartyNewsMapper
      */
     public int updatePartyNews(PartyNews partyNews);
 
+    /**
+     * 批量关闭党建资讯
+     * @param partyIds
+     * @return
+     */
+    public int updatePartyNewsByPartyIds(Long[] partyIds);
+
     /**
      * 删除党建资讯
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/ICommunityNewsService.java

@@ -48,7 +48,7 @@ public interface ICommunityNewsService
     public int updateCommunityNews(CommunityNews communityNews);
 
     /**
-     * 批量删除社区资讯
+     * 批量删除社区资讯 等于把资讯关闭status = 2
      * 
      * @param communityIds 需要删除的社区资讯主键集合
      * @return 结果

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommentIndexServiceImpl.java

@@ -34,7 +34,7 @@ import static com.ruoyi.common.constant.Constants.*;
 public class CommentIndexServiceImpl implements ICommentIndexService {
     @Autowired
     private CommentIndexMapper commentIndexMapper;
-    @Autowired
+    @Resource
     private CommentContentMapper commentContentMapper;
     @Resource
     private CommunityNewsMapper communityNewsMapper;
@@ -221,7 +221,7 @@ public class CommentIndexServiceImpl implements ICommentIndexService {
             if (1 == isRoot) {
                 //如果是根评论先查询是否有子集评论
                 List<CommentIndex> commentIndexList = commentIndexMapper.selectCommentIdListByCommentId(commentId);
-                if (commentIndexList !=null && commentIndexList.size() > 0){
+                if (commentIndexList != null && commentIndexList.size() > 0) {
                     for (CommentIndex index : commentIndexList) {
                         //删除未读互动中的子评论相关信息
                         deleteCommentChildren(index);
@@ -245,8 +245,8 @@ public class CommentIndexServiceImpl implements ICommentIndexService {
                     }
                     //对应资讯下的未读数量-1
                     Object communityUserCount = redisCache.getCacheMapValue(COMMENT_INTERACTION_COMMUNITY_USER_COUNT + toUserId, communityId.toString());
-                    if (ObjectUtils.isNotEmpty(communityUserCount)){
-                        redisCache.setCacheMapValue(COMMENT_INTERACTION_COMMUNITY_USER_COUNT + toUserId, communityId.toString(),Math.max(Integer.parseInt(communityUserCount.toString())-1,0));
+                    if (ObjectUtils.isNotEmpty(communityUserCount)) {
+                        redisCache.setCacheMapValue(COMMENT_INTERACTION_COMMUNITY_USER_COUNT + toUserId, communityId.toString(), Math.max(Integer.parseInt(communityUserCount.toString()) - 1, 0));
                     }
                 }
             } else {
@@ -259,9 +259,10 @@ public class CommentIndexServiceImpl implements ICommentIndexService {
 
     /**
      * 删除未读互动中的子评论相关信息
+     *
      * @param commentIndex
      */
-    public void deleteCommentChildren(CommentIndex commentIndex){
+    public void deleteCommentChildren(CommentIndex commentIndex) {
         Long commentId = commentIndex.getCommentId();
         Long communityId = commentIndex.getCommunityId();
         //子评论
@@ -282,8 +283,8 @@ public class CommentIndexServiceImpl implements ICommentIndexService {
             }
             //对应资讯下的未读数量-1
             Object communityUserCount = redisCache.getCacheMapValue(COMMENT_INTERACTION_COMMUNITY_USER_COUNT + toUserId, communityId.toString());
-            if (ObjectUtils.isNotEmpty(communityUserCount)){
-                redisCache.setCacheMapValue(COMMENT_INTERACTION_COMMUNITY_USER_COUNT + toUserId, communityId.toString(),Math.max(Integer.parseInt(communityUserCount.toString())-1,0));
+            if (ObjectUtils.isNotEmpty(communityUserCount)) {
+                redisCache.setCacheMapValue(COMMENT_INTERACTION_COMMUNITY_USER_COUNT + toUserId, communityId.toString(), Math.max(Integer.parseInt(communityUserCount.toString()) - 1, 0));
             }
         }
     }
@@ -341,10 +342,12 @@ public class CommentIndexServiceImpl implements ICommentIndexService {
                     if (communityIdList.contains(commentIndexVo.getId())) {
                         commentIndexVo.setIsLike("Y");
                     }
-                    //是否是自己的评论
-                    if (commentIndexVo.getCommentUser().getId().equals(userId)) {
-                        commentIndexVo.setIsMyself("Y");
-                    }
+                }
+            }
+            for (CommentIndexVo commentIndexVo : rootComment) {
+                //是否是自己的评论
+                if (commentIndexVo.getCommentUser().getId().equals(userId)) {
+                    commentIndexVo.setIsMyself("Y");
                 }
             }
         }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommunityNewsServiceImpl.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.communityNews.CommunityNews;
 import com.ruoyi.system.domain.communityNews.vo.CommentInteractionVo;
+import com.ruoyi.system.mapper.CommentStarsMapper;
 import com.ruoyi.system.mapper.CommunityNewsMapper;
 import com.ruoyi.system.service.ICommunityNewsService;
 import org.apache.commons.lang3.ObjectUtils;
@@ -31,6 +32,8 @@ public class CommunityNewsServiceImpl implements ICommunityNewsService {
     @Autowired
     private CommunityNewsMapper communityNewsMapper;
     @Autowired
+    private CommentStarsMapper commentStarsMapper;
+    @Autowired
     private RedisCache redisCache;
 
     /**
@@ -128,14 +131,14 @@ public class CommunityNewsServiceImpl implements ICommunityNewsService {
     }
 
     /**
-     * 批量删除社区资讯
+     * 批量删除社区资讯 等于把资讯关闭status = 2
      *
      * @param communityIds 需要删除的社区资讯主键
      * @return 结果
      */
     @Override
     public int deleteCommunityNewsByCommunityIds(Long[] communityIds) {
-        return communityNewsMapper.deleteCommunityNewsByCommunityIds(communityIds);
+        return communityNewsMapper.updateCommunityNewsStarsByCommunityId(communityIds);
     }
 
     /**
@@ -176,7 +179,7 @@ public class CommunityNewsServiceImpl implements ICommunityNewsService {
             if (ONE.equals(type)) {
                 redisCache.setCacheObject(commentInteractionUserCountKey, Integer.parseInt(commentInteractionUserCount.toString()) + 1);
             } else {
-                redisCache.setCacheObject(commentInteractionUserCountKey, Math.max(Integer.parseInt(commentInteractionUserCount.toString()) - 1,0));
+                redisCache.setCacheObject(commentInteractionUserCountKey, Math.max(Integer.parseInt(commentInteractionUserCount.toString()) - 1, 0));
             }
         } else {
             if (ONE.equals(type)) {
@@ -250,7 +253,7 @@ public class CommunityNewsServiceImpl implements ICommunityNewsService {
         //清空未读key
         redisCache.deleteObject(commentInteractionUserCountKey);
         redisCache.deleteObject(commentInteractionUserKey);
-        redisCache.deleteObject(COMMENT_INTERACTION_COMMUNITY_USER_COUNT+userId);
+        redisCache.deleteObject(COMMENT_INTERACTION_COMMUNITY_USER_COUNT + userId);
         return AjaxResult.success(resultMap);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PartyNewsServiceImpl.java

@@ -114,14 +114,13 @@ public class PartyNewsServiceImpl implements IPartyNewsService {
     }
 
     /**
-     * 批量删除党建资讯
-     *
-     * @param partyIds 需要删除的党建资讯主键
-     * @return 结果
+     * 批量关闭党建资讯
+     * @param partyIds
+     * @return
      */
     @Override
     public int deletePartyNewsByPartyIds(Long[] partyIds) {
-        return partyNewsMapper.deletePartyNewsByPartyIds(partyIds);
+        return partyNewsMapper.updatePartyNewsByPartyIds(partyIds);
     }
 
     /**

ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAssetTypeList" parameterType="AssetType" resultMap="AssetTypeResult">
         <include refid="selectAssetTypeVo"/>
         <where>
+            and del_flag = 'N'
             <if test="parentId != null "> and parent_id = #{parentId}</if>
             <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
             <if test="assetName != null  and assetName != ''"> and asset_name like concat('%', #{assetName}, '%')</if>
@@ -40,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAssetTypeListTree" parameterType="AssetType" resultMap="AssetTypeResult">
         <include refid="selectAssetTypeVo"/>
         <where>
-            del_flag = '0'
+            del_flag = 'N'
             <if test="parentId != null "> and parent_id = #{parentId}</if>
             <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
             <if test="assetName != null  and assetName != ''"> and asset_name like concat('%', #{assetName}, '%')</if>

ruoyi-system/src/main/resources/mapper/system/CheckPointManageMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="useId != null "> and use_id = #{useId}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectCheckPointManageByCheckPointManageId" parameterType="Long" resultMap="CheckPointManageResult">

ruoyi-system/src/main/resources/mapper/system/CheckPointRecordMapper.xml

@@ -49,7 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkResult != null  and checkResult != ''"> and check_result = #{checkResult}</if>
             <if test="checkResultDetails != null  and checkResultDetails != ''"> and check_result_details = #{checkResultDetails}</if>
             <if test="checkResultPhoto != null  and checkResultPhoto != ''"> and check_result_photo = #{checkResultPhoto}</if>
-            <if test="checkResultTime != null "> and check_result_time = #{checkResultTime}</if>
+            <if test="checkResultTime != null ">and  date_format(check_result_time,'%Y%m%d') = date_format(#{checkResultTime},'%Y%m%d')</if>
+            <if test="createTime != null ">and  date_format(create_time,'%Y%m%d') = date_format(#{createTime},'%Y%m%d')</if>
             <if test="checkStatus != null  and checkStatus != ''"> and check_status = #{checkStatus}</if>
         </where>
     </select>

ruoyi-system/src/main/resources/mapper/system/CommentIndexMapper.xml

@@ -134,6 +134,7 @@
             <if test="contentId != null ">and content_id = #{contentId}</if>
             <if test="commentContent != null  and commentContent != ''">and comment_content = #{commentContent}</if>
         </where>
+        order by create_time DESC
     </select>
 
     <select id="selectCommentIndexByCommentId" parameterType="Long" resultMap="CommentIndexResult">
@@ -262,7 +263,7 @@
             i.to_nick_name,
             i.to_avatar,
             i.content_id,
-            i.comment_content,
+            i.comment_content
         FROM
             comment_index i
                 LEFT JOIN comment_content c ON i.comment_id = c.comment_id

ruoyi-system/src/main/resources/mapper/system/CommentLikesMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
             <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectCommentLikesByLikesId" parameterType="Long" resultMap="CommentLikesResult">

ruoyi-system/src/main/resources/mapper/system/CommentStarsMapper.xml

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
             <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectCommentStarsByStarsId" parameterType="Long" resultMap="CommentStarsResult">
@@ -107,4 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{starsId}
         </foreach>
     </delete>
+    <delete id="deleteCommentStarsByCommunityIds" parameterType="String">
+        delete from comment_stars where target_type='1' and   target_id in
+        <foreach item="communityIds" collection="array" open="(" separator="," close=")">
+            #{targetId}
+        </foreach>
+    </delete>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/CommunityNewsMapper.xml

@@ -35,8 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCommunityNewsList" parameterType="CommunityNews" resultMap="CommunityNewsResult">
         <include refid="selectCommunityNewsVo"/>
-        <where>  
-            <if test="communityTitle != null  and communityTitle != ''"> and community_title = #{communityTitle}</if>
+        <where>
+            <if test="communityTitle != null  and communityTitle != ''"> and community_title like concat('%', #{communityTitle}, '%')</if>
             <if test="communityType != null  and communityType != ''"> and community_type = #{communityType}</if>
             <if test="communityContent != null  and communityContent != ''"> and community_content = #{communityContent}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userLikes != null  and userLikes != ''"> and user_likes = #{userLikes}</if>
             <if test="userStars != null  and userStars != ''"> and user_stars = #{userStars}</if>
         </where>
-        order by publish_time DESC
+        order by is_top DESC, publish_time DESC,create_time DESC
     </select>
     
     <select id="selectCommunityNewsByCommunityId" parameterType="Long" resultMap="CommunityNewsResult">
@@ -141,6 +141,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateCommunityNewsStars" parameterType="CommunityNews">
         update community_news set user_stars = #{userStars} where community_id = #{communityId}
     </update>
+    <update id="updateCommunityNewsStarsByCommunityId" parameterType="String">
+        update community_news set status = '2'  where community_id in
+        <foreach item="communityId" collection="array" open="(" separator="," close=")">
+            #{communityId}
+        </foreach>
+    </update>
 
     <delete id="deleteCommunityNewsByCommunityId" parameterType="Long">
         delete from community_news where community_id = #{communityId}

ruoyi-system/src/main/resources/mapper/system/ComplaintSuggestionMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectComplaintSuggestionBySuggestionId" parameterType="Long" resultMap="ComplaintSuggestionResult">

ruoyi-system/src/main/resources/mapper/system/HouseInfoMapper.xml

@@ -141,6 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null  and userId != ''"> and r.user_id = #{userId}</if>
             <if test="houseId != null"> and h.house_id = #{houseId}</if>
             <if test="residentPhone != null"> and r.resident_phone = #{residentPhone}</if>
+            <if test="houseStatus != null"> and h.house_status = #{houseStatus}</if>
+            <if test="detailedAddress != null"> and h.detailed_address = #{detailedAddress}</if>
         </where>
         order by h.create_time DESC
     </select>

ruoyi-system/src/main/resources/mapper/system/IllegalParkingMapper.xml

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="plateNumber != null  and plateNumber != ''"> and plate_number like concat('%', #{plateNumber}, '%')</if>
             <if test="portalId != null "> and portal_id = #{portalId}</if>
             <if test="visitPortal != null  and visitPortal != ''"> and visit_portal = #{visitPortal}</if>
-            <if test="mobileNumber != null  and mobileNumber != ''"> and mobile_number = #{mobileNumber}</if>
+            <if test="mobileNumber != null  and mobileNumber != ''"> and mobile_number like concat('%', #{mobileNumber}, '%')</if>
             <if test="visitName != null  and visitName != ''"> and visit_name like concat('%', #{visitName}, '%')</if>
             <if test="illegalPhoto != null  and illegalPhoto != ''"> and illegal_photo = #{illegalPhoto}</if>
             <if test="isBlack != null  and isBlack != ''"> and is_black = #{isBlack}</if>

ruoyi-system/src/main/resources/mapper/system/PartyNewsMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPartyNewsList" parameterType="PartyNews" resultMap="PartyNewsResult">
         <include refid="selectPartyNewsVo"/>
         <where>  
-            <if test="partyTitle != null  and partyTitle != ''"> and party_title = #{partyTitle}</if>
+            <if test="partyTitle != null  and partyTitle != ''"> and party_title like concat('%', #{partyTitle}, '%')</if>
             <if test="partyType != null  and partyType != ''"> and party_type = #{partyType}</if>
             <if test="partyContent != null  and partyContent != ''"> and party_content = #{partyContent}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updatePartyNews" parameterType="PartyNews">
         update party_news
         <trim prefix="SET" suffixOverrides=",">
-            <if test="partyTitle != null and partyTitle != ''">party_title = #{partyTitle},</if>
+            <if test="partyTitle != null and partyTitle != ''">party_title  = #{partyTitle},</if>
             <if test="partyType != null and partyType != ''">party_type = #{partyType},</if>
             <if test="partyContent != null">party_content = #{partyContent},</if>
             <if test="status != null">status = #{status},</if>
@@ -107,6 +107,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where party_id = #{partyId}
     </update>
+    <update id="updatePartyNewsByPartyIds" parameterType="String">
+        update party_news set status = '2' where party_id in
+        <foreach item="partyId" collection="array" open="(" separator="," close=")">
+            #{partyId}
+        </foreach>
+    </update>
 
     <delete id="deletePartyNewsByPartyId" parameterType="Long">
         delete from party_news where party_id = #{partyId}

ruoyi-system/src/main/resources/mapper/system/PropertyFeeMapper.xml

@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalExpense != null "> and total_expense = #{totalExpense}</if>
             <if test="isExpense != null  and isExpense != ''"> and is_expense = #{isExpense}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectPropertyFeeByPropertyId" parameterType="Long" resultMap="PropertyFeeResult">

ruoyi-system/src/main/resources/mapper/system/PropertyRepairMapper.xml

@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="completionPhoto != null  and completionPhoto != ''"> and completion_photo = #{completionPhoto}</if>
             <if test="repairCompletionDetails != null  and repairCompletionDetails != ''"> and repair_completion_details = #{repairCompletionDetails}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectPropertyRepairByRepairId" parameterType="Long" resultMap="PropertyRepairResult">

ruoyi-system/src/main/resources/mapper/system/ProprietorCarMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="residentPhone != null  and residentPhone != ''"> and resident_phone = #{residentPhone}</if>
-            <if test="plateNumber != null  and plateNumber != ''"> and plate_number = #{plateNumber}</if>
+            <if test="plateNumber != null  and plateNumber != ''"> and plate_number like concat('%', #{plateNumber}, '%')</if>
             <if test="vehicleBrand != null  and vehicleBrand != ''"> and vehicle_brand = #{vehicleBrand}</if>
             <if test="vehicleType != null  and vehicleType != ''"> and vehicle_type = #{vehicleType}</if>
             <if test="vehicleEnergy != null  and vehicleEnergy != ''"> and vehicle_energy = #{vehicleEnergy}</if>

ruoyi-system/src/main/resources/mapper/system/ReservRecordMapper.xml

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="num != null  and num != ''"> and num = #{num}</if>
             <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
-            <if test="mobileNumber != null  and mobileNumber != ''"> and mobile_number = #{mobileNumber}</if>
+            <if test="mobileNumber != null  and mobileNumber != ''"> and mobile_number like concat('%', #{mobileNumber}, '%')</if>
             <if test="isCar != null  and isCar != ''"> and is_car = #{isCar}</if>
             <if test="plateNumber != null  and plateNumber != ''"> and plate_number = #{plateNumber}</if>
             <if test="reserveTime != null "> and reserve_time = #{reserveTime}</if>
@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectReservRecordByReservRecordId" parameterType="Long" resultMap="ReservRecordResult">

ruoyi-system/src/main/resources/mapper/system/ResidentInfoMapper.xml

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idCardAddress != null  and idCardAddress != ''"> and id_card_address = #{idCardAddress}</if>
             <if test="facePhoto != null  and facePhoto != ''"> and face_photo = #{facePhoto}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectResidentInfoByResidentId" parameterType="Long" resultMap="ResidentInfoResult">

ruoyi-system/src/main/resources/mapper/system/StaffManageMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
             <if test="staffCategory != null  and staffCategory != ''"> and staff_category = #{staffCategory}</if>
             <if test="maintenanceCategory != null  and maintenanceCategory != ''"> and maintenance_category = #{maintenanceCategory}</if>
-            <if test="phoneNumber != null  and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
+            <if test="phoneNumber != null  and phoneNumber != ''"> and phone_number like concat('%', #{phoneNumber}, '%')</if>
             <if test="avatarPhoto != null  and avatarPhoto != ''"> and avatar_photo = #{avatarPhoto}</if>
             <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
             <if test="idCardFront != null  and idCardFront != ''"> and id_card_front = #{idCardFront}</if>

ruoyi-system/src/main/resources/mapper/system/VisitorManageMapper.xml

@@ -37,14 +37,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="num != null  and num != ''"> and num = #{num}</if>
             <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
-            <if test="mobileNumber != null  and mobileNumber != ''"> and mobile_number = #{mobileNumber}</if>
+            <if test="mobileNumber != null  and mobileNumber != ''"> and mobile_number like concat('%', #{mobileNumber}, '%') </if>
             <if test="isCar != null  and isCar != ''"> and is_car = #{isCar}</if>
-            <if test="plateNumber != null  and plateNumber != ''"> and plate_number = #{plateNumber}</if>
+            <if test="plateNumber != null  and plateNumber != ''"> and plate_number like concat('%', #{plateNumber}, '%')</if>
             <if test="reserveTime != null "> and reserve_time = #{reserveTime}</if>
             <if test="visitorTime != null "> and visitor_time = #{visitorTime}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectVisitorManageByVisitorManageId" parameterType="Long" resultMap="VisitorManageResult">