中间计量表

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

@@ -1,6 +1,7 @@
 package org.springblade.manager.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springblade.common.utils.BaseUtils;
 
@@ -66,8 +67,8 @@ public class MeterPeriodInfo implements  DataModel{
 
     @JSONField(name = "key_11",label="工程计量表数量（浙江）",ordinal = 5)
     private String  meterNumber;
-    @JSONField(name = "key_19",label="封面日期",ordinal = 20)
-    private String  coverDate;
+    @JSONField(name = "key_19",label="封面日期",ordinal = 20 )
+    private LocalDate  coverDate;
     /**排序号*/
     private Integer sort;
     /**计量期ID*/

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

@@ -1973,7 +1973,7 @@ public class ExecutorMeter extends FormulaExecutor {
             builderFormDatas(InterimMeter.class);
             List<MeterApply> meterApplyList=meterApplyFc.apply(tec.getPeriodId());
             paymentGroup = current.stream().collect(Collectors.groupingBy(Payment::getMiddleMeterId));
-            LinkedHashMap<String,List<MeterApply>> meterApplyGroup = meterApplyList.stream().collect(Collectors.groupingBy(e->chapterNumberFc.apply(e,paymentGroup),LinkedHashMap::new,Collectors.toList()));
+            LinkedHashMap<String,List<MeterApply>> meterApplyGroup = meterApplyList.stream().filter(e-> paymentGroup.containsKey(e.getId())).collect(Collectors.groupingBy(e->chapterNumberFc.apply(e,paymentGroup),LinkedHashMap::new,Collectors.toList()));
             /*删除没有计量的章节,返回需要显示的章节*/
             LinkedHashMap<String,NodeTable> table2E16Map= removeNodeTable(meterApplyGroup);
             /*支付号，项目名称，单位，申报数量*/

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

@@ -190,7 +190,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<MeterApply>> getMeterApplyFc() {
         return   MeterPeriodId->{
-            String sql="select a.id,contract_unit_id,contract_period_id,period_number,meter_number,engineer_divide,part_name,certificate_number,meter_money,change_token_number,picture_url,picture_name,a.calculate_formula ,b.contract_picture ,b.start_stake,b.end_stake,b.node_name  from  s_middle_meter_apply a join s_meter_tree_contract b on a.contract_unit_id= b.id where a.contract_period_id="+MeterPeriodId;
+            String sql="select a.id,contract_unit_id,contract_period_id,period_number,meter_number,engineer_divide,part_name,certificate_number,meter_money,change_token_number,picture_url,picture_name,a.calculate_formula ,b.contract_picture ,b.start_stake,b.end_stake,b.node_name  from  s_middle_meter_apply a join s_meter_tree_contract b on a.contract_unit_id= b.id where  a.is_deleted=0  and a.contract_period_id="+MeterPeriodId;
             return getEntityList(sql,MeterApply.class);
         };
     }