Merge branch 'develop'

src/main/java/cn/ezhizao/project/business/deduction/controller/DeductionController.java

@@ -155,6 +155,7 @@ public class DeductionController extends BaseController {
         boolean bool = fileStorageService.removeById(fileStorage);
         return bool ? success(fileStorage) : error();
     }
+
     private boolean addRecord(Long workOrderId, String year, String month, Long recorderId, String description, Integer status) {
         // 没拆分合同单价
         List<BizWorkOrderRecord> records = bizWorkOrderRecordService.query().eq("work_order_id", workOrderId).eq("year", year).eq("month", month).eq("from_id", 0).list();
@@ -195,19 +196,25 @@ public class DeductionController extends BaseController {
         }
     }
 
+    @PostMapping("/saveFiles")
+    public AjaxResult saveFiles(@RequestBody SysFileStorage fileStorageList) {
+
+        return fileStorageService.save(fileStorageList) ? success() : error();
+    }
+
+
     /**
      * 导出划款列表
      */
     @PreAuthorize("@ss.hasPermi('business:deduction:export')")
     @Log(title = "划款任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BizDeduction bizDeduction) throws NoSuchFieldException, IllegalAccessException
-    {
+    public void export(HttpServletResponse response, BizDeduction bizDeduction) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizDeduction);
         startOrderBy();
         List<BizDeduction> list = deductionService.getListByBean(bizDeduction);
-        for(BizDeduction l : list){
-            l.setCurrentMonth(l.getYear()+"-"+l.getMonth());
+        for (BizDeduction l : list) {
+            l.setCurrentMonth(l.getYear() + "-" + l.getMonth());
             //设置状态
             switch (l.getStatus()) {
                 case 0:
@@ -268,5 +275,5 @@ public class DeductionController extends BaseController {
                 break;
         }
         return success(map);
-     }
+    }
 }

src/main/java/cn/ezhizao/project/business/deduction/domain/BizDeduction.java

@@ -125,4 +125,7 @@ public class BizDeduction extends BaseEntity implements Serializable {
     //是否为自己负责(当前登陆人Id)
     @TableField(exist = false)
     private Long principal;
+
+    @TableField(exist = false)
+    private String toTenantName;
 }

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTax/domain/BizFinancialIndividualIncomeTax.java

@@ -122,4 +122,8 @@ public class BizFinancialIndividualIncomeTax extends BaseEntity implements Seria
 
     @TableField(exist = false)
     private List<String> dateFilter;
+
+    @TableField(exist = false)
+    private String toTenantName;
+
 }

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTaxIsZero/domain/BizFinancialIndividualIncomeTaxIsZero.java

@@ -125,4 +125,6 @@ public class BizFinancialIndividualIncomeTaxIsZero extends BaseEntity implements
 
     @TableField(exist = false)
     private List<String> dateFilter;
+    @TableField(exist = false)
+    private String toTenantName;
 }

src/main/java/cn/ezhizao/project/business/housingFund/domain/BizHousingFundConfirm.java

@@ -106,4 +106,7 @@ public class BizHousingFundConfirm extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private List<String> dateFilter;
 
+    @TableField(exist = false)
+    private String toTenantName;
+
 }

src/main/java/cn/ezhizao/project/business/housingFund/domain/BizHousingFundDeclare.java

@@ -104,4 +104,6 @@ public class BizHousingFundDeclare extends BaseEntity implements Serializable {
     private java.util.Date verifierTime;
     @TableField(exist = false)
     private List<String> dateFilter;
+    @TableField(exist = false)
+    private String toTenantName;
 }

src/main/java/cn/ezhizao/project/business/keepAccounts/domain/BizFinancialKeepAccount.java

@@ -153,4 +153,7 @@ public class BizFinancialKeepAccount extends BaseEntity {
     @TableField(exist = false)
     private List<String> dateFilterFinish;
 
+    @TableField(exist = false)
+    private String toTenantName;
+
 }

