添加来源选项

src/main/java/cn/ezhizao/project/business/fileUpload/domain/BizFileUpload.java

@@ -77,4 +77,8 @@ public class BizFileUpload extends BaseEntity {
     @TableField(exist = false)
     @Excel(name = "租户版本Id")
     private Integer tenantVersionId;
+
+    @TableField(exist = false)
+    @Excel(name = "来源租户Id")
+    private Long fromTenantId;
 }

src/main/resources/mybatis/business/BizFileUploadMapper.xml

@@ -22,17 +22,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join biz_company bc  on
             bc.id = bfu.company_id
             left join sys_user su on su.user_id = bfu.creator_id
-            <if test="tenantVersionId == 4 "> left join biz_entrust_order beo on beo.from_tenant_id = bfu.tenant_id and beo.deleted = 0 </if>
+            <if test="tenantVersionId == 4 "> left join biz_entrust_order beo on beo.from_tenant_id = bfu.tenant_id and beo.deleted = 0 and beo.status = 1 </if>
         <trim prefix=" WHERE" suffix="" prefixOverrides="AND" suffixOverrides="AND">
             <if test="deleted != null "> AND bfu.deleted = #{deleted}</if>
             <if test="type != null "> AND bfu.type = #{type}</if>
             <if test="tenantVersionId == 4 "> and beo.tenant_id = #{tenantId} </if>
             <if test="tenantVersionId != 4 and tenantId != null "> AND bfu.tenant_id = #{tenantId}</if>
+            <if test="fromTenantId != null and fromTenantId != ''"> AND bfu.tenant_id = #{fromTenantId} </if>
             <if test="fileName != null  and fileName != ''"> AND bfu.file_name like concat('%', #{fileName}, '%')</if>
             <if test="companyName != null  and companyName != ''"> AND bc.name like concat('%', #{companyName}, '%')</if>
             <if test="userName != null  and userName != ''"> AND su.nick_name like concat('%', #{userName}, '%')</if>
             <if test="dateFilterFinish != null and dateFilterFinish.size()>0 ">
-                AND  bfu.create_time between  STR_TO_DATE(#{dateFilterFinish[0]}, '%Y-%m-%d') and STR_TO_DATE(#{dateFilterFinish[1]}, '%Y-%m-%d')
+                AND  bfu.create_time between  STR_TO_DATE(#{dateFilterFinish[0]}, '%Y-%m-%d')
+                    and  DATE_ADD(STR_TO_DATE(#{dateFilterFinish[1]}, '%Y-%m-%d'), INTERVAL 1 DAY)
             </if>
         </trim>
     </select>