计量相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/InterimPaymentSummary.java

@@ -49,7 +49,7 @@ public class InterimPaymentSummary {
     @JSONField(name = "key_9",label="备注",ordinal = 9)
     private String remark;
     /**至上前累计批准支付金额*/
-    @JSONField(name = "key_10",label="",ordinal = 4)
+    @JSONField(name = "key_10",label="至上前累计批准支付金额",ordinal = 4)
     private String previousPay;
     /**是否是汇总小结数据，输出的时候显示，计算的时候不参与*/
     private Boolean summary=false;

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

@@ -392,17 +392,6 @@ public class ExecutorMeter extends FormulaExecutor {
                  FormData constructFd =tec.formDataMap.get(InterimPaymentCertificate.TBN+ StringPool.COLON+"key_11");
                  put2FormData(constructFd,StringUtils.number2String(total*0.75,2));
              }
-             if(MeterInfo.MB_ZJ.equals(tec.getMeterInfo().getConfig())){
-                 /*浙江*/
-                 Function<Function<InterimPaymentCertificate,String>,Function<List<InterimPaymentCertificate>,List<Object>>> fc=(f)-> dl->dl.stream().map(InterimPaymentCertificate::getCurrentPeriodPay).flatMap(e->{
-                     List<Object> l=IntStream.range(0,5).boxed().map(i->"").collect(Collectors.toList());
-                     l.set(0,e);
-                     return l.stream();
-                 }).collect(Collectors.toList());
-                 fieldDataFcMap.put(InterimPaymentCertificate.TBN+":key_4",fc.apply(InterimPaymentCertificate::getCurrentPeriodPay));
-                 fieldDataFcMap.put(InterimPaymentCertificate.TBN+":key_5",fc.apply(InterimPaymentCertificate::getPreviousPeriodEndPay));
-
-             }
             fieldDataFcMap.put(InterimPaymentCertificate.TBN+ StringPool.COLON+"key_9",(List<InterimPaymentCertificate> list)-> Collections.singletonList(list.stream().map(InterimPaymentCertificate::getCurrentPeriodPay).mapToDouble(BaseUtils::obj2DoubleZero).sum()));
             /*内容输出*/
             putOut();
@@ -468,6 +457,17 @@ public class ExecutorMeter extends FormulaExecutor {
                 summary.setPayRatioA(ratioFc.apply(summary.getCurrentPeriodEndPay(),summary.getContractAmount()));
                 summary.setPayRatioB(ratioFc.apply(summary.getCurrentPeriodEndPay(),summary.getRevisedAmount()));
                 dataList.add(summary);
+
+                if(MeterInfo.MB_ZJ.equals(tec.getMeterInfo().getConfig())){
+                    /*浙江*/
+                    Function<Function<InterimPaymentSummary,String>,Function<List<InterimPaymentSummary>,List<Object>>> fc=(f)-> dl->dl.stream().map(f).flatMap(e->{
+                        List<Object> l=IntStream.range(0,5).boxed().map(i->"").collect(Collectors.toList());
+                        l.set(0,e);
+                        return l.stream();
+                    }).collect(Collectors.toList());
+                    fieldDataFcMap.put(InterimPaymentSummary.TBN+":key_11",fc.apply(InterimPaymentSummary::getPreviousPeriodEndPay));
+                    fieldDataFcMap.put(InterimPaymentSummary.TBN+":key_6",fc.apply(InterimPaymentSummary::getCurrentPeriodEndPay));
+                }
                 /*内容输出*/
                 putOut();
             }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -2823,7 +2823,7 @@ public class TaskController extends BladeController {
                                 sheet.getPrintSetup().setPaperSize(PrintSetup.A4_PAPERSIZE);
                                 ByteArrayOutputStream out = new ByteArrayOutputStream();
                                 workbook.write(out);
-                                workbook.write(new FileOutputStream(rs.getExcelPath()));
+                                //workbook.write(new FileOutputStream(rs.getExcelPath()));
                                 com.aspose.cells.Workbook wb = new com.aspose.cells.Workbook(new ByteArrayInputStream(out.toByteArray()));
                                 out.reset();
                                 wb.save(out, SaveFormat.PDF);