监理开工预付款

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

@@ -8,7 +8,8 @@ public enum MeterType {
     /**开工预付款*/
     START(2,"动员预付款报表"),
     /***/
-    INTERIM_JL(3,"监理计量报表");
+    INTERIM_JL(3,"监理计量报表"),
+    START_JL(5,"监理动员预付款报表");
     private final int index;
     private final String name;
     MeterType(int index, String name) {
@@ -23,8 +24,8 @@ public enum MeterType {
     }
     public static MeterType getByIndex(int index,int contractType) {
         MeterType[] values = MeterType.values();
-        if(contractType==2&&index==0){
-            index=3;
+        if(contractType==2&&(index==0||index==2)){
+            index*=2;
         }
         if (index >= 0 && index < values.length) {
             return values[index];

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

@@ -77,7 +77,7 @@ public class ExecutorInit extends FormulaExecutor {
         //dataModel2FormData(baseInfo);
     }
     private MeterPeriodInfo addPeriodInfo(){
-        if(MeterType.MATERIAL.equals(tec.getMeterType())||MeterType.START.equals(tec.getMeterType())){
+        if(MeterType.MATERIAL.equals(tec.getMeterType())||MeterType.START.equals(tec.getMeterType())||MeterType.START_JL.equals(tec.getMeterType())){
             /*加载计量期信息*/
             tec.periodInfo=meterPeriodFc.apply(tec.getReportId());
             /*加载合同材料、材料清单*/

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

@@ -210,7 +210,7 @@ public class ExecutorMeter extends FormulaExecutor {
         }else if(MeterType.INTERIM_JL.equals(tec.getMeterType())){
             /*监理*/
             this.specialList.add(new SupervisionCertificateSp());
-        }else if(MeterType.START.equals(tec.getMeterType())){
+        }else if(MeterType.START.equals(tec.getMeterType())||MeterType.START_JL.equals(tec.getMeterType())){
             /*开工预付款支付证书处理*/
             this.specialList.add(new StayPayCalc());
             /*动员预付款-中期支付证书*/