中间评定表

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

@@ -507,6 +507,13 @@ public class ExecutorMeter extends FormulaExecutor {
                     ));
         }
 
+        public SubprojectInterimPaymentSummary createSis(Summary sum){
+            SubprojectInterimPaymentSummary sis = new SubprojectInterimPaymentSummary();
+            sis.setFormNumber(sum.getFormNumber());
+            sis.setItemName(sum.getItemName());
+            sis.setUnit(sum.getUnit());
+            return sis;
+        }
        /*分项工程中期支付汇总表*/
         @Override
         public void parse() {

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

@@ -83,7 +83,7 @@ public class FormulaDaoImpl implements IFormulaDao {
             return  getEntityList(sql,Material.class);
         };*/
         return contractId->{
-            String sql="select  b.material_name materialName,b.unit,b.price,a.meter_amount meterAmount,meter_money sum,a.material_source source,material_conform  materialConform,a.storage_place storagePlace,a.storage_status storageStatus,a.storage_conform storageConform,a.remark,c.sort,c.id period_id from s_material_meter_form a left join s_contract_material b on a.contract_material_id = b.id join s_meter_period c  on a.meter_period_id=c.id where a.contract_id="+contractId+"  and a.is_deleted=0 and  a.approve_status=2";
+            String sql="select  b.material_name materialName,b.unit,a.price,a.meter_amount meterAmount,meter_money sum,a.material_source source,material_conform  materialConform,a.storage_place storagePlace,a.storage_status storageStatus,a.storage_conform storageConform,a.remark,c.sort,c.id period_id from s_material_meter_form a left join s_contract_material b on a.contract_material_id = b.id join s_meter_period c  on a.meter_period_id=c.id where a.contract_id="+contractId+"  and a.is_deleted=0 and  a.approve_status=2";
             return  getEntityList(sql,Material.class);
         };
     }