|
@@ -92,7 +92,7 @@
|
|
LEFT JOIN c_enterprise t5 ON t2.enterprise_customer_info_id = t5.id
|
|
LEFT JOIN c_enterprise t5 ON t2.enterprise_customer_info_id = t5.id
|
|
LEFT JOIN t_dictionary t6 ON t2.settlement_status = t6.id
|
|
LEFT JOIN t_dictionary t6 ON t2.settlement_status = t6.id
|
|
<where>
|
|
<where>
|
|
- t1.business_type = "BillBasicInformation"
|
|
|
|
|
|
+ (t1.business_type = "BillBasicInformation" or t1.business_type = "BillUnitPriceAdjust")
|
|
AND t1.end_time IS NOT NULL
|
|
AND t1.end_time IS NOT NULL
|
|
<if test="userId != null">
|
|
<if test="userId != null">
|
|
AND t1.assignee_id = #{userId}
|
|
AND t1.assignee_id = #{userId}
|
|
@@ -132,7 +132,7 @@
|
|
left join trading_platform t9 on t2.trading_platform_id = t9.id
|
|
left join trading_platform t9 on t2.trading_platform_id = t9.id
|
|
LEFT JOIN c_sys_user t10 ON t10.id = t7.sys_user_id
|
|
LEFT JOIN c_sys_user t10 ON t10.id = t7.sys_user_id
|
|
<where>
|
|
<where>
|
|
- t1.business_type = "BillBasicInformation"
|
|
|
|
|
|
+ (t1.business_type = "BillBasicInformation" or t1.business_type = "BillUnitPriceAdjust")
|
|
<if test="userIds != null and userIds.size()>0">
|
|
<if test="userIds != null and userIds.size()>0">
|
|
AND t10.project_manager in
|
|
AND t10.project_manager in
|
|
<foreach collection="userIds" index="index" item="item" open="(" separator="," close=")">
|
|
<foreach collection="userIds" index="index" item="item" open="(" separator="," close=")">
|
|
@@ -182,7 +182,7 @@
|
|
LEFT JOIN c_enterprise t5 ON t2.enterprise_customer_info_id = t5.id
|
|
LEFT JOIN c_enterprise t5 ON t2.enterprise_customer_info_id = t5.id
|
|
LEFT JOIN t_dictionary t6 ON t2.settlement_status = t6.id
|
|
LEFT JOIN t_dictionary t6 ON t2.settlement_status = t6.id
|
|
<where>
|
|
<where>
|
|
- t1.business_type = "BillBasicInformation"
|
|
|
|
|
|
+ (t1.business_type = "BillBasicInformation" or t1.business_type = "BillUnitPriceAdjust")
|
|
and t2.supplier_id = #{supplierId}
|
|
and t2.supplier_id = #{supplierId}
|
|
<if test="startDate != null">
|
|
<if test="startDate != null">
|
|
<![CDATA[ AND DATE_FORMAT(t2.settlement_date, '%Y-%m-%d')>= DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]>
|
|
<![CDATA[ AND DATE_FORMAT(t2.settlement_date, '%Y-%m-%d')>= DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]>
|