Преглед изворни кода

fix:个税零申报导出sql优化

ly пре 10 месеци
родитељ
комит
d8fb2def09

+ 6 - 8
src/main/resources/mybatis/business/BizFinancialIndividualIncomeTaxIsZeroMapper.xml

@@ -12,16 +12,11 @@
         <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" javaType="java.lang.Long" select="getServiceName" column="company_id"/>
     </resultMap>
 
@@ -63,8 +58,11 @@
 
     <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
+        SELECT *,c.customer_label_id, t4.lable as customerLabelName,
+        t6.nick_name as verifierName,t8.account_name as toTenantName,
+        t5.verifier_time ,c.name as companyName,c.social_credit_code as socialCreditCode,
+        t.account_name as fromCompanyName,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