|
@@ -71,9 +71,9 @@
|
|
|
ON info.trust_id = c.company_id AND c.isvalid = 1
|
|
ON info.trust_id = c.company_id AND c.isvalid = 1
|
|
|
JOIN PPW_EMAIL.nav n
|
|
JOIN PPW_EMAIL.nav n
|
|
|
ON n.fund_id = d.fund_id and d.distribute_date=n.price_date
|
|
ON n.fund_id = d.fund_id and d.distribute_date=n.price_date
|
|
|
|
|
+ AND n.isvalid = 1
|
|
|
WHERE d.isvalid = 1
|
|
WHERE d.isvalid = 1
|
|
|
AND info.isvalid = 1
|
|
AND info.isvalid = 1
|
|
|
- AND n.isvalid = 1
|
|
|
|
|
<if test="companyName != null and companyName !=''">
|
|
<if test="companyName != null and companyName !=''">
|
|
|
and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%'))
|
|
and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%'))
|
|
|
</if>
|
|
</if>
|
|
@@ -89,6 +89,7 @@
|
|
|
<if test="endDate != null and endDate !=''">
|
|
<if test="endDate != null and endDate !=''">
|
|
|
and d.distribute_date <![CDATA[ <= ]]> #{endDate}
|
|
and d.distribute_date <![CDATA[ <= ]]> #{endDate}
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ order by d.updatetime desc
|
|
|
limit #{offset},#{pageSize}
|
|
limit #{offset},#{pageSize}
|
|
|
</select>
|
|
</select>
|
|
|
<select id="countDistributionList" resultType="java.lang.Long"
|
|
<select id="countDistributionList" resultType="java.lang.Long"
|
