个贷总览价值时点bug修改&大中型开票记录bug修改

dao/src/main/resources/mapper/FinanceInvoiceMapper.xml

@@ -237,13 +237,9 @@
     </select>
 
     <select id="getList" resultType="com.dayou.entity.FinanceInvoice">
+        select * from finance_invoice where deleted = 0 and order_fund_id = #{orderFundId} and production_fund_id = #{productionFundId}
+        UNION
         select * from finance_invoice where deleted = 0 and order_fund_id = #{orderFundId}
-        <if test="productionFundId!=null">
-            and production_fund_id = #{productionFundId}
-        </if>
-        <if test="productionFundId == null">
-            and production_fund_id is null
-        </if>
         order by created DESC
     </select>
 </mapper>

dao/src/main/resources/mapper/PersonalMapper.xml

@@ -620,7 +620,8 @@
         pt.acreage,
         pt.price,
         pt.amount,
-        ps.created AS valueTiming,
+        (select created from work_flow_log where instance_id =
+        (select id from work_flow_node_instance where business_type = 'PERSONAL_BUSINESS' and deleted = 0 and business_id = p.id and node_id = 100 ) order by created desc limit 1) AS valueTiming,
         found.real_amount,
         cc1.NAME AS clientName,
         cc2.NAME AS clientSubName,
@@ -647,7 +648,6 @@
         f.business_type = 'PERSONAL_BUSINESS'
         AND f.deleted = 0
         ) found ON found.business_id = p.id
-        left join (select personal_id, created  from personal_scene) ps on ps.personal_id = p.id
         LEFT JOIN (select id,name from customer_company where deleted=0) cc1 ON cc1.id = p.clientele_id
         LEFT JOIN (select id,name from customer_company where deleted=0) cc2 ON cc2.id = p.clientele_sub_id
         LEFT JOIN (select id,name,mobile from customer_linkman where deleted = 0) cl1 ON cl1.id = p.clientele_contact_id