|
|
@@ -11,12 +11,8 @@
|
|
|
<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="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="serviceName" javaType="java.lang.Long" select="getServiceName" column="company_id"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmployee"
|
|
|
@@ -60,7 +56,7 @@
|
|
|
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
|
|
|
+ t.account_name as fromCompanyName,c.tax_type as taxType,t10.nick_name as serviceName
|
|
|
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
|
|
|
@@ -68,6 +64,7 @@
|
|
|
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">
|
ly