G8 G10去空

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

@@ -690,6 +690,12 @@ public class ExecutorMeter extends FormulaExecutor {
                             ma.setAmount(e.getMeterAmount());
                             ma.setTotal(e.getAdvancePayment());
                             ma.setSource(e.getSource());
+                            /*发票*/
+                            ma.setInvoice(e.getStoragePlace());
+                            /*质保书编号*/
+                            ma.setWarrantyNumber(e.getStorageStatus());
+                            /*抽检报告单号*/
+                            ma.setSsr(e.getCertificate());
                             return ma;
                         }
                 ).collect(Collectors.toList()));

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

@@ -10,13 +10,13 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.dto.ElementData;
 import org.springblade.manager.dto.FormData;
 import org.springblade.manager.entity.Formula;
-import org.springblade.manager.formula.FormulaLog;
-import org.springblade.manager.formula.FormulaStrategy;
-import org.springblade.manager.formula.KeyMapper;
-import org.springblade.manager.formula.Mileage;
+import org.springblade.manager.formula.*;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -125,9 +125,10 @@ public class FormulaMileage implements FormulaStrategy {
     public void forG10(List<Mileage> data, TableElementConverter tec) {
         if (Func.isNotEmpty(data)) {
             Map<String, Object> g10 = (Map<String, Object>) tec.getConstantMap().computeIfAbsent("G10", k -> new HashMap<>());
-            g10.put("dx", data.stream().map(Mileage::getDs).collect(Collectors.toList()));
-            g10.put("dxnv", data.stream().filter(e -> !e.getVertical()).map(Mileage::getDs).collect(Collectors.toList()));
-            g10.put("dxv", data.stream().filter(Mileage::getVertical).map(Mileage::getDs).collect(Collectors.toList()));
+            BiFunction<Predicate<Mileage>, Function<Mileage,Object>,List<Object>> dataFc= (predicate, field)-> data.stream().filter(predicate).map(field).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
+            g10.put("dx", dataFc.apply(e->true,Mileage::getDs));
+            g10.put("dxnv", dataFc.apply(e -> !e.getVertical(),Mileage::getDs));
+            g10.put("dxv", dataFc.apply(Mileage::getVertical,Mileage::getDs));
         }
     }
 

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

@@ -224,16 +224,16 @@ public class FormulaTurnPoint implements FormulaStrategy {
 
         g8.put("dx", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()),tp -> CustomFunction.xN(tp.getDx(), 1000)));
         g8.put("dxv", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()) && e.getVertical(),tp -> CustomFunction.xN(tp.getDx(), 1000)));
-        g8.put("dxnv", data.stream().filter(e -> TurnPoint.CE.equals(e.getType()) && !e.getVertical()).map(tp -> CustomFunction.xN(tp.getDx(), 1000)).collect(Collectors.toList()));
-        g8.put("sc", data.stream().filter(e -> TurnPoint.CE.equals(e.getType())).map(TurnPoint::getSc).collect(Collectors.toList()));
-        g8.put("scv", data.stream().filter(e -> TurnPoint.CE.equals(e.getType()) && e.getVertical()).map(TurnPoint::getSc).collect(Collectors.toList()));
-        g8.put("scnv", data.stream().filter(e -> TurnPoint.CE.equals(e.getType()) && !e.getVertical()).map(TurnPoint::getSc).collect(Collectors.toList()));
-        g8.put("sj", data.stream().filter(e -> TurnPoint.CE.equals(e.getType())).map(TurnPoint::getSj).collect(Collectors.toList()));
-        g8.put("sjv", data.stream().filter(e -> TurnPoint.CE.equals(e.getType()) && e.getVertical()).map(TurnPoint::getSj).collect(Collectors.toList()));
-        g8.put("sjnv", data.stream().filter(e -> TurnPoint.CE.equals(e.getType()) && !e.getVertical()).map(TurnPoint::getSj).collect(Collectors.toList()));
-        g8.put("cd", data.stream().filter(e -> TurnPoint.CE.equals(e.getType())).map(TurnPoint::getName).collect(Collectors.toList()));
-        g8.put("cdv", data.stream().filter(e -> TurnPoint.CE.equals(e.getType()) && e.getVertical()).map(TurnPoint::getName).collect(Collectors.toList()));
-        g8.put("cdnv", data.stream().filter(e -> TurnPoint.CE.equals(e.getType()) && !e.getVertical()).map(TurnPoint::getName).collect(Collectors.toList()));
+        g8.put("dxnv", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()) && !e.getVertical(),tp -> CustomFunction.xN(tp.getDx(), 1000)));
+        g8.put("sc", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()),TurnPoint::getSc));
+        g8.put("scv", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()) && e.getVertical(),TurnPoint::getSc));
+        g8.put("scnv", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()) && !e.getVertical(),TurnPoint::getSc));
+        g8.put("sj", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()),TurnPoint::getSj));
+        g8.put("sjv", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()) && e.getVertical(),TurnPoint::getSj));
+        g8.put("sjnv", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()) && !e.getVertical(),TurnPoint::getSj));
+        g8.put("cd",dataFc.apply(e -> TurnPoint.CE.equals(e.getType()),TurnPoint::getName));
+        g8.put("cdv", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()) && e.getVertical(),TurnPoint::getName));
+        g8.put("cdnv", dataFc.apply(e -> TurnPoint.CE.equals(e.getType()) && !e.getVertical(),TurnPoint::getName));
         List<NodeTable> nodeTableList=tec.getTableAll();
         /*c8.103*/
         c8103(data,nodeTableList, tec);

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

@@ -125,7 +125,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<Material>> getMaterialFormFc() {
         return contractId->{
-            String sql="select a.certificate,a.material_arrive_number,  b.material_name materialName,b.unit,a.price,b.price price_base,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 a.certificate,a.material_arrive_number,  b.material_name materialName,b.unit,a.price,b.price price_base,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 ";
             return  getEntityList(sql,Material.class);
         };
     }