浏览代码

fix:SQL优化

(cherry picked from commit c6b313220f2df105b6f27f3fb046e53846e5ac56)
ly 9 月之前
父节点
当前提交
16223b080c
共有 1 个文件被更改,包括 6 次插入9 次删除
  1. 6 9
      src/main/resources/mybatis/business/BizFinancialIndividualIncomeTaxMapper.xml

+ 6 - 9
src/main/resources/mybatis/business/BizFinancialIndividualIncomeTaxMapper.xml

@@ -10,17 +10,10 @@
         <result column="account_sets_id" jdbcType="INTEGER" property="accountSetsId"/>
         <result column="tenant_id" jdbcType="BIGINT" property="tenantId"/>
         <result column="company_id" jdbcType="BIGINT" property="companyId"/>
-        <association property="companyName" javaType="java.lang.String" select="getCompanyName" column="company_id"/>
-        <association property="socialCreditCode" javaType="java.lang.String" select="getSocialCreditCode"
-                     column="company_id"/>
         <association property="fromCompanyName" javaType="java.lang.String" select="getFromCompanyName"
                      column="tenant_id"/>
-        <association property="taxType" javaType="java.lang.String" select="getTaxType" column="company_id"/>
         <association property="currentEmployeeName" javaType="java.lang.String" select="getCurrentEmployeeName"
                      column="current_employee_id"/>
-        <association property="evidenceFile" javaType="java.lang.String" select="getCurrentEvidenceFile" column="id"/>
-        <association property="companyId" javaType="java.lang.Long" select="getCompanyId" column="id"/>
-        <association property="serviceName" select="getServiceName" column="company_id"></association>
     </resultMap>
 
     <resultMap type="cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmployee"
@@ -51,17 +44,21 @@
     <resultMap type="cn.ezhizao.project.system.domain.SysFileStorage" id="FileStorageResult">
         <id column="id" property="id"/>
     </resultMap>
-
     <select id="getList" parameterType="BizFinancialIndividualIncomeTax"
             resultMap="BizFinancialIndividualIncomeTaxResult">
         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
+        t5.verifier_time, t5.evidence_file as evidenceFile,
+        t10.nick_name as serviceName,c.name as companyName,
+        c.social_credit_code as socialCreditCode,
+        c.tax_type as taxType
+        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
         left join biz_lable t4 on t4.id = c.customer_label_id
         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 sys_user t10 on t10.user_id = c.leader_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">