中期计量

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

@@ -241,7 +241,7 @@ public class FunctionMain {
         System.out.println(dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
     }
 
-    public static void mainT(String[] args) {
+    public static void main(String[] args) {
         getToken();
     }
 

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

@@ -24,6 +24,8 @@ public class MeterPeriodInfo implements  DataModel{
      */
     @JSONField(name = "key_2",label="计量期名称",ordinal = 2)
     private String periodName;
+    @JSONField(name = "key_16",label="支付期编号",ordinal = 2)
+    private String payNumber;
     /**
      * 报表打印日期
      */

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

@@ -60,7 +60,7 @@ public class ExecutorFormat extends FormulaExecutor {
                     ElementData ea=la.get(i);
                     ElementData eb=lb.get(i);
                     String a= ea.stringValue();
-                    if(a!=null&&!a.matches("^\\d+.+")){
+                    if(a!=null&&!a.matches("^\\d+.+")||StringUtils.isEquals(eb.stringValue(),"暂定金额")){
                         return  ea.getIndex()+"@"+ea.getX()+"@"+ea.getY()+"@"+(eb.getX()+1)+"@"+eb.getY();
                     }
                     return StringPool.EMPTY;

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

@@ -730,6 +730,8 @@ public class ExecutorMeter extends FormulaExecutor {
                  });
                  if(payItemZj.size()>0){
                      dataList.stream().filter(t->t.getFormName()!=null&&t.getFormName().contains("暂定金")).findFirst().ifPresent(t->{
+                              t.setFormName("暂定金额");
+                              t.setChapterSeq("");
                               t.setCurrentPeriodPay("");
                               t.setCurrentPeriodEndPay("");
                               t.setPreviousPeriodEndPay("");
@@ -1410,7 +1412,7 @@ public class ExecutorMeter extends FormulaExecutor {
     @Data
     @EqualsAndHashCode(callSuper = true)
     public class IMeterPaySummary extends BaseSpecial<InterimMeterPaySummary> implements Special{
-        /*private Integer capacity=20;*/
+        /*中间计量支付汇总表*/
         @Override
         public boolean ready() {
             return current.size()>0;
@@ -1428,16 +1430,15 @@ public class ExecutorMeter extends FormulaExecutor {
                 dataList.add(imps);
             }
             if(dataList.size()>0){
+                int add= capacity-dataList.size()%capacity-1;
+                for(int i=0;i<add;i++){
+                    dataList.add(new InterimMeterPaySummary());
+                }
                 InterimMeterPaySummary summary = new InterimMeterPaySummary("合计");
                 double sum=dataList.stream().map(InterimMeterPaySummary::getMoney).filter(StringUtils::isNumber).mapToDouble(Double::parseDouble).sum();
                 summary.setMoney(StringUtils.number2StringZero(sum,tec.getScale()));
                 dataList.add(summary);
-                /*计量汇总表数量（浙江）*/
-       /*         FormulaUtils.elementFindByCode(tec.getFormDataMap(),MeterPeriodInfo.TBN+":key_10").ifPresent(fd->{
-                    elementWriter.write(fd,BaseUtils.sliceNumber(dataList.size(),capacity));
-                });*/
                 tec.periodInfo.setSummaryNumber(String.valueOf(BaseUtils.sliceNumber(dataList.size(),capacity)));
-
             }
             putOut(InterimMeterPaySummary.class);
         }

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

@@ -122,7 +122,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<MeterPeriodInfo>> getInterimMeterPeriodAllFc() {
           return contractId->{
-            String sql="select a.id, a.period_number periodNumber,a.sort ,b.print_date formPrintDate ,b.pay_money curTotal,b.id reportId,b.start_date,b.end_date  from  s_contract_meter_period a join s_interim_pay_certificate b on a.id=b.contract_period_id where a.is_deleted=0 and  b.is_deleted=0 and b.contract_id="+contractId+" order by a.sort";
+            String sql="select a.id,a.pay_number, a.period_number periodNumber,a.sort ,b.print_date formPrintDate ,b.pay_money curTotal,b.id reportId,b.start_date,b.end_date  from  s_contract_meter_period a join s_interim_pay_certificate b on a.id=b.contract_period_id where a.is_deleted=0 and  b.is_deleted=0 and b.contract_id="+contractId+" order by a.sort";
             return   getEntityList(sql,MeterPeriodInfo.class);
         };
     }