计量系统万盛系统专用

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -2267,9 +2267,10 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
      *中间计量支付证书获取PDFurl
      */
     private ReportResult getIntermediateMeasurementPaymentCertificatePDF(String url3, Long contractId, Long periodId, List<ContractMeterPeriod> list) {
-        //判断当前是否是只有1期计量
+        //判断当前是否是第一期
         Boolean isOnePeriod = false;
-        if(list.size() ==1 ){
+        ContractMeterPeriod contractMeterPeriod = list.get(0);
+        if(contractMeterPeriod.getId().equals(periodId)){
             isOnePeriod = true;
         }
         //获取本期计量期
@@ -2411,7 +2412,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     private ReportResult getSubsidyApplicationPaymentReviewPDF(String url2, Long contractId, Long periodId, List<ContractMeterPeriod> list) {
         //判断当前是否是只有1期计量
         Boolean isOnePeriod = false;
-        if(list.size() ==1 ){
+        ContractMeterPeriod contractMeterPeriod = list.get(0);
+        if(contractMeterPeriod.getId().equals(periodId)){
             isOnePeriod = true;
         }
         //获取本期计量期
@@ -2646,7 +2648,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     public ReportResult  getIntermediatePaymentPDF(String url,Long contractId,Long periodId,List<ContractMeterPeriod> list,Long redisId) {
         //判断当前是否是只有1期计量
         Boolean isOnePeriod = false;
-        if(list.size() ==1 ){
+        ContractMeterPeriod contractMeterPeriod1 = list.get(0);
+        if(contractMeterPeriod1.getId().equals(periodId)){
             isOnePeriod = true;
         }
         //获取本期计量期