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-05 12:04:32 +08:00
parent fa60718ba3
commit a77d7b6039
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -622,8 +622,10 @@ public class PrimaryDataAppController {
experRow = setCellValueAndStyle(experRow, hbNum, experDevVo.getRemarks(), commonStyle); experRow = setCellValueAndStyle(experRow, hbNum, experDevVo.getRemarks(), commonStyle);
sheet.addMergedRegion(new CellRangeAddress(experRow.getRowNum(), experRow.getRowNum(), 0, 1)); sheet.addMergedRegion(new CellRangeAddress(experRow.getRowNum(), experRow.getRowNum(), 0, 1));
} }
sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 2, hbNum - 2)); if(8 != 8 + experDevVos.size() - 1){
sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 1, hbNum - 1)); sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 2, hbNum - 2));
sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 1, hbNum - 1));
}
return sheet; return sheet;
} }

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

@ -646,8 +646,10 @@ public class DownLoadController {
experRow = setCellValueAndStyle(experRow, hbNum, experDevVo.getRemarks(), commonStyle); experRow = setCellValueAndStyle(experRow, hbNum, experDevVo.getRemarks(), commonStyle);
sheet.addMergedRegion(new CellRangeAddress(experRow.getRowNum(), experRow.getRowNum(), 0, 1)); sheet.addMergedRegion(new CellRangeAddress(experRow.getRowNum(), experRow.getRowNum(), 0, 1));
} }
sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 2, hbNum - 2)); if(8 != 8 + experDevVos.size() - 1){
sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 1, hbNum - 1)); sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 2, hbNum - 2));
sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 1, hbNum - 1));
}
return sheet; return sheet;
} }

2
src/main/resources/static/js/publicJs.js
View File

@ -7,7 +7,7 @@ console.log(url)
let test_url="http://192.168.0.14:11997/szgqj"; let test_url="http://192.168.0.14:11997/szgqj";
let dev_url="http://112.27.246.86:21997/szgqj"; let dev_url="http://112.27.246.86:21997/szgqj";
let dev_url2="https://jj.jypxks.com/szgqj"; let dev_url2="https://jj.jypxks.com/szgqj";
let local_url="http://127.0.0.1:21997/szgqj"; let local_url="http://127.0.0.1:11997/szgqj";
let dataUrl = "http://112.27.246.86:21997/szgqj" let dataUrl = "http://112.27.246.86:21997/szgqj"
if(url.indexOf("112.27.246.86")!=-1){ if(url.indexOf("112.27.246.86")!=-1){