pageCount

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

@@ -93,6 +93,10 @@ public class ConstructionSchedule implements  DataModel{
     /**合同概要*/
     @JSONField(name = "key_24",label="合同概要-ZJ",ordinal = 106)
     private String contractSummary;
+    @JSONField(name = "key_69",label="共N页" ,ordinal = 101)
+    private String pageTotal;
+    @JSONField(name = "key_68",label="第N页" ,ordinal = 101)
+    private String pageIndex;
 
 
     public ConstructionSchedule(String itemName) {

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

@@ -67,5 +67,9 @@ public class InterimMeter implements  DataModel{
     /**第n页 共m页*/
     @JSONField(name = "key_15",label="页码" ,format="共$2，第$1页",ordinal = 101)
     private String pageCount;
+    @JSONField(name = "key_69",label="共N页" ,ordinal = 101)
+    private String pageTotal;
+    @JSONField(name = "key_68",label="第N页" ,ordinal = 101)
+    private String pageIndex;
 
 }

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

@@ -32,7 +32,10 @@ public class InterimMeterPaySummary implements  DataModel{
     /**第n页 共m页*/
     @JSONField(name = "key_12",label="页码",format="$2页，第$1页",ordinal = 101)
     private String pageCount;
-
+    @JSONField(name = "key_69",label="共N页" ,ordinal = 101)
+    private String pageTotal;
+    @JSONField(name = "key_68",label="第N页" ,ordinal = 101)
+    private String pageIndex;
     public InterimMeterPaySummary(String itemName) {
         this.itemName = itemName;
     }

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

@@ -50,5 +50,9 @@ public class MaterialPriceDifferential implements  DataModel{
     private String sum;
     @JSONField(name = "key_13",label="页码",format="$2页，第$1页",ordinal = 101)
     private String pageCount;
+    @JSONField(name = "key_69",label="共N页" ,ordinal = 101)
+    private String pageTotal;
+    @JSONField(name = "key_68",label="第N页" ,ordinal = 101)
+    private String pageIndex;
 
 }

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

@@ -53,4 +53,8 @@ public class MaterialWithheld {
     private String curPeriodBackEi;
     @JSONField(name = "key_15",label="页码",ordinal = 101)
     private String pageCount;
+    @JSONField(name = "key_69",label="共N页" ,ordinal = 101)
+    private String pageTotal;
+    @JSONField(name = "key_68",label="第N页" ,ordinal = 101)
+    private String pageIndex;
 }

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

@@ -66,7 +66,10 @@ public class SubInterimMeterPaySummary implements  DataModel{
     /*分项工程名称*/
     @JSONField(name = "key_13",label="分项工程名称",ordinal = 102)
     private String subProjectName;
-
+    @JSONField(name = "key_69",label="共N页" ,ordinal = 101)
+    private String pageTotal;
+    @JSONField(name = "key_68",label="第N页" ,ordinal = 101)
+    private String pageIndex;
 
     public void currentPeriodEndPayAdd(String n){
           List<String> list = new ArrayList<>();

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

@@ -76,6 +76,10 @@ public class SubprojectInterimPaymentSummary  implements  DataModel{
     /**章名称*/
     @JSONField(name = "key_16",label="清单号-ZJ",ordinal = 102)
     private String chapterName;
+    @JSONField(name = "key_69",label="共N页" ,ordinal = 101)
+    private String pageTotal;
+    @JSONField(name = "key_68",label="第N页" ,ordinal = 101)
+    private String pageIndex;
 /*    @JSONField(name = "key_18",label="累计完成占合同%-ZJ",ordinal = 15)
     private String ratio;*/
 

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

@@ -33,6 +33,10 @@ public class SupervisionCertificate implements  DataModel{
     private String currentAmount;
     @JSONField(name = "key_9",label="本期完成比例",ordinal = 1)
     private String currentRatio;
+    @JSONField(name = "key_69",label="共N页" ,ordinal = 101)
+    private String pageTotal;
+    @JSONField(name = "key_68",label="第N页" ,ordinal = 101)
+    private String pageIndex;
     private String itemName;
     /**是否是汇总小结数据，输出的时候显示，计算的时候不参与*/
     private Boolean isSummary=false;

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -403,6 +403,12 @@ public class FormulaUtils {
     public static String getPageCode(Class<?> clazz){
         return getEleKey(clazz,"pageCount");
     }
+    public static String getPageTotal(Class<?> clazz){
+        return getEleKey(clazz,"pageTotal");
+    }
+    public static String getPageIndex(Class<?> clazz){
+        return getEleKey(clazz,"pageIndex");
+    }
 
     public static JSONField getPageFormat(Class<?> clazz){
         return getJSONField(clazz,"pageCount");

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

@@ -1530,6 +1530,8 @@ public class ExecutorMeter extends FormulaExecutor {
         /*页码计算*/
         public void pageNumber(Class<T> clazz){
             FormData pageFd = fdm.get(FormulaUtils.getPageCode(clazz));
+            FormData pageTotal = fdm.get(FormulaUtils.getPageTotal(clazz));
+            FormData pageIndex = fdm.get(FormulaUtils.getPageIndex(clazz));
             if(pageFd!=null) {
                 int total = totalPage();
                 JSONField jf =FormulaUtils.getPageFormat(clazz);
@@ -1539,6 +1541,12 @@ public class ExecutorMeter extends FormulaExecutor {
                 }else{
                     pageTmp = "第$1页 共" + total + "页";
                 }
+                if(pageTotal!=null){
+                    pageTotal.setValues(IntStream.rangeClosed(1, total).boxed().map(i -> new ElementData(total)).collect(Collectors.toList()));
+                }
+                if(pageIndex!=null){
+                    pageIndex.setValues(IntStream.rangeClosed(1, total).boxed().map(ElementData::new).collect(Collectors.toList()));
+                }
                 pageFd.setValues(IntStream.rangeClosed(1, total).boxed().map(i -> new ElementData(pageTmp.replace("$1", i.toString()))).collect(Collectors.toList()));
             }
         }

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

@@ -205,7 +205,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<String, List<InterimPayCertificateItem>> getInterimPayCertificateItemFc() {
         return  certificateIds->{
-            String sql="select * from s_interim_pay_certificate_item where certificate_id in ("+certificateIds+")";
+            String sql="select * from s_interim_pay_certificate_item where certificate_id in ("+certificateIds+") order by sort";
             return getEntityList(sql,InterimPayCertificateItem.class);
         };
     }