物业管理端评论

ruoyi-admin/src/main/java/com/ruoyi/web/controller/asset/AssetTypeController.java

@@ -129,7 +129,7 @@ public class AssetTypeController extends BaseController {
     /**
      * 获取资产分类树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @PreAuthorize("@ss.hasPermi('wuYe:assetType:deptTree')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(AssetType assetType)
     {

ruoyi-system/src/main/java/com/ruoyi/system/domain/propertyRepair/PropertyRepair.java

@@ -3,8 +3,6 @@ package com.ruoyi.system.domain.propertyRepair;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
 
@@ -20,6 +18,7 @@ public class PropertyRepair extends BaseEntity
 
     /** 报修ID */
     private Long repairId;
+    private Long userId;
 
     /** 门户id */
     @Excel(name = "门户id")
@@ -91,7 +90,15 @@ public class PropertyRepair extends BaseEntity
     @Excel(name = "维修详情，记录维修的具体过程和结果")
     private String repairCompletionDetails;
 
-    public void setRepairId(Long repairId) 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public void setRepairId(Long repairId)
     {
         this.repairId = repairId;
     }
@@ -256,30 +263,26 @@ public class PropertyRepair extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("repairId", getRepairId())
-            .append("portalId", getPortalId())
-            .append("houseAddress", getHouseAddress())
-            .append("repairTime", getRepairTime())
-            .append("phoneNumber", getPhoneNumber())
-            .append("repairTitle", getRepairTitle())
-            .append("maintenanceCategory", getMaintenanceCategory())
-            .append("repairDetails", getRepairDetails())
-            .append("repairImages", getRepairImages())
-            .append("repairStatus", getRepairStatus())
-            .append("staffName", getStaffName())
-            .append("staffId", getStaffId())
-            .append("staffPhone", getStaffPhone())
-            .append("visitTime", getVisitTime())
-            .append("visitPhoto", getVisitPhoto())
-            .append("completionTime", getCompletionTime())
-            .append("completionPhoto", getCompletionPhoto())
-            .append("repairCompletionDetails", getRepairCompletionDetails())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "PropertyRepair{" +
+                "repairId=" + repairId +
+                ", userId=" + userId +
+                ", portalId=" + portalId +
+                ", houseAddress='" + houseAddress + '\'' +
+                ", repairTime=" + repairTime +
+                ", phoneNumber='" + phoneNumber + '\'' +
+                ", repairTitle='" + repairTitle + '\'' +
+                ", maintenanceCategory='" + maintenanceCategory + '\'' +
+                ", repairDetails='" + repairDetails + '\'' +
+                ", repairImages='" + repairImages + '\'' +
+                ", repairStatus='" + repairStatus + '\'' +
+                ", staffName='" + staffName + '\'' +
+                ", staffId=" + staffId +
+                ", staffPhone='" + staffPhone + '\'' +
+                ", visitTime=" + visitTime +
+                ", visitPhoto='" + visitPhoto + '\'' +
+                ", completionTime=" + completionTime +
+                ", completionPhoto='" + completionPhoto + '\'' +
+                ", repairCompletionDetails='" + repairCompletionDetails + '\'' +
+                '}';
     }
 }

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

@@ -181,8 +181,8 @@
         <if test="communityId != null ">and i.community_id = #{communityId}</if>
         </where>
         ORDER BY
-            ci_create_time,
-            ci_like_count DESC
+            i.create_time DESC,
+        c.like_count DESC
     </select>
     <select id="getParentComment" parameterType="CommentIndex" resultMap="ChildrenListResult">
         SELECT
@@ -208,7 +208,7 @@
             AND i.del_flag = 'N'
             <if test="parentId != null ">and i.parent_id = #{parentId}</if>
         </where>
-        order by cl_create_time ,cl_like_count DESC
+        order by i.create_time DESC,c.like_count DESC
     </select>
     <select id="commentSh" parameterType="com.ruoyi.system.domain.communityNews.vo.CommentIndexShVo" resultMap="CommentIndexShVoResult">
         SELECT
@@ -247,6 +247,7 @@
             <if test="status != null and status != ''"> and c.status = #{status}</if>
             <if test="type != null "> and c.type = #{type}</if>
         </where>
+        order by i.create_time DESC
     </select>
     <select id="selectCommentIdListByCommentId" resultMap="CommentIndexResult">
         SELECT

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

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="viewCount != null "> and view_count = #{viewCount}</if>
             <if test="isTop != null  and isTop != ''"> and is_top = #{isTop}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectPartyNewsByPartyId" parameterType="Long" resultMap="PartyNewsResult">

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

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="PropertyRepair" id="PropertyRepairResult">
         <result property="repairId"    column="repair_id"    />
+        <result property="userId"    column="user_id"    />
         <result property="portalId"    column="portal_id"    />
         <result property="houseAddress"    column="house_address"    />
         <result property="repairTime"    column="repair_time"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPropertyRepairVo">
-        select repair_id, portal_id, house_address, repair_time, phone_number, repair_title, maintenance_category, repair_details, repair_images, repair_status, staff_name, staff_id, staff_phone, visit_time, visit_photo, completion_time, completion_photo, repair_completion_details, create_by, create_time, update_by, update_time, remark from property_repair
+        select repair_id, portal_id, house_address, repair_time,user_id, phone_number, repair_title, maintenance_category, repair_details, repair_images, repair_status, staff_name, staff_id, staff_phone, visit_time, visit_photo, completion_time, completion_photo, repair_completion_details, create_by, create_time, update_by, update_time, remark from property_repair
     </sql>
 
     <select id="selectPropertyRepairList" parameterType="PropertyRepair" resultMap="PropertyRepairResult">
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="visitTime != null "> and visit_time = #{visitTime}</if>
             <if test="visitPhoto != null  and visitPhoto != ''"> and visit_photo = #{visitPhoto}</if>
             <if test="completionTime != null "> and completion_time = #{completionTime}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
             <if test="completionPhoto != null  and completionPhoto != ''"> and completion_photo = #{completionPhoto}</if>
             <if test="repairCompletionDetails != null  and repairCompletionDetails != ''"> and repair_completion_details = #{repairCompletionDetails}</if>
         </where>
@@ -72,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into property_repair
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="portalId != null">portal_id,</if>
+            <if test="userId != null">user_id,</if>
             <if test="houseAddress != null and houseAddress != ''">house_address,</if>
             <if test="repairTime != null">repair_time,</if>
             <if test="phoneNumber != null">phone_number,</if>
@@ -96,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="portalId != null">#{portalId},</if>
+            <if test="userId != null">#{userId},</if>
             <if test="houseAddress != null and houseAddress != ''">#{houseAddress},</if>
             <if test="repairTime != null">#{repairTime},</if>
             <if test="phoneNumber != null">#{phoneNumber},</if>
@@ -124,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update property_repair
         <trim prefix="SET" suffixOverrides=",">
             <if test="portalId != null">portal_id = #{portalId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="houseAddress != null and houseAddress != ''">house_address = #{houseAddress},</if>
             <if test="repairTime != null">repair_time = #{repairTime},</if>
             <if test="phoneNumber != null">phone_number = #{phoneNumber},</if>