|
|
@@ -2523,17 +2523,17 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
|
int colIdx = 1; //列数 共8列
|
|
|
for (Cell cell : cells) {
|
|
|
String cellVal = ImportCommissionHelp.getNodeText(cell);
|
|
|
- if (colIdx == 1) {
|
|
|
+ if (colIdx == 1) {//检查项
|
|
|
if (StringUtils.isBlank(cellVal)) {
|
|
|
return R.error(partTitle + " 表格第" + rowIndex + "行检查项为空");
|
|
|
} else {
|
|
|
detail.setInspecton_items(cellVal);
|
|
|
}
|
|
|
- } else if (colIdx == 2) {
|
|
|
+ } else if (colIdx == 2) {//接收条件
|
|
|
detail.setReceiving_conditions(cellVal);
|
|
|
- } else if (colIdx == 3) {
|
|
|
+ } else if (colIdx == 3) {//依据标准
|
|
|
detail.setAccording_to_standards(cellVal);
|
|
|
- } else if (colIdx == 5 || colIdx == 6) {
|
|
|
+ } else if (colIdx == 7 || colIdx == 8) {//正确、错误实例
|
|
|
int pngno = 1;//照片个数
|
|
|
String pngstr = "";
|
|
|
for (Node tnode : (Iterable<Node>) cell.getChildNodes(NodeType.ANY, true)) {
|
|
|
@@ -2544,9 +2544,9 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
|
String fileId = SecurityUtil.getUUID();
|
|
|
String imageFileName = outputDir + fileId + ".png";
|
|
|
String fileRealName = "";
|
|
|
- if (colIdx == 5) {
|
|
|
+ if (colIdx == 7) {
|
|
|
fileRealName = partTitle.split(" ")[0] + "_正确实例" + rowIndex + "_" + pngno + ".png";
|
|
|
- } else if (colIdx == 6) {
|
|
|
+ } else if (colIdx == 8) {
|
|
|
fileRealName = partTitle.split(" ")[0] + "_错误实例" + rowIndex + "_" + pngno + ".png";
|
|
|
} // 保存图片到文件
|
|
|
try (FileOutputStream fos = new FileOutputStream(imageFileName)) {
|
|
|
@@ -2576,13 +2576,13 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
|
}
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(pngstr)) {
|
|
|
- if (colIdx == 5) {
|
|
|
+ if (colIdx == 7) {
|
|
|
detail.setAccording_to_files(pngstr.substring(0, pngstr.length() - 3));
|
|
|
} else {
|
|
|
detail.setErrorfiles(pngstr.substring(0, pngstr.length() - 3));
|
|
|
}
|
|
|
}
|
|
|
- } else if (colIdx == 8) {
|
|
|
+ } else if (colIdx == 6) {//备注
|
|
|
detail.setNotes(cellVal);
|
|
|
}
|
|
|
|
DLC