修改通用导入和对照方法

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesCalculateConversionServiceImpl.java

@@ -222,6 +222,9 @@ public class WagesCalculateConversionServiceImpl implements WagesCalculateConver
         value = value.replaceAll(" ", "");
         char sta = value.charAt(0);
         char end = value.charAt(value.length() - 1);
+        if (value.charAt(0) == '-' && value.charAt(1) == '-'){
+            value = value.substring(2);
+        }
         if ((sta < 48 || sta > 57) && sta != '-') {
             return "公式填写有误";
         }

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesServiceImpl.java

@@ -271,7 +271,8 @@ public class WagesServiceImpl implements WagesService {
                 });
             }
             // 添加
-            List<String> filterList = Arrays.asList("小计", "合计", "总计");
+            if (idList.size() != numberOfSheets) return "对照表不完善";
+            List<String> filterList = Arrays.asList("小计", "合计", "总计", "研发人员小计", "全矿总计");
             for (int i = 0; i < idList.size(); i++) {
                 Integer integer = idList.get(i);
                 detailsMapper.deleteBatch(mineId, date, integer);