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

release-v1.0 #1

Merged
panchichun merged 41 commits from release-v1.0 into main 2024-09-13 17:03:09 +08:00
Conversation 0 Commits 41 Files Changed 138 +12 -2
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dca0dcb298 - Show all commits

1
tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml
View File

@ -46,6 +46,7 @@
<if test="docName != null and docName != ''"> and td.doc_name like concat('%', #{docName}, '%')</if> <if test="docName != null and docName != ''"> and td.doc_name like concat('%', #{docName}, '%')</if>
<if test="docType != null and docType != ''"> and td.doc_type = #{docType}</if> <if test="docType != null and docType != ''"> and td.doc_type = #{docType}</if>
<if test="docPrincipals != null and docPrincipals != ''"> and td.doc_principals like concat('%', #{docPrincipals}, '%')</if> <if test="docPrincipals != null and docPrincipals != ''"> and td.doc_principals like concat('%', #{docPrincipals}, '%')</if>
<if test="docPrincipalsName != null and docPrincipalsName != ''"> and td.doc_principals_name like concat('%', #{docPrincipalsName}, '%')</if>
<if test="docRespDept != null and docRespDept != ''"> and td.doc_resp_dept = #{docRespDept}</if> <if test="docRespDept != null and docRespDept != ''"> and td.doc_resp_dept = #{docRespDept}</if>
<if test="docSource != null and docSource != ''"> and td.doc_source = #{docSource}</if> <if test="docSource != null and docSource != ''"> and td.doc_source = #{docSource}</if>
<if test="docStatus != null and docStatus != ''"> and td.doc_status = #{docStatus}</if> <if test="docStatus != null and docStatus != ''"> and td.doc_status = #{docStatus}</if>

4
tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml
View File

@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from t_download_count tdc from t_download_count tdc
left join t_tool tl on tdc.business_id = tl.tool_id left join t_tool tl on tdc.business_id = tl.tool_id
<where> <where>
and business_type = 'tool' and business_type = 'tool' and tl.record_status != 'cancel'
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(tdc.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') AND date_format(tdc.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>
@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from t_download_count tdc from t_download_count tdc
left join t_document tl on tdc.business_id = tl.doc_id left join t_document tl on tdc.business_id = tl.doc_id
<where> <where>
and business_type = 'doc' and business_type = 'doc' and tl.is_deleted != 1
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(tdc.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') AND date_format(tdc.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>

9
tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
View File

@ -160,6 +160,15 @@
<if test="toolName != null and toolName != ''"> <if test="toolName != null and toolName != ''">
AND u.tool_name like concat('%', #{toolName}, '%') AND u.tool_name like concat('%', #{toolName}, '%')
</if> </if>
<if test="toolPrincipalsName != null and toolPrincipalsName != ''">
AND u.tool_principals_name like concat('%', #{toolPrincipalsName}, '%')
</if>
<if test="toolType != null and toolType != ''">
AND u.tool_type = #{toolType}
</if>
<if test="recordStatus != null and recordStatus != ''">
AND u.record_status = #{recordStatus}
</if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND u.status = #{status} AND u.status = #{status}
</if> </if>