|
@@ -1339,7 +1339,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
Elements dwtitle = doc.select("el-input[placeholder~=.*承包单位]");
|
|
Elements dwtitle = doc.select("el-input[placeholder~=.*承包单位]");
|
|
Elements sgtitle = doc.select("el-input[placeholder~=^施工单位]");
|
|
Elements sgtitle = doc.select("el-input[placeholder~=^施工单位]");
|
|
Elements sgtitle1 = doc.select("el-input[placeholder=安装单位]");
|
|
Elements sgtitle1 = doc.select("el-input[placeholder=安装单位]");
|
|
- Elements sgtitle2= doc.select("el-input[placeholder=承建单位]");
|
|
|
|
|
|
+ Elements sgtitle2= doc.select("el-input[placeholder~=^承建单位]");
|
|
|
|
|
|
Elements defText = doc.getElementsByAttribute("defText");
|
|
Elements defText = doc.getElementsByAttribute("defText");
|
|
sgtitle.addAll(sgtitle1);
|
|
sgtitle.addAll(sgtitle1);
|
|
@@ -1404,6 +1404,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
if ((trindex < 10 || placeholderxx.equals("施工单位")) && placeholderxx.indexOf("自评意见")<0) {
|
|
if ((trindex < 10 || placeholderxx.equals("施工单位")) && placeholderxx.indexOf("自评意见")<0) {
|
|
reData.put(element.attr("keyName"), contractInfo.getConstructionUnitName());
|
|
reData.put(element.attr("keyName"), contractInfo.getConstructionUnitName());
|
|
}
|
|
}
|
|
|
|
+ if ((trindex < 10 || placeholderxx.equals("承建单位")) && placeholderxx.indexOf("自评意见")<0) {
|
|
|
|
+ reData.put(element.attr("keyName"), contractInfo.getConstructionUnitName());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|