中润工资--代码提交

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

 package com.ruoyi.system.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.domain.AjaxResult;
 
 
@@ -51,6 +52,7 @@ public class SalaryCurrentRuleServiceImpl implements SalaryCurrentRuleService {
                     }
                 }));
             }
+            System.err.println(JSON.toJSONString(salaryExcelModels));
             int count = salaryMapper.exist(mineCode, salaryDate);
             if (count > 0) {
                 List<String> stringList = salaryMapper.selectByDateAndMineCode(salaryDate, mineCode);

ruoyi-wages/src/main/java/com/ruoyi/system/support/CurrentRuleSalarySupport.java

@@ -292,7 +292,7 @@ public class CurrentRuleSalarySupport {
         });
     }
     private static void ReplaceBracket(List<NewRuleRequestModel> newRuleRequestModelList) {
-        newRuleRequestModelList.forEach(v -> v.setRow(v.getRow().replaceAll("\\(.*?\\)",StringUtils.EMPTY).replaceAll("（.*?\\)", StringUtils.EMPTY).replaceAll("（.*?）",StringUtils.EMPTY).replaceAll("其中：",StringUtils.EMPTY)));
+        newRuleRequestModelList.forEach(v -> v.setRow(v.getRow().replaceAll("其中：",StringUtils.EMPTY)));
     }
 
 }