模型数据

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

@@ -66,6 +66,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;
     /**排序号*/
     private Integer sort;
     /**计量期ID*/

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -279,7 +279,7 @@ public class WbsTreeController extends BladeController {
         List<WbsFormElementVO> wbsFormElements = null;
         if (StringUtils.isNotEmpty(id)) {
             if(isModel(id)){
-                wbsFormElements= this.dataModel(id);
+                wbsFormElements= dataModel(id);
             }else{
                 wbsFormElements = wbsTreeService.selectFormElements4Formula(id);
             }
@@ -295,53 +295,23 @@ public class WbsTreeController extends BladeController {
     }
 
     public  boolean isModel(String id){
-         /*   Set<String> set = new HashSet<>();
-          set.add(BaseInfo.ID);
-         set.add(MeterPeriodInfo.ID);
-         set.add(AdvancePaymentCertificate.ID);
-         set.add(MaterialAdvancePayment.ID);
-         set.add(InterimPaymentCertificate.ID);
-         set.add(InterimPaymentSummary.ID);
-         set.add(SubprojectInterimPaymentSummary.ID);
-         set.add(ConstructionSchedule.ID);
-         set.add(SubInterimMeterPaySummary.ID);
-         set.add(InterimMeterPaySummary.ID);
-         set.add(InterimMeter.ID);
-         set.add(MaterialPriceDifferential.ID);
-         set.add(MaterialsArrival.ID);*/
          return DataModel.containsKey(id);
      };
 
-/*   public final static Map<String,List<WbsFormElementVO>> MODEL_MAP ;
-    static {
-        MODEL_MAP.put(BaseInfo.ID,FormulaUtils.toElementVos(BaseInfo.class));
-        MODEL_MAP.put(MeterPeriodInfo.ID,FormulaUtils.toElementVos(MeterPeriodInfo.class));
-        MODEL_MAP.put(AdvancePaymentCertificate.ID,FormulaUtils.toElementVos(AdvancePaymentCertificate.class));
-        MODEL_MAP.put(MaterialAdvancePayment.ID,FormulaUtils.toElementVos(MaterialAdvancePayment.class));
-        MODEL_MAP.put(InterimPaymentCertificate.ID,FormulaUtils.toElementVos(InterimPaymentCertificate.class));
-        MODEL_MAP.put(InterimPaymentSummary.ID,FormulaUtils.toElementVos(InterimPaymentSummary.class));
-        MODEL_MAP.put(SubprojectInterimPaymentSummary.ID,FormulaUtils.toElementVos(SubprojectInterimPaymentSummary.class));
-        MODEL_MAP.put(ConstructionSchedule.ID,FormulaUtils.toElementVos(ConstructionSchedule.class));
-        MODEL_MAP.put(SubInterimMeterPaySummary.ID,FormulaUtils.toElementVos(SubInterimMeterPaySummary.class));
-        MODEL_MAP.put(InterimMeterPaySummary.ID,FormulaUtils.toElementVos(InterimMeterPaySummary.class));
-        MODEL_MAP.put(InterimMeter.ID,FormulaUtils.toElementVos(InterimMeter.class));
-        MODEL_MAP.put(MaterialPriceDifferential.ID,FormulaUtils.toElementVos(MaterialPriceDifferential.class));
-        MODEL_MAP.put(MaterialsArrival.ID,FormulaUtils.toElementVos(MaterialsArrival.class));
-        MODEL_MAP=DataModel.getElements();
-    }*/
+
 
     public List<WbsFormElementVO> dataModel(String id){
           return DataModel.getElements(id);
     }
 
     @GetMapping("/test5")
-    public R test(Integer type) {
+    public R test(Integer type,String id) {
         if(type==1){
-            return    R.data(DataModel.getTreeNodeList());
+            return R.data(DataModel.getTreeNodeList());
         }else if(type==2){
             return R.data(DataModel.findClassesByInterface(DataModel.PATH, DataModel.class));
         }else if(type==3){
-            return R.data(!DataModel.once);
+            return R.data(DataModel.once);
         }else if(type==5){
             return R.data(SystemUtils.getOsName());
         }else if(type==6){
@@ -361,6 +331,12 @@ public class WbsTreeController extends BladeController {
                 e.printStackTrace();
             }
               return R.data(url);
+        }else if(type==7){
+             return R.data(DataModel.getTableElementsMap());
+        }else if(type==8){
+            return R.data( DataModel.getElements(id));
+        }else if(type==9){
+            return R.data( DataModel.tableElementMap.isEmpty());
         }else {
             return R.data(DataModel.classes.size()==0);
         }

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

@@ -95,7 +95,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.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.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");