开工预付款bug

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

@@ -94,7 +94,10 @@ public class MeterPeriodInfo implements  DataModel{
     private Integer periodMonth;
 
     public  Integer getYearMonthInt(){
-        return this.periodYear*100+this.periodMonth;
+        if(periodYear!=null&&periodMonth!=null) {
+            return this.periodYear * 100 + this.periodMonth;
+        }
+        return null;
     }
 
     public String getStartDateStr() {

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

@@ -96,7 +96,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long,MeterPeriodInfo> getMeterPeriodFc(){
         return id-> {
-           List<MeterPeriodInfo> beans = this.jdbcTemplate.query("select b.id,b.period_number periodNumber,b.cover_date,b.period_name periodName,b.pay_number,b.current_amount curTotal,a.print_date formPrintDate ,a.repayment_cause cause from s_material_start_statement a join  s_meter_period b on a.meter_period_id=b.id where a.id="+id, new BeanPropertyRowMapper<>(MeterPeriodInfo.class));
+           List<MeterPeriodInfo> beans = this.jdbcTemplate.query("select b.id,b.period_number periodNumber,b.period_year,b.period_month,b.cover_date,b.period_name periodName,b.pay_number,b.current_amount curTotal,a.print_date formPrintDate ,a.repayment_cause cause from s_material_start_statement a join  s_meter_period b on a.meter_period_id=b.id where a.id="+id, new BeanPropertyRowMapper<>(MeterPeriodInfo.class));
             if(beans.size()>0){
                 MeterPeriodInfo bean = beans.get(0);
                 List<Map<String,Object>> listMap= this.jdbcTemplate.queryForList("select sum(b.current_amount) currentAmount from s_meter_period a join s_meter_period b on (a.contract_id=b.contract_id and a.type=b.type) where a.id="+bean.getId()+" and  a.sort>b.sort");