haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

试验管理修改

This commit is contained in:
cwchen 2024-09-04 20:17:11 +08:00
parent facb9fa3e8
commit 77cddf5cd5
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
View File

@ -435,9 +435,15 @@ public class PrimaryDataAppController {
} }
for (int i = 0; i < cellIndexArr.length; i++) { for (int i = 0; i < cellIndexArr.length; i++) {
if (i % 2 == 0) { if (i % 2 == 0) {
sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i])); if(cellIndexArr[i] != cellIndexArr[i]){
sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
}
// sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
} else { } else {
sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i])); if(cellIndexArr[i - 1] + 1 !=cellIndexArr[i]){
sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
}
// sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
} }
} }
sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 0)); sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 0));
@ -516,7 +522,10 @@ public class PrimaryDataAppController {
ConfigItemsVo itemsVo = configItemsVos.get(i); ConfigItemsVo itemsVo = configItemsVos.get(i);
itemsIndex += itemsVo.getExperNum(); itemsIndex += itemsVo.getExperNum();
r6 = setCellValueAndStyle(r6, csItemsIndex, itemsVo.getExperTypeName(), commonStyle); r6 = setCellValueAndStyle(r6, csItemsIndex, itemsVo.getExperTypeName(), commonStyle);
sheet.addMergedRegion(new CellRangeAddress(6, 6, csItemsIndex, itemsIndex)); if(csItemsIndex != itemsIndex){
sheet.addMergedRegion(new CellRangeAddress(6, 6, csItemsIndex, itemsIndex));
}
// sheet.addMergedRegion(new CellRangeAddress(6, 6, csItemsIndex, itemsIndex));
for (int j = csItemsIndex + 1; j < csItemsIndex + itemsVo.getExperNum(); j++) { for (int j = csItemsIndex + 1; j < csItemsIndex + itemsVo.getExperNum(); j++) {
r6 = setCellValueAndStyle(r6, j, "", commonStyle); r6 = setCellValueAndStyle(r6, j, "", commonStyle);
} }
@ -544,9 +553,9 @@ public class PrimaryDataAppController {
r7 = setCellValueAndStyle(r7, 4, "生产日期", commonStyle); r7 = setCellValueAndStyle(r7, 4, "生产日期", commonStyle);
r7 = setCellValueAndStyle(r7, 5, "型号", commonStyle); r7 = setCellValueAndStyle(r7, 5, "型号", commonStyle);
r7 = setCellValueAndStyle(r7, 6, "", commonStyle); r7 = setCellValueAndStyle(r7, 6, "", commonStyle);
sheet.addMergedRegion(new CellRangeAddress(7, 7, 3, 3)); // sheet.addMergedRegion(new CellRangeAddress(7, 7, 3, 3));
sheet.addMergedRegion(new CellRangeAddress(7, 7, 4, 4)); // sheet.addMergedRegion(new CellRangeAddress(7, 7, 4, 4));
sheet.addMergedRegion(new CellRangeAddress(7, 7, 5, 5)); // sheet.addMergedRegion(new CellRangeAddress(7, 7, 5, 5));
// 设置编号、客户自编号、样品信息等位置 // 设置编号、客户自编号、样品信息等位置
sheet.addMergedRegion(new CellRangeAddress(6, 7, 0, 1)); sheet.addMergedRegion(new CellRangeAddress(6, 7, 0, 1));
sheet.addMergedRegion(new CellRangeAddress(6, 7, 2, 2)); sheet.addMergedRegion(new CellRangeAddress(6, 7, 2, 2));
@ -560,7 +569,10 @@ public class PrimaryDataAppController {
for (int j = 0; j < itemList.size(); j++) { for (int j = 0; j < itemList.size(); j++) {
ConfigItemVo itemVo = itemList.get(j); ConfigItemVo itemVo = itemList.get(j);
r7 = setCellValueAndStyle(r7, csItemIndex, itemVo.getItemName(), commonStyle); r7 = setCellValueAndStyle(r7, csItemIndex, itemVo.getItemName(), commonStyle);
sheet.addMergedRegion(new CellRangeAddress(7, 7, csItemIndex, csItemIndex)); if(csItemIndex!=csItemIndex){
sheet.addMergedRegion(new CellRangeAddress(7, 7, csItemIndex, csItemIndex));
}
// sheet.addMergedRegion(new CellRangeAddress(7, 7, csItemIndex, csItemIndex));
csItemIndex++; csItemIndex++;
} }
} }

6
src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
View File

@ -464,9 +464,9 @@ public class DownLoadController {
} }
// sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i])); // sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
} else { } else {
if(cellIndexArr[i - 1] + 1 !=cellIndexArr[i]){ if(cellIndexArr[i - 1] + 1 !=cellIndexArr[i]){
sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i])); sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
} }
// sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i])); // sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
} }
} }