From ff8dcf176940bfa3d3df181d23f2e7d7433d0e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 17 May 2023 17:38:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=BC=82=E5=B8=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/formlua/entity/standard/ExcelResult.java      | 9 +++++++++
 .../salary/service/impl/FormulaRunServiceImpl.java       | 2 +-
 .../service/impl/SalaryAcctCalculateServiceImpl.java     | 8 ++++----
 .../salary/service/impl/SalaryFormulaServiceImpl.java    | 2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/formlua/entity/standard/ExcelResult.java b/src/com/engine/salary/formlua/entity/standard/ExcelResult.java
index 1e1923864..b70bc9b1d 100644
--- a/src/com/engine/salary/formlua/entity/standard/ExcelResult.java
+++ b/src/com/engine/salary/formlua/entity/standard/ExcelResult.java
@@ -37,6 +37,15 @@ public class ExcelResult implements Serializable {
     private String formulaId;
     private String dataType;
 
+    public ExcelResult() {
+    }
+
+    public ExcelResult(boolean status, Object data, String errorMsg) {
+        this.status = status;
+        this.data = data;
+        this.errorMsg = errorMsg;
+    }
+
     public String getExpress() {
         return express;
     }
diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
index 413f3bdfa..b1d19353a 100644
--- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
+++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
@@ -53,7 +53,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
             return runSQL(expressFormula, formulaVars);
         }
         log.error("express execute fail, {} not in ReferenceTypeEnum ", expressFormula.getReferenceType());
-        return new ExcelResult();
+        return new ExcelResult(false, "", "");
     }
 
     private ExcelResult runSQL(ExpressFormula expressFormula, List<FormulaVar> formulaVars) {
diff --git a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
index 02c56f351..b72c81e0a 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
@@ -169,7 +169,7 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc
             Map<Long, SalarySobBackItemPO> salarySobBackItemMap = SalaryEntityUtil.convert2Map(salarySobBackItems, SalarySobBackItemPO::getSalaryItemId);
             List<SalaryAcctResultTempPO> salaryAcctResultTempPOS = Lists.newArrayList();
             // 开始核算
-            String noticeMsg = "";
+            StringBuilder noticeMsg = new StringBuilder();
             for (SalaryAcctEmployeePO salaryAcctEmployeePO : salaryAcctCalculateBO.getSalaryAcctEmployeePOS()) {
                 Long salaryAcctEmployeePOId = salaryAcctEmployeePO.getId();
                 //1 获取当前薪资核算人员的公式中的变量的值
@@ -203,8 +203,8 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc
                             //公式异常
                             if (!result.isStatus()) {
                                 String username = empInfo.stream().filter(emp -> StringUtils.equals("employeeInfo_username", emp.getFieldId())).findFirst().map(CalculateFormulaVarBO.FormulaVarValue::getFieldValue).orElse("");
-                                String errorMsg = username + "的" + salaryItemPO.getName() + "核算异常，原因：" + result.getErrorMsg();
-                                noticeMsg = noticeMsg + errorMsg + "/n";
+                                String errorMsg = String.format("%s的%s核算异常，原因：%s /n ", username, salaryItemPO.getName(), result.getErrorMsg());
+                                noticeMsg.append(errorMsg);
                             }
                         } else {
                             // 处理取值类型为“输入/导入”的薪资项目
@@ -257,7 +257,7 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc
             // 更新薪资核算进度
             getSalaryAcctProgressService(user).getAndAddCalculatedQty(SalaryCacheKey.ACCT_PROGRESS + salaryAcctCalculateBO.getSalaryAcctRecordPO().getId(),
                     salaryAcctCalculateBO.getSalaryAcctEmployeePOS().size(),
-                    noticeMsg
+                    noticeMsg.toString()
             );
             // 记录子线程执行结果
             salaryAcctCalculateBO.getResults().add(new SalaryAcctCalculateBO.Result(true, StringUtils.EMPTY));
diff --git a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
index e5493758a..d1856b6c7 100644
--- a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
@@ -58,7 +58,7 @@ public class SalaryFormulaServiceImpl extends Service implements SalaryFormulaSe
     }
 
     private FormulaRunService getFormulaRunService(User user) {
-        return (FormulaRunService) ServiceUtil.getService(FormulaRunServiceImpl.class, user);
+        return ServiceUtil.getService(FormulaRunServiceImpl.class, user);
     }
 
     private RemoteExcelService getRemoteExcelService(User user) {