From 1effdf42aa2217d97ad0f201334bfbbbb38e5b24 Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Thu, 28 Jul 2022 16:28:53 +0800
Subject: [PATCH] liuliang

---
 src/com/engine/salary/biz/SIAccountBiz.java               | 5 ++++-
 .../salary/entity/siaccount/dto/SIAccountUtilDTO.java     | 8 ++++++++
 .../salary/mapper/siaccount/SIAccountUtilMapper.xml       | 4 +++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index 96c7d512a..a5671974c 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -14,6 +14,7 @@ import com.engine.salary.encrypt.sischeme.InsuranceSchemeDetailPOEncrypt;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
 import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO;
 import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO;
+import com.engine.salary.entity.siaccount.dto.SIAccountUtilDTO;
 import com.engine.salary.entity.siaccount.param.*;
 import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO;
 import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO;
@@ -1686,8 +1687,10 @@ public class SIAccountBiz extends Service {
      * @return
      */
     public int checkIfBusinessaccounting(InsuranceAccountBatchPO param) {
+        List<SIAccountUtilDTO> list = getSIAccountUtilMapper().checkIfBusinessaccounting(param.getId());
+        return (int) list.stream().filter(e -> e.getBillmonth().equals(e.getTaxcycle().substring(0,7))).count();
+
 
-        return getSIAccountUtilMapper().checkIfBusinessaccounting(param.getId()).get(0).getNum();
     }
 
     /**
diff --git a/src/com/engine/salary/entity/siaccount/dto/SIAccountUtilDTO.java b/src/com/engine/salary/entity/siaccount/dto/SIAccountUtilDTO.java
index 1beb6a5ab..841753485 100644
--- a/src/com/engine/salary/entity/siaccount/dto/SIAccountUtilDTO.java
+++ b/src/com/engine/salary/entity/siaccount/dto/SIAccountUtilDTO.java
@@ -15,4 +15,12 @@ public class SIAccountUtilDTO {
      * 数量
      */
     private int num;
+    /**
+     * 账单月份
+     */
+    private String billmonth;
+    /**
+     * 税款所属期
+     */
+    private String taxcycle;
 }
diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountUtilMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountUtilMapper.xml
index 4abc1b1db..c4e3ea363 100644
--- a/src/com/engine/salary/mapper/siaccount/SIAccountUtilMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/SIAccountUtilMapper.xml
@@ -4,11 +4,13 @@
 
     <resultMap id="BaseResultMap" type="com.engine.salary.entity.siaccount.dto.SIAccountUtilDTO">
         <result column="num" property="num"/>
+        <result column="billmonth" property="billmonth"/>
+        <result column="taxcycle" property="taxcycle"/>
     </resultMap>
 
     <select id="checkIfBusinessaccounting" resultMap="BaseResultMap">
         SELECT
-        COUNT(0) num
+        a.bill_month billmonth,c.tax_cycle taxcycle
         FROM
         hrsa_bill_batch a,hrsa_salary_sob b,hrsa_salary_acct_record c
         WHERE