2-6合计 保留金符号

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

@@ -1035,6 +1035,7 @@ public class ExecutorMeter extends FormulaExecutor {
                     /* fieldSetImmediately(hj,InterimPaymentCertificate::getCurrentPeriodEndPay,hj::setCurrentPeriodEndPay,x->!x.getIsSummary(),InterimPaymentCertificate::getInvertState);
                      fieldSetImmediately(hj,InterimPaymentCertificate::getPreviousPeriodEndPay,hj::setPreviousPeriodEndPay,x->!x.getIsSummary(),InterimPaymentCertificate::getInvertState);
                      fieldSetImmediately(hj,InterimPaymentCertificate::getCurrentPeriodPay,hj::setCurrentPeriodPay,x->!x.getIsSummary(),InterimPaymentCertificate::getInvertState);*/
+                     addGetSetConfig(hj,InterimPaymentCertificate::getContractAmount,hj::setContractAmount);
                      addGetSetConfig(hj,InterimPaymentCertificate::getCurrentPeriodEndPay,hj::setCurrentPeriodEndPay);
                      addGetSetConfig(hj,InterimPaymentCertificate::getPreviousPeriodEndPay,hj::setPreviousPeriodEndPay);
                      addGetSetConfig(hj,InterimPaymentCertificate::getCurrentPeriodPay,hj::setCurrentPeriodPay);
@@ -1191,18 +1192,18 @@ public class ExecutorMeter extends FormulaExecutor {
                      /*分行合计列，合计的时候需要计入手填部分*/
                      fieldGetSet(x->!x.getIsSummary(),InterimPaymentCertificate::getInvertState);
                      InterimPaymentCertificate finalBlj = blj;
-                     dataList.stream().filter(e->e.getChapterSeq().equals("合计")).findFirst().ifPresent(t->{
-                         finalBlj.setCurrentPeriodPay("-"+multiFc.apply(t.getCurrentPeriodPay(),"0.1"));
+                     dataList.stream().filter(e-> "合计".equals(e.getChapterSeq())).findFirst().ifPresent(t->{
+                         finalBlj.setCurrentPeriodPay(multiFc.apply(t.getCurrentPeriodPay(),"0.1"));
                          if(BaseUtils.obj2DoubleZero(t.getPreviousPeriodEndPay())>0) {
-                             finalBlj.setPreviousPeriodEndPay("-" + multiFc.apply(t.getPreviousPeriodEndPay(), "0.1"));
+                             finalBlj.setPreviousPeriodEndPay(multiFc.apply(t.getPreviousPeriodEndPay(), "0.1"));
                          }
-                         finalBlj.setCurrentPeriodEndPay("-"+multiFc.apply(t.getCurrentPeriodEndPay(),"0.1"));
-                         dataList.stream().filter(e->e.getChapterSeq().equals("实际支付")).findFirst().ifPresent(w->{
-                             w.setCurrentPeriodPay(addFc.apply(w.getCurrentPeriodPay(),finalBlj.getCurrentPeriodPay()));
+                         finalBlj.setCurrentPeriodEndPay(multiFc.apply(t.getCurrentPeriodEndPay(),"0.1"));
+                         dataList.stream().filter(e-> "实际支付".equals(e.getChapterSeq())).findFirst().ifPresent(w->{
+                             w.setCurrentPeriodPay(subtractFc.apply(w.getCurrentPeriodPay(),finalBlj.getCurrentPeriodPay()));
                              if(BaseUtils.obj2DoubleZero(t.getPreviousPeriodEndPay())>0) {
-                                 w.setPreviousPeriodEndPay(addFc.apply(w.getPreviousPeriodEndPay(), finalBlj.getPreviousPeriodEndPay()));
+                                 w.setPreviousPeriodEndPay(subtractFc.apply(w.getPreviousPeriodEndPay(), finalBlj.getPreviousPeriodEndPay()));
                              }
-                             w.setCurrentPeriodEndPay(addFc.apply(w.getCurrentPeriodEndPay(),finalBlj.getCurrentPeriodEndPay()));
+                             w.setCurrentPeriodEndPay(subtractFc.apply(w.getCurrentPeriodEndPay(),finalBlj.getCurrentPeriodEndPay()));
                          });
                      });
                      if(peerMap.size()>0) {