数据统计-电梯，收款

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/PaymentDataModel.java

@@ -50,5 +50,5 @@ public class PaymentDataModel extends BaseDataModel{
     /**
      * 合同金额
      */
-    private BigDecimal contractAmount;
+    private BigDecimal contractMoney;
 }

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/response/ProjectPaymentResponse.java

@@ -17,7 +17,7 @@ public class ProjectPaymentResponse {
     /**
      * 合同金额
      */
-    private Double contractAmount;
+    private Double contractMoney;
 
     /**
      * 超期时长

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/PaymentDataService.java

@@ -73,6 +73,12 @@ public class PaymentDataService {
                         .filter(a -> a.getPlanDate().isBefore(paymentDataRequest.getEndDate()))
                         .collect(Collectors.toList());
             }
+            //通过合同类型过滤
+            if(paymentDataRequest.getPaymentType() != null){
+                paymentDataModelList = paymentDataModelList.stream()
+                        .filter(a -> a.getPaymentType() == paymentDataRequest.getPaymentType())
+                        .collect(Collectors.toList());
+            }
         }
         return paymentDataModelList;
     }
@@ -177,6 +183,10 @@ public class PaymentDataService {
                     }
                     Duration duration = Duration.between(afterDate, paymentDataModel.getPlanDate());
                     projectPaymentResponse.setDueToDays(duration.toDays());
+                    //合同金额
+                    double contractMoney = paymentDataModel.getContractMoney() != null
+                            ? paymentDataModel.getContractMoney().doubleValue() : 0d;
+                    projectPaymentResponse.setContractMoney(contractMoney);
                 }
             });
             //通过超期款倒序

lift-batch-service/src/main/resources/mapper/PaymentData.xml

@@ -5,6 +5,29 @@
     <!-- 获取时间段内的收款数据 -->
     <select id="getPaymentDataList" parameterType="cn.com.ty.lift.batch.applet.dao.model.request.CommonRequest"
             resultType="cn.com.ty.lift.batch.applet.dao.model.PaymentDataModel">
-
+           select
+              pay.mt_company_id as mtCompanyId,
+              pay.plan_date as planDate,
+              pay.work_date as workDate,
+              pay.plan_money as planMoney,
+              pay.work_money as workMoney,
+              pro.project_name as projectName,
+              r.area_name as regionName,
+              c.type as paymentType,
+              c.moneys as contractMoney
+           from
+              payment pay
+           left join
+              contracts c
+           on
+              pay.contracts_id = c.id
+           left join
+              project pro
+           on
+              c.project_id = pro.id
+           left join
+              region r
+           on
+              pro.region_id = r.id
     </select>
 </mapper>