Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

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

@@ -627,7 +627,7 @@
         fund.real_amount IS NOT NULL
         AND mpr.save_file_date IS NOT NULL
         ) mp ON mp.report_no = pf.production_no
-                LEFT JOIN major m ON m.id = mp.major_id
+                LEFT JOIN (select * from major where financial is not null) m ON m.id = mp.major_id
                 INNER JOIN ( SELECT id, business_id, production_id, commission_rate_id FROM commission_declare WHERE business_type = 'COMMISSION_DECLARE_MAJOR_EVALUATE' AND deleted = 0 AND declare_result = '审核通过' ) cd ON (
                         cd.business_id = m.id
                     AND  cd.production_id = mp.id )
@@ -714,6 +714,7 @@
                 LEFT JOIN ( SELECT major_id, major_production_id, user_id, ratio FROM major_production_allot WHERE deleted = 0 AND user_type = 'EVALUATE' ) mpa ON ( mpa.major_id = m.id AND mpa.major_production_id = mp.id)
                 LEFT JOIN user u on u.id = mpa.user_id
         WHERE
+            m.financial is not null and
             mpa.user_id = #{vo.userId}
         order by settleDate DESC
     </select>
@@ -872,7 +873,7 @@
         fund.real_amount IS NOT NULL
         AND mpr.delivery_date IS NOT NULL
         ) mp ON mp.report_no = pf.production_no
-        LEFT JOIN major m ON m.id = mp.major_id
+        LEFT JOIN (select * from major where financial is not null) m ON m.id = mp.major_id
         INNER JOIN ( SELECT id, business_id, production_id, commission_rate_id FROM commission_declare WHERE business_type = 'COMMISSION_DECLARE_MAJOR_MARKET' AND deleted = 0 AND declare_result = '审核通过' ) cd ON (
         cd.business_id = m.id
         AND cd.production_id = mp.id )
@@ -959,6 +960,7 @@
                 LEFT JOIN ( SELECT major_id, major_production_id, user_id, ratio,declare_id FROM major_production_allot WHERE deleted = 0 AND user_type = 'MARKET' ) mpa  ON ( mpa.major_id = m.id AND cd.id = mpa.declare_id AND (mpa.major_production_id is null or mpa.major_production_id = mp.id ))
                 LEFT JOIN user u on u.id = mpa.user_id
         WHERE
+            m.financial is not null and
             mpa.user_id = #{vo.userId}
         order by settleDate DESC
     </select>

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

@@ -40,7 +40,7 @@
         pc.item_id,
         pc.NAME,
         pc.payment_date,
-        fc.claim_amount,
+        pc.amount as claimAmount,
         fc.claim_datetime ,
         frf.payer,
         frf.pay_datetime,
@@ -87,9 +87,9 @@
             </foreach>
         </if>
         <if test="dto!=null and dto.startDate!=null and dto.endDate!=null">
-            AND pc.created BETWEEN #{dto.startDate} AND #{dto.endDate}
+            AND fc.claim_datetime BETWEEN #{dto.startDate} AND #{dto.endDate}
         </if>
-        order by pc.payment_date DESC
+        order by fc.claim_datetime DESC
     </sql>
 
     <select id="page" parameterType="com.dayou.vo.PaymentCollectionVO" resultType="com.dayou.vo.PaymentCollectionVO">