|
@@ -474,7 +474,7 @@ public class AspSafetyDrillProgrammeServiceImpl extends ServiceImpl<AspSafetyDri
|
|
builder.insertCell();
|
|
builder.insertCell();
|
|
builder.getCellFormat().setVerticalMerge(CellMerge.FIRST);
|
|
builder.getCellFormat().setVerticalMerge(CellMerge.FIRST);
|
|
for (AspSafetyOnsiteDisposalPlan item2 : onsiteDisposalPlanList) {
|
|
for (AspSafetyOnsiteDisposalPlan item2 : onsiteDisposalPlanList) {
|
|
- String word = item2.getTreatment() + " " + item2.getNo();
|
|
|
|
|
|
+ String word = item2.getNo() + "、" + item2.getTreatment();
|
|
builder.writeln(word);
|
|
builder.writeln(word);
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|