Commit 6339e40f authored by 赵啸非's avatar 赵啸非

重构部分功能模块

parent eefea3e0
Pipeline #2352 failed with stages
package com.mortals.xhx.common.pdu;
import lombok.Data;
@Data
public class Col {
private String col;
}
...@@ -33,6 +33,7 @@ import com.mortals.xhx.common.code.YesNoEnum; ...@@ -33,6 +33,7 @@ import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.formdesign.*; import com.mortals.xhx.common.formdesign.*;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.key.ParamKey; import com.mortals.xhx.common.key.ParamKey;
import com.mortals.xhx.common.pdu.Col;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons; import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
import com.mortals.xhx.common.utils.ExportDocUtil; import com.mortals.xhx.common.utils.ExportDocUtil;
import com.mortals.xhx.common.utils.WordUtil; import com.mortals.xhx.common.utils.WordUtil;
...@@ -346,14 +347,19 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -346,14 +347,19 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
} }
} }
//StrUtil //StrUtil
List<Map<String, String>> colList = valueList.stream().map(item -> { List<Col> colList = valueList.stream().map(item -> {
Col col = new Col();
col.setCol(item);
return col;
/*
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
String colName = "col"; String colName = "col";
if (keys.size() > 3) { if (keys.size() > 4) {
colName = keys.get(4); colName = keys.get(4);
} }
map.put(colName, item); map.put(colName, item);
return map; return map;*/
}).collect(Collectors.toList()); }).collect(Collectors.toList());
builder.bind(entry.getKey(), new LoopColumnTableRenderPolicy()); builder.bind(entry.getKey(), new LoopColumnTableRenderPolicy());
data.put(entry.getKey(), colList); data.put(entry.getKey(), colList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment