中期计量

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

@@ -751,6 +751,8 @@ public class ExecutorMeter extends FormulaExecutor {
                      RebateIncentiveAdvPay rebateIncentiveAdvPay = new RebateIncentiveAdvPay();
                      payItemZj.stream().filter(t->t.getFormName()!=null&&t.getFormName().contains("小计")).findFirst().ifPresent(t->{
                          rebateIncentiveAdvPay.setSubtotal(t.getCurrentPeriodEndPay());
+
+                         tec.formDataMap.putAll(FormulaUtils.toFormDataMap(rebateIncentiveAdvPay));
                      });
                      dataList.addAll(payItemZj);
                      /*分行合计列，合计的时候需要计入手填部分*/

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

@@ -111,7 +111,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<StartPayForm>> getStayPayFormFc() {
         return  contractId->{
-            String sql="select a.meter_money meterMoney ,b.id meterPeriodId,b.sort periodSort from s_start_pay_meter_form a join s_meter_period b on a.meter_period_id =b.id  where  a.is_deleted =0  and a.approve_status =2 and a.contract_id="+contractId;
+            String sql="select a.meter_money meterMoney ,b.id meterPeriodId,b.sort periodSort from s_start_pay_meter_form a join s_meter_period b on a.meter_period_id =b.id  where  a.is_deleted =0  and a.contract_id="+contractId;
             return getEntityList(sql,StartPayForm.class);
         };
     }
@@ -136,7 +136,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<Payment>> getPaymentListFc() {
         return contractId->{
-            String paySql="select  a.id,a.form_number number,a.form_name name ,a.middle_meter_id,a.current_meter_total completed ,a.current_price price,current_meter_money money,meter_number meterNumber ,contract_meter_id meterId,b.id formId,b.chapter_number chapter, b.contract_money contractMoney,b.change_money,b.unit,contract_total ,change_total,c.sort,c.id periodId from s_inventory_form_apply a join s_contract_inventory_form b on a.contract_form_id=b.id join s_contract_meter_period c on a.contract_period_id=c.id where a.is_deleted=0 and a.approve_status=2 and a.contract_id="+contractId;
+            String paySql="select  a.id,a.form_number number,a.form_name name ,a.middle_meter_id,a.current_meter_total completed ,a.current_price price,current_meter_money money,meter_number meterNumber ,contract_meter_id meterId,b.id formId,b.chapter_number chapter, b.contract_money contractMoney,b.change_money,b.unit,contract_total ,change_total,c.sort,c.id periodId from s_inventory_form_apply a join s_contract_inventory_form b on a.contract_form_id=b.id join s_contract_meter_period c on a.contract_period_id=c.id where a.is_deleted=0  and a.contract_id="+contractId;
             return this.jdbcTemplate.query(paySql,new BeanPropertyRowMapper<>(Payment.class));
         };
     }
@@ -203,7 +203,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     public Function<Long, List<MaterialAdjust>> getMaterialAdjustFc() {
         return  contractId->{
             String sql="select a.adjust_money,a.material_name,b.id periodId,b.sort from s_contract_material_adjust a join  s_contract_meter_period b on a.meter_period_id=  b.id  " +
-                    "where a.contract_id="+contractId+" and a.approve_status=1 and a.is_deleted=0";
+                    "where a.contract_id="+contractId+" and a.is_deleted=0";
             return getEntityList(sql,MaterialAdjust.class);
         };
     }