From a1cecd4041e96e5925360e7a4866cba03d0ad9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 21 Sep 2022 14:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E8=A1=A8=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SalaryRoleBiz.java    | 11 -----------
 .../service/impl/TaxDeclarationServiceImpl.java | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 11 deletions(-)
 delete mode 100644 src/com/engine/salary/biz/SalaryRoleBiz.java

diff --git a/src/com/engine/salary/biz/SalaryRoleBiz.java b/src/com/engine/salary/biz/SalaryRoleBiz.java
deleted file mode 100644
index 1da78f715..000000000
--- a/src/com/engine/salary/biz/SalaryRoleBiz.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.engine.salary.biz;
-
-import weaver.general.BaseBean;
-
-public class SalaryRoleBiz  {
-    public String getAllAdminRoleId() {
-        BaseBean baseBean = new BaseBean();
-        String salaryAdminRoleId = baseBean.getPropValue("hrmSalary", "chiefAdminRoleId");
-        return salaryAdminRoleId;
-    }
-}
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index 1eb65c00d..a9c95c094 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -24,16 +24,21 @@ import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
 import com.engine.salary.util.page.SalaryPageUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
+import weaver.general.BaseBean;
 import weaver.hrm.User;
 
 import java.time.YearMonth;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 public class TaxDeclarationServiceImpl extends Service implements TaxDeclarationService {
 
+    private final Boolean isLog = "true".equals(new BaseBean().getPropValue("hrmSalary", "log"));
+
     private TaxDeclarationMapper getTaxDeclarationMapper() {
         return MapperProxyFactory.getProxy(TaxDeclarationMapper.class);
     }
@@ -223,18 +228,30 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
         TaxDeclarationBO.Result result = TaxDeclarationBO.handle(saveParam, taxCycle, user, salaryItemPOS, salarySobPOS, salaryAcctResultPOS);
         // 保存个税申报表
         if (CollectionUtils.isNotEmpty(result.getNeedInsertTaxDeclarations())) {
+            if (isLog) {
+                log.info("salary TaxDeclaration step1 save {}", result.getNeedInsertTaxDeclarations().size());
+            }
             getTaxDeclarationMapper().batchInsert(result.getNeedInsertTaxDeclarations());
         }
         // 保存个税申报表明细
         if (CollectionUtils.isNotEmpty(result.getNeedInsertTaxDeclarationDetails())) {
+            if (isLog) {
+                log.info("salary TaxDeclaration step2 detail save {}", result.getNeedInsertTaxDeclarationDetails().size());
+            }
             getTaxDeclarationDetailService(user).batchSave(result.getNeedInsertTaxDeclarationDetails());
         }
         // 保存累计情况
         if (CollectionUtils.isNotEmpty(result.getNeedInsertAddUpSituations())) {
+            if (isLog) {
+                log.info("salary TaxDeclaration step3 AddUpSituations save {}", result.getNeedInsertAddUpSituations().size());
+            }
             getAddUpSituationService(user).deleteByTaxYearMonthAndTaxAgentIds(SalaryDateUtil.localDate2YearMonth(taxCycle), taxAgentIds);
             getAddUpSituationService(user).batchSave((List) result.getNeedInsertAddUpSituations());
         }
         // 更新薪资核算记录的状态
+        if (isLog) {
+            log.info("salary TaxDeclaration step4 AcctRecordStatus save {}", salaryAcctRecordIds.size());
+        }
         getSalaryAcctRecordService(user).updateStatusByIds(salaryAcctRecordIds, SalaryAcctRecordStatusEnum.DECLARED);
     }