|
|
@@ -806,7 +806,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
/*分行合计列，合计的时候需要计入手填部分*/
|
|
|
fieldGetSet(x->!x.getIsSummary(),SupervisionCertificate::getInvertState);
|
|
|
/*占位行*/
|
|
|
- dataList.stream().filter(t->t.getItemName().equals("小计")).findFirst().ifPresent(t->{
|
|
|
+ dataList.stream().filter(t-> "小计".equals(t.getItemName())).findFirst().ifPresent(t->{
|
|
|
int over= capacity-dataList.size();
|
|
|
if(over>0){
|
|
|
int index = dataList.indexOf(t);
|
|
|
@@ -864,10 +864,10 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
},LinkedHashMap::new)).values());*/
|
|
|
LinkedHashMap<String,List<MaterialsArrival>> group= list.stream().collect(Collectors.groupingBy(MaterialsArrival::getName, LinkedHashMap::new,Collectors.toList()));
|
|
|
int rowSize= capacity-1;
|
|
|
- group.forEach((k,v)->{
|
|
|
+ AtomicInteger sn= new AtomicInteger(1);
|
|
|
+ group.forEach((k,v)->{
|
|
|
List<List<MaterialsArrival>> pages=BaseUtils.splitList(v,rowSize);
|
|
|
List<MaterialsArrival> tmp = new ArrayList<>();
|
|
|
- AtomicInteger sn= new AtomicInteger(1);
|
|
|
for(int i=0;i<pages.size();i++){
|
|
|
List<MaterialsArrival> data = pages.get(i);
|
|
|
data.forEach(ma->{
|
yangyj