diff --git a/tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml b/tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml index 50d551a..5a9176d 100644 --- a/tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml +++ b/tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml @@ -46,6 +46,7 @@ and td.doc_name like concat('%', #{docName}, '%') and td.doc_type = #{docType} and td.doc_principals like concat('%', #{docPrincipals}, '%') + and td.doc_principals_name like concat('%', #{docPrincipalsName}, '%') and td.doc_resp_dept = #{docRespDept} and td.doc_source = #{docSource} and td.doc_status = #{docStatus} diff --git a/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml b/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml index be41d49..7f086ee 100644 --- a/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml +++ b/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from t_download_count tdc left join t_tool tl on tdc.business_id = tl.tool_id - and business_type = 'tool' + and business_type = 'tool' and tl.record_status != 'cancel' AND date_format(tdc.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') @@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from t_download_count tdc left join t_document tl on tdc.business_id = tl.doc_id - and business_type = 'doc' + and business_type = 'doc' and tl.is_deleted != 1 AND date_format(tdc.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') diff --git a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml index dbf451f..143b10a 100644 --- a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml +++ b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml @@ -160,6 +160,15 @@ AND u.tool_name like concat('%', #{toolName}, '%') + + AND u.tool_principals_name like concat('%', #{toolPrincipalsName}, '%') + + + AND u.tool_type = #{toolType} + + + AND u.record_status = #{recordStatus} + AND u.status = #{status}