|
|
@@ -7,8 +7,8 @@
|
|
|
<resultMap type="cn.ezhizao.project.business.salary.domain.BizFinancialSalary" id="BizFinancialSalaryResult">
|
|
|
<id column="id" property="id"/>
|
|
|
<result column="company_id" jdbcType="BIGINT" property="companyId"/>
|
|
|
- <association property="serviceName" select="getServiceName" column="company_id"></association>
|
|
|
- <association property="socialCreditCode" select="getSocialCreditCode" column="company_id"></association>
|
|
|
+<!-- <association property="serviceName" select="getServiceName" column="company_id"></association>-->
|
|
|
+<!-- <association property="socialCreditCode" select="getSocialCreditCode" column="company_id"></association>-->
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="cn.ezhizao.project.business.salary.domain.BizFinancialSalary" id="BizFinancialSalaryResult2">
|
|
|
@@ -17,7 +17,8 @@
|
|
|
<!-- <association property="socialCreditCode" select="getSocialCreditCode" column="company_id"></association>-->
|
|
|
</resultMap>
|
|
|
<select id="getList" parameterType="BizFinancialSalary" resultMap="BizFinancialSalaryResult">
|
|
|
- SELECT t1.*, t2.name as company_name,t2.tax_type, t3.account_name as from_company_name,
|
|
|
+ SELECT t1.*, t2.name as company_name,t2.tax_type, t3.account_name as from_company_name,t9.nick_name as serviceName,
|
|
|
+ t2.social_credit_code as socialCreditCode,
|
|
|
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,
|
|
|
@@ -33,7 +34,7 @@
|
|
|
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
|
|
|
-
|
|
|
+ left join sys_user t9 on t9.user_id = t2.leader_id
|
|
|
|
|
|
|
|
|
<trim prefix=" WHERE" suffix="" suffixOverrides="AND">
|
ly