动员预付款总额

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

@@ -659,8 +659,10 @@ public class ExecutorMeter extends FormulaExecutor {
             dataList.add(new InterimPaymentCertificate("违约罚金", MINUS_ONE));
             dataList.add(new InterimPaymentCertificate("迟付款利息"));
             InterimPaymentCertificate dyyfk = new InterimPaymentCertificate("动员预付款");
+            dyyfk.setContractAmount(BaseUtils.str2BigDecimal(tec.meterInfo.getBaseInfo().getDyTotalAmount()).toPlainString());
             dyyfk.setCurrentPeriodPay(currentStart);
             dyyfk.setCurrentPeriodEndPay(sumStart);
+            dyyfk.setPreviousPeriodEndPay(subtractFc.apply(sumStart,currentStart));
             dataList.add(dyyfk);
             dataList.add(new InterimPaymentCertificate("扣回动员预付款"));
             dataList.add(new InterimPaymentCertificate("材料设备垫付款"));
@@ -668,7 +670,7 @@ public class ExecutorMeter extends FormulaExecutor {
             dataList.add(new InterimPaymentCertificate("保留金"));
             InterimPaymentCertificate sjzf = new InterimPaymentCertificate("实际支付");
             addGetSetConfig(sjzf, summaryConfigMap, InterimPaymentCertificate::getCurrentPeriodEndPay, sjzf::setCurrentPeriodEndPay);
-            /*addGetSetConfig(sjzf, summaryConfigMap, InterimPaymentCertificate::getPreviousPeriodEndPay, sjzf::setPreviousPeriodEndPay);*/
+            addGetSetConfig(sjzf, summaryConfigMap, InterimPaymentCertificate::getPreviousPeriodEndPay, sjzf::setPreviousPeriodEndPay);
             addGetSetConfig(sjzf, summaryConfigMap, InterimPaymentCertificate::getCurrentPeriodPay, sjzf::setCurrentPeriodPay);
             dataList.add(sjzf);
             /*分行合计列，合计的时候需要计入手填部分*/

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

@@ -3556,20 +3556,11 @@ public class TaskController extends BladeController {
                                 sheet.setPrintGridlines(false);
                                 //设置 整个工作表为一页
                                 sheet.setFitToPage(true);
-                                PrintSetup printSetup = sheet.getPrintSetup();
-                                /*printSetup.setFitHeight((short) 1);
-                                printSetup.setFitWidth((short) 1);*/
-                                // 设置页边距，单位为厘米
-                                // printSetup.setPaperSize(PrintSetup.A3_PAPERSIZE);
                                 ByteArrayOutputStream out = new ByteArrayOutputStream();
                                 workbook.write(out);
                                 workbook.write(new FileOutputStream(rs.getExcelPath()));
                                 com.aspose.cells.Workbook wb = new com.aspose.cells.Workbook(new ByteArrayInputStream(out.toByteArray()));
                                 PageSetup pageSetup = wb.getWorksheets().get(0).getPageSetup();
-                               /* pageSetup.setLeftMargin(0.5);   // 左边距
-                                pageSetup.setRightMargin(0.5);  // 右边距
-                                pageSetup.setTopMargin(1.5);    // 上边距
-                                pageSetup.setBottomMargin(1.5); // 下边距*/
                                 pageSetup.setCenterHorizontally(true);
                                 pageSetup.setCenterVertically(true);
                                 pageSetup.setPaperSize(PrintSetup.A4_PAPERSIZE);