This commit is contained in:
baozhipeng
2021-09-26 14:36:00 +08:00
parent a74961a266
commit d17a369155
2 changed files with 5 additions and 3 deletions
@@ -99,7 +99,7 @@
<if test="paymentDate != null and paymentDate != ''">
AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
</if>
GROUP BY p.id ORDER BY p.create_time
GROUP BY p.id ORDER BY p.create_time desc
</select>
<!-- 到账开票导出-->
@@ -199,7 +199,7 @@
<if test="paymentDate != null and paymentDate != ''">
AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
</if>
GROUP BY p.id ORDER BY p.create_time
GROUP BY p.id ORDER BY p.create_time desc
</select>
<select id="getMonthAmountCount" resultType="java.math.BigDecimal">
SELECT sum(amount_received) AS nowMonthAmount FROM pay_payment_record WHERE DATE_FORMAT(payment_date,'%Y-%m') = #{time}
@@ -266,6 +266,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
tbMemberProjectSubitemMapper.updateById(tbMember);
//插入来款记录表
payPaymentRecord.setProjectId(tbMember.getId());
payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE5));
payPaymentRecordMapper.insert(payPaymentRecord);
return Result.OK("添加成功!");
}
@@ -275,7 +277,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
LambdaQueryWrapper<PayPaymentRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayPaymentRecord::getProjectId, payPaymentRecord.getProjectId());
wrapper.eq(PayPaymentRecord::getProjectType, PayIncomeContractCommon.PROJECT_TYPE5);
wrapper.eq(PayPaymentRecord::getProjectType, Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE5));
List<PayPaymentRecord> type5List = payPaymentRecordMapper.selectList(wrapper);
if(type5List!=null && type5List.size()>0){