|
@@ -1596,9 +1596,15 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
Element table = doc.select("table").first();
|
|
Element table = doc.select("table").first();
|
|
//计算填报率
|
|
//计算填报率
|
|
Long keySize = table.getElementsByAttribute("v-model").stream().count();
|
|
Long keySize = table.getElementsByAttribute("v-model").stream().count();
|
|
|
|
+ Long sigSize = table.getElementsByAttribute(":readonly").stream().count();
|
|
if (fillNumbers != 0 && keySize != 0){
|
|
if (fillNumbers != 0 && keySize != 0){
|
|
- Double v = fillNumbers.doubleValue() / keySize.doubleValue() * 100;
|
|
|
|
- realFillRate = v.intValue();
|
|
|
|
|
|
+ if (keySize == sigSize){
|
|
|
|
+ realFillRate = 100;
|
|
|
|
+ }else {
|
|
|
|
+ keySize = keySize - sigSize;
|
|
|
|
+ Double v = fillNumbers.doubleValue() / keySize.doubleValue() * 100;
|
|
|
|
+ realFillRate = v.intValue();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
Elements trs = table.select("tr");
|
|
Elements trs = table.select("tr");
|
|
if (ObjectUtil.isNotEmpty(DataInfo)) {
|
|
if (ObjectUtil.isNotEmpty(DataInfo)) {
|