diff --git a/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/SalaryCurrentRuleServiceImpl.java b/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/SalaryCurrentRuleServiceImpl.java index 0080128b20f607e52b4cc943c95176640e069f8f..4224cf9e157d5e866b723467514f711b1904bbd4 100644 --- a/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/SalaryCurrentRuleServiceImpl.java +++ b/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/SalaryCurrentRuleServiceImpl.java @@ -1,6 +1,7 @@ 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); diff --git a/ruoyi-wages/src/main/java/com/ruoyi/system/support/CurrentRuleSalarySupport.java b/ruoyi-wages/src/main/java/com/ruoyi/system/support/CurrentRuleSalarySupport.java index d8f20a4c16e91bced8bd6d75294f9b3c2a990311..321d9ebff56e1609351329c6e8b9cf6af84e95b7 100644 --- a/ruoyi-wages/src/main/java/com/ruoyi/system/support/CurrentRuleSalarySupport.java +++ b/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))); } }