src/main/java/cn/ezhizao/project/business/receiveTicket/domain/BizFinancialReceiveTicket.java

@@ -185,4 +185,7 @@ public class BizFinancialReceiveTicket extends BaseEntity {
     private String finishUserName;
     @TableField(exist = false)
     private List<String> dateFilter;
+
+    @TableField(exist = false)
+    private String toTenantName;
 }

src/main/java/cn/ezhizao/project/business/receiveTicket/domain/BizFinancialReceiveTicketFeedback.java

@@ -100,6 +100,9 @@ public class BizFinancialReceiveTicketFeedback extends BaseEntity
     @TableField(exist = false)
     private String serviceName;
 
+    @TableField(exist = false)
+    private String toTenantName;
+
     public void setRemark(String remark)
     {
         this.remark = remark;

src/main/java/cn/ezhizao/project/business/reportTax/domain/BizFinancialReportTaxNonZero.java

@@ -109,4 +109,6 @@ public class BizFinancialReportTaxNonZero extends BaseEntity {
     private java.util.Date verifierTime;
     @TableField(exist = false)
     private List<String> dateFilter;
+    @TableField(exist = false)
+    private String toTenantName;
 }

src/main/java/cn/ezhizao/project/business/reportTaxIsZero/domain/BizFinancialReportTax.java

@@ -113,4 +113,6 @@ public class BizFinancialReportTax extends BaseEntity {
     private java.util.Date verifierTime;
     @TableField(exist = false)
     private List<String> dateFilter;
+    @TableField(exist = false)
+    private String toTenantName;
 }

src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryZeroController.java

@@ -13,6 +13,8 @@ import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.business.company.domain.BizCompany;
 import cn.ezhizao.project.business.company.service.IBizCompanyService;
+import cn.ezhizao.project.business.entrust.domain.BizEntrust;
+import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain.BizFinancialIndividualIncomeTaxDetailIsZero;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain.BizFinancialIndividualIncomeTaxIsZero;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.service.IBizFinancialIndividualIncomeTaxDetailIsZeroService;
@@ -36,6 +38,7 @@ import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
+import cn.ezhizao.project.tenant.service.ITenantService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.tomcat.jni.Lock;
@@ -89,6 +92,11 @@ public class BizFinancialSalaryZeroController extends BaseController {
     @Resource
     private IBizFinancialKeepAccountDetailService financialKeepAccountDetailService;
 
+    @Resource
+    private IBizEntrustService bizEntrustService;
+
+    @Resource
+    private ITenantService tenantService;
     /**
      * 查询工资列表
      */
@@ -121,7 +129,6 @@ public class BizFinancialSalaryZeroController extends BaseController {
                     l.setDetails(details.stream().filter(v -> v.getFinancialSalaryId().equals(l.getId())).collect(Collectors.toList()));
                 });
             }
-
         }
         return getDataTable(list);
     }

src/main/java/cn/ezhizao/project/business/salary/domain/BizFinancialSalary.java

@@ -153,4 +153,8 @@ public class BizFinancialSalary extends BaseEntity {
     private Date verifierTime;
     @TableField(exist = false)
     private List<String> dateFilter;
+
+    @TableField(exist = false)
+    private String toTenantName;
+
 }

src/main/java/cn/ezhizao/project/business/socialSecurity/domain/BizSocialSecurityConfirm.java

@@ -104,4 +104,7 @@ public class BizSocialSecurityConfirm extends BaseEntity implements Serializable
     private java.util.Date verifierTime;
     @TableField(exist = false)
     private List<String> dateFilter;
+
+    @TableField(exist = false)
+    private String toTenantName;
 }

src/main/java/cn/ezhizao/project/business/socialSecurity/domain/BizSocialSecurityDeclare.java

@@ -105,4 +105,6 @@ public class BizSocialSecurityDeclare extends BaseEntity implements Serializable
     private java.util.Date verifierTime;
     @TableField(exist = false)
     private List<String> dateFilter;
+    @TableField(exist = false)
+    private String toTenantName;
 }

src/main/java/cn/ezhizao/project/system/domain/SysFileStorage.java

@@ -45,4 +45,6 @@ public class SysFileStorage extends BaseEntity
     @ApiModelProperty(value = "类型")
     private String type;
 
+    private Integer supplement;
+
 }

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

@@ -54,8 +54,10 @@
 
     <sql id="getListSql">
         SELECT t1.*, t2.tax_type,
-        t3.account_name as from_company_name, t3.id from_tenant_id FROM biz_deduction t1 left join biz_company t2 on t2.id = t1.company_id
+        t3.account_name as from_company_name,t8.account_name as toTenantName, t3.id from_tenant_id FROM biz_deduction t1 left join biz_company t2 on t2.id = t1.company_id
         left join biz_tenant t3 on t3.id = t1.tenant_id
+        left join biz_entrust t9 on t9.work_order_id = t1.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(t1.year, t1.month)
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND
             <if test="id != null  ">

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

@@ -63,7 +63,7 @@
 
     <select id="getList" parameterType="BizFinancialIndividualIncomeTax"
             resultMap="BizFinancialIndividualIncomeTaxResult">
-        SELECT *,c.customer_label_id, t4.lable as customerLabelName,  t6.nick_name as verifierName,
+        SELECT *,c.customer_label_id, t4.lable as customerLabelName,  t6.nick_name as verifierName,t8.account_name as toTenantName,
         t5.verifier_time FROM biz_financial_individual_income_tax f
         LEFT JOIN biz_company c ON f.company_id = c.id
         LEFT JOIN biz_tenant t ON f.tenant_id=t.id
@@ -71,6 +71,8 @@
         left join biz_financial_individual_income_tax_detail t5 on t5.financial_individual_income_tax_id = f.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_individual_income_tax_id = f.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+        left join biz_entrust t9 on t9.work_order_id = f.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             f.deleted = 0
             AND c.is_zero=1

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

@@ -54,7 +54,7 @@
 
     <select id="getList" parameterType="BizFinancialIndividualIncomeTax"
             resultMap="BizFinancialIndividualIncomeTaxResult">
-        SELECT *, c.customer_label_id, t4.lable as customerLabelName, t6.nick_name as verifierName,
+        SELECT *, c.customer_label_id, t4.lable as customerLabelName, t6.nick_name as verifierName,t8.account_name as toTenantName,
         t5.verifier_time FROM biz_financial_individual_income_tax f
         LEFT JOIN biz_company c ON f.company_id = c.id
         LEFT JOIN biz_tenant t ON f.tenant_id=t.id
@@ -62,6 +62,8 @@
         left join biz_financial_individual_income_tax_detail t5 on t5.financial_individual_income_tax_id = f.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_individual_income_tax_id = f.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+        left join biz_entrust t9 on t9.work_order_id = f.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             f.deleted = 0
             AND c.is_zero=0

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

@@ -28,7 +28,7 @@
         SELECT
         t1.*, t2.name as company_name,t2.customer_label_id, t4.lable as customerLabelName,
         (select concat(bwor.year, '年', bwor.month, '月') from biz_work_order_record bwor where bwor.work_order_id = t1.work_order_id order by year desc, month desc limit 1) currentDate,
-        t3.account_name as from_company_name, t2.tax_type,
+        t3.account_name as from_company_name, t2.tax_type,t8.account_name as toTenantName,
         t5.current_year_profit,
         t5.provisional_estimate_amount,
         t5.current_year_income,
@@ -51,6 +51,8 @@
         ) tt1 left JOIN biz_archive_receive_ticket_finished
         tt2 on tt1.company_id=tt2.company_id and tt1.year =tt2.year and tt1.create_time = tt2.create_time) temp on t1.company_id = temp.company_id
         left join sys_user t7 on t7.user_id = temp.creator_id
+        left join biz_entrust t9 on t9.work_order_id = t1.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         WHERE
         t1.deleted = 0 and t1.is_stop = 0
         <if test="id != null">

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

@@ -1,29 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.ezhizao.project.business.receiveTicket.mapper.BizFinancialReceiveTicketFeedbackMapper">
 
-    <resultMap type="cn.ezhizao.project.business.receiveTicket.domain.BizFinancialReceiveTicketFeedback" id="BizFinancialReceiveTicketFeedbackResult">
+    <resultMap type="cn.ezhizao.project.business.receiveTicket.domain.BizFinancialReceiveTicketFeedback"
+               id="BizFinancialReceiveTicketFeedbackResult">
         <id column="id" property="id"/>
         <result column="company_id" jdbcType="BIGINT" property="companyId"/>
         <association property="serviceName" select="getServiceName" column="company_id"></association>
     </resultMap>
 
 
-    <select id="getList" parameterType="BizFinancialReceiveTicketFeedback" resultMap="BizFinancialReceiveTicketFeedbackResult">
-        SELECT t1.*, t2.name as company_name, t2.tax_type, t3.year, t3.month,
+    <select id="getList" parameterType="BizFinancialReceiveTicketFeedback"
+            resultMap="BizFinancialReceiveTicketFeedbackResult">
+        SELECT t1.*, t2.name as company_name, t2.tax_type, t3.year, t3.month,t8.account_name as toTenantName,
         t4.account_name as from_company_name FROM biz_financial_receive_ticket_feedback t1 left join
         biz_company t2 on t2.id = t1.company_id
         left join biz_financial_receive_ticket_detail t3 on t3.id = t1.financial_receive_ticket_detail_id
         left join biz_tenant t4 on t4.id = t2.tenant_id
+        left join biz_entrust t7 on
+         t7.company_id = t3.company_id and t7.task_type_id = 1
+        and t7.deleted = 0 and date_format(t7.current_month, '%Y%m') = concat(t3.year, t3.month)
+        left join biz_tenant t8 on t8.id = t7.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND
             <if test="id != null  ">
                 t1.id = #{id} AND
             </if>
             <if test="principal != null and principal != ''">
-                 (t2.leader_id=#{principal} OR t2.adviser_id=#{principal}) AND
+                (t2.leader_id=#{principal} OR t2.adviser_id=#{principal}) AND
             </if>
             <if test="year != null  ">
                 t3.year = #{year} AND
@@ -54,12 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and eb.company_id = t3.company_id and eb.task_type_id = 1
                 ) AND
             </if>
-<!--            <if test="tenantId != null  ">-->
-<!--                (t1.tenant_id = #{tenantId}-->
-<!--                or exists (select 1 from entrust where entrust.deleted = 0 and entrust.is_stop = 0 and entrust.company_id = t1.company_id and entrust.task_type_id = 1 and entrust.from_tenant_id = #{tenantId})-->
-<!--                ) AND-->
-<!--            </if>-->
-<!--            exists (select 1 from entrust where entrust.deleted = 0 and entrust.is_stop = 0 and entrust.company_id = t1.company_id and entrust.task_type_id = 1) AND-->
+            <!--            <if test="tenantId != null  ">-->
+            <!--                (t1.tenant_id = #{tenantId}-->
+            <!--                or exists (select 1 from entrust where entrust.deleted = 0 and entrust.is_stop = 0 and entrust.company_id = t1.company_id and entrust.task_type_id = 1 and entrust.from_tenant_id = #{tenantId})-->
+            <!--                ) AND-->
+            <!--            </if>-->
+            <!--            exists (select 1 from entrust where entrust.deleted = 0 and entrust.is_stop = 0 and entrust.company_id = t1.company_id and entrust.task_type_id = 1) AND-->
 
             <if test="companyName != null and companyName != ''">
                 t2.name like concat('%', #{companyName}, '%') AND
@@ -101,8 +107,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getServiceName" resultType="String">
-        SELECT s.nick_name FROM sys_user s
-        WHERE s.user_id =(SELECT leader_id  FROM biz_company WHERE id=#{company_id})
+        SELECT s.nick_name
+        FROM sys_user s
+        WHERE s.user_id = (SELECT leader_id FROM biz_company WHERE id = #{company_id})
     </select>
 
     <delete id="physicalDelete">
@@ -111,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">
                 id = #{id} AND
             </if>
-       <!-- 删除条件为其他外键可以在这里加 -->
+            <!-- 删除条件为其他外键可以在这里加 -->
         </trim>
     </delete>
 </mapper>

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

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t1.*, t2.name as company_name,t2.customer_label_id, t4.lable as customerLabelName,
 <!--        (select concat(frtd.year, '-', frtd.month) from biz_financial_receive_ticket_detail frtd where frtd.financial_receive_ticket_id = t1.id order by year desc, month desc limit 1) currentDate,-->
         (select concat(bwor.year, '年', bwor.month, '月') from biz_work_order_record bwor where bwor.work_order_id = t1.work_order_id order by year desc, month desc limit 1) currentDate,
-        t3.account_name as from_company_name, t2.tax_type,
+        t3.account_name as from_company_name, t2.tax_type, t8.account_name as toTenantName,
         t5.verifier_id,
         t6.nick_name as verifierName,
         t5.verifier_time,
@@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join biz_financial_receive_ticket_detail t5 on t5.financial_receive_ticket_id = t1.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_receive_ticket_id = t1.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+        left join biz_entrust t7 on t7.work_order_id = t1.work_order_id and t7.deleted = 0 and  date_format(t7.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t7.to_tenant_id
         WHERE
         t1.deleted = 0
         <if test="id != null">

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

@@ -26,7 +26,7 @@
         t1.*, t2.name as company_name, t2.social_credit_code, t2.tax_type, t2.is_zero, t2.customer_label_id, t4.lable as customerLabelName,
         (select concat(frtd.year, '-', frtd.month) from biz_financial_report_tax_detail frtd where
         frtd.financial_report_tax_id = t1.id order by year desc, month desc limit 1) currentDate,
-        t3.account_name as from_company_name,t6.nick_name as verifierName,
+        t3.account_name as from_company_name,t6.nick_name as verifierName,t8.account_name as toTenantName,
         t5.verifier_time
         from biz_financial_report_tax t1
         left join biz_company t2 on t2.id = t1.company_id
@@ -35,6 +35,8 @@
         left join biz_financial_report_tax_detail t5 on t5.financial_report_tax_id = t1.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_report_tax_id = t1.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+        left join biz_entrust t9 on t9.work_order_id = t1.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <!--        left join fxy_financial_checkout t3 on t3.account_sets_id = t1.account_sets_id-->
         WHERE
         t1.deleted = 0

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

@@ -25,7 +25,7 @@
         SELECT
         t1.*, t2.name as company_name, t2.social_credit_code, t2.tax_type, t2.is_zero,t2.customer_label_id, t4.lable as customerLabelName,
         (select concat(frtd.year, '-', frtd.month) from biz_financial_report_tax_detail frtd where
-        frtd.financial_report_tax_id = t1.id order by year desc, month desc limit 1) currentDate,
+        frtd.financial_report_tax_id = t1.id order by year desc, month desc limit 1) currentDate,t8.account_name as toTenantName,
         t3.account_name as from_company_name,t6.nick_name as verifierName,
         t5.verifier_time
         from biz_financial_report_tax t1
@@ -35,6 +35,8 @@
         left join biz_financial_report_tax_detail t5 on t5.financial_report_tax_id = t1.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_report_tax_id = t1.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+        left join biz_entrust t9 on t9.work_order_id = t1.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <!--        left join fxy_financial_checkout t3 on t3.account_sets_id = t1.account_sets_id-->
         WHERE
         t1.deleted = 0 and t1.is_stop = 0

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

@@ -26,7 +26,7 @@
         t1.work_order_id order by year desc, month desc limit 1) currentDate,
         <!--        (select concat(frtd.year, '-', frtd.month) from biz_housing_fund_confirm_detail frtd where frtd.housing_fund_confirm_id = t1.id order by year desc, month desc limit 1) currentDate, -->
         t2.tax_type,
-        t3.account_name as from_company_name, t5.verifier_id,
+        t3.account_name as from_company_name, t5.verifier_id,t8.account_name as toTenantName,
         t6.nick_name as verifierName,
         t5.verifier_time
         FROM biz_housing_fund_confirm t1
@@ -35,7 +35,8 @@
         left join biz_housing_fund_confirm_detail t5 on t5.housing_fund_confirm_id = t1.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.housing_fund_confirm_id = t1.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
-
+        left join biz_entrust t9 on t9.work_order_id = t1.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND t1.is_stop = 0 AND
             <if test="id != null  ">

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

@@ -23,7 +23,7 @@
         SELECT t1.*, t2.name as company_name,
         (select concat(frtd.year, '-', frtd.month) from biz_housing_fund_declare_detail frtd where
         frtd.housing_fund_declare_id = t1.id order by year desc, month desc limit 1) currentDate,
-        t3.account_name as from_company_name, t2.tax_type,t6.nick_name as verifierName,
+        t3.account_name as from_company_name, t2.tax_type,t6.nick_name as verifierName,t8.account_name as toTenantName,
         t5.verifier_time
         FROM biz_housing_fund_declare t1
         left join biz_company t2 on t2.id = t1.company_id
@@ -31,6 +31,8 @@
         left join biz_housing_fund_declare_detail t5 on t5.housing_fund_declare_id = t1.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.housing_fund_declare_id = t1.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+        left join biz_entrust t9 on t9.work_order_id = t1.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND
             <if test="id != null  ">

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

@@ -26,7 +26,7 @@
 <!--        (select concat(frtd.year, '-', frtd.month) from biz_social_security_confirm_detail frtd where frtd.social_security_confirm_id = t1.id order by year desc, month desc limit 1) currentDate,-->
         t3.account_name as from_company_name, t2.tax_type,
         t5.verifier_id,
-        t6.nick_name as verifierName,
+        t6.nick_name as verifierName,t8.account_name as toTenantName,
         t5.verifier_time
         FROM biz_social_security_confirm t1
         left join biz_company t2 on t2.id = t1.company_id
@@ -34,6 +34,8 @@
         left join biz_social_security_confirm_detail t5 on t5.social_security_confirm_id = t1.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.social_security_confirm_id = t1.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+        left join biz_entrust t9 on t9.work_order_id = t1.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND t1.is_stop = 0 AND
             <if test="id != null  ">

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

@@ -22,7 +22,7 @@
     <sql id="getListSql">
         SELECT t1.*, t2.name as company_name,
         (select concat(frtd.year, '-', frtd.month) from biz_social_security_declare_detail frtd where frtd.social_security_declare_id = t1.id order by year desc, month desc limit 1) currentDate,
-        t3.account_name as from_company_name, t2.tax_type,t6.nick_name as verifierName,
+        t3.account_name as from_company_name, t2.tax_type,t6.nick_name as verifierName,t8.account_name as toTenantName,
         t5.verifier_time
         FROM biz_social_security_declare t1
         left join biz_company t2 on t2.id = t1.company_id
@@ -30,6 +30,8 @@
         left join biz_social_security_declare_detail t5 on t5.social_security_declare_id = t1.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.social_security_declare_id = t1.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+        left join biz_entrust t9 on t9.work_order_id = t1.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND
             <if test="id != null  ">