ToolTech/tool-tech
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
hanjian 2024-09-09 16:40:32 +08:00
parent 045d857ae2
commit 596a721894
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tool-tech-admin/src/main/java/com/rzdata/web/domain/Replies.java
View File

@ -24,6 +24,9 @@ public class Replies extends BaseEntity
@Excel(name = "讨论表id")
private String discussionId;
@Excel(name = "回复评论ID")
private String repId;
/** 内容 */
@Excel(name = "内容")
private String content;
@ -42,5 +45,7 @@ public class Replies extends BaseEntity
private String nickName;
private String repTargetNickName;
private List<String> discussionIdList;
}

5
tool-tech-admin/src/main/java/com/rzdata/web/service/impl/DiscussionsServiceImpl.java
View File

@ -6,6 +6,7 @@ import java.util.stream.Collectors;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.StrUtil;
import com.rzdata.common.constant.Constants;
import com.rzdata.common.utils.DateUtils;
import com.rzdata.common.utils.SecurityUtils;
@ -76,6 +77,10 @@ public class DiscussionsServiceImpl implements IDiscussionsService
List<Replies> addList = new ArrayList<>();
for (Replies repItem : repliesList) {
if(repItem.getDiscussionId().equals(disItem.getId())){
if(StrUtil.isNotEmpty(repItem.getRepId())){
Replies repliesTarget = iRepliesService.selectRepliesById(repItem.getRepId());
repItem.setRepTargetNickName(repliesTarget.getNickName());
}
addList.add(repItem);
}
}

12
tool-tech-admin/src/main/resources/mapper/RepliesMapper.xml
View File

@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="Replies" id="RepliesResult">
<result property="id" column="id" />
<result property="discussionId" column="discussion_id" />
<result property="repId" column="rep_id" />
<result property="content" column="content" />
<result property="isDelete" column="is_delete" />
<result property="createBy" column="create_by" />
@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectRepliesVo">
select id, discussion_id, content, is_delete, create_by, create_by_id, create_time, update_by, update_by_id, update_time from t_replies
select id, discussion_id, rep_id, content, is_delete, create_by, create_by_id, create_time, update_by, update_by_id, update_time from t_replies
</sql>
<select id="selectRepliesList" parameterType="Replies" resultMap="RepliesResult">
@ -42,8 +43,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectRepliesById" parameterType="String" resultMap="RepliesResult">
<include refid="selectRepliesVo"/>
where id = #{id}
select tr.*,su.nick_name
from t_replies tr
left join sys_user su on su.user_id = tr.create_by_id
where tr.id = #{id}
</select>
<insert id="insertReplies" parameterType="Replies">
@ -51,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="discussionId != null">discussion_id,</if>
<if test="repId != null">rep_id,</if>
<if test="content != null">content,</if>
<if test="isDelete != null">is_delete,</if>
<if test="createBy != null">create_by,</if>
@ -63,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="discussionId != null">#{discussionId},</if>
<if test="repId != null">#{repId},</if>
<if test="content != null">#{content},</if>
<if test="isDelete != null">#{isDelete},</if>
<if test="createBy != null">#{createBy},</if>
@ -78,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_replies
<trim prefix="SET" suffixOverrides=",">
<if test="discussionId != null">discussion_id = #{discussionId},</if>
<if test="repId != null">rep_id = #{repId},</if>
<if test="content != null">content = #{content},</if>
<if test="isDelete != null">is_delete = #{isDelete},</if>
<if test="createBy != null">create_by = #{createBy},</if>

2
tool-tech-admin/src/main/resources/mapper/ToolApplyMapper.xml
View File

@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="hasToolUseApply" resultType="int">
SELECT count(*) FROM t_tool_apply ta
WHERE ta.apply_type='use' and ta.tool_id = #{toolId} and ta.user_id = #{userId}
WHERE ta.apply_type='use' and ta.record_status != 'cancel' and ta.tool_id = #{toolId} and ta.user_id = #{userId}
</select>
<select id="checkToolUseApply" resultType="int">