From 76bcf58e4fb96f27eb1338326740f3e0bf2c5989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 21 Nov 2022 22:24:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=B6=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/AccountHeadMapperEx.java          |  4 +-
 .../accountHead/AccountHeadService.java       |  6 +--
 .../accountItem/AccountItemService.java       | 25 ----------
 .../mapper_xml/AccountHeadMapperEx.xml        | 48 +++++++++----------
 4 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java
index 867895e3..8e18a2a1 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java
@@ -23,7 +23,7 @@ public interface AccountHeadMapperEx {
             @Param("accountId") Long accountId,
             @Param("status") String status,
             @Param("remark") String remark,
-            @Param("ahIdList") List<Long> ahIdList,
+            @Param("number") String number,
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
@@ -39,7 +39,7 @@ public interface AccountHeadMapperEx {
             @Param("accountId") Long accountId,
             @Param("status") String status,
             @Param("remark") String remark,
-            @Param("ahIdList") List<Long> ahIdList);
+            @Param("number") String number);
 
     BigDecimal findAllMoney(
             @Param("supplierId") Integer supplierId,
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
index 642685b8..db634328 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
@@ -97,9 +97,8 @@ public class AccountHeadService {
             String [] creatorArray = getCreatorArray(roleType);
             beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
             endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
-            List<Long> ahIdList = accountItemService.getAhIdListByBillNumber(number);
             List<AccountHeadVo4ListEx> list = accountHeadMapperEx.selectByConditionAccountHead(type, creatorArray, billNo,
-                    beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, ahIdList, offset, rows);
+                    beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number, offset, rows);
             if (null != list) {
                 for (AccountHeadVo4ListEx ah : list) {
                     if(ah.getChangeAmount() != null) {
@@ -128,9 +127,8 @@ public class AccountHeadService {
             String [] creatorArray = getCreatorArray(roleType);
             beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
             endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
-            List<Long> ahIdList = accountItemService.getAhIdListByBillNumber(number);
             result = accountHeadMapperEx.countsByAccountHead(type, creatorArray, billNo,
-                    beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, ahIdList);
+                    beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number);
         }catch(Exception e){
             JshException.readFail(logger, e);
         }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java
index 5a49107c..3f55594c 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java
@@ -261,29 +261,4 @@ public class AccountItemService {
     public BigDecimal getEachAmountByBillId(Long billId) {
         return accountItemMapperEx.getEachAmountByBillId(billId).abs();
     }
-
-    public List<Long> getAhIdListByBillNumber(String number) throws Exception {
-        if(StringUtil.isNotEmpty(number)) {
-            DepotHead depotHead = depotHeadService.getDepotHead(number);
-            if(depotHead.getId()!=null) {
-                List<Long> ahIdList = new ArrayList<>();
-                AccountItemExample example = new AccountItemExample();
-                example.createCriteria().andBillIdEqualTo(depotHead.getId()).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-                List<AccountItem> list = accountItemMapper.selectByExample(example);
-                if (list != null && list.size() > 0) {
-                    for(AccountItem accountItem: list) {
-                        ahIdList.add(accountItem.getHeaderId());
-                    }
-                    return ahIdList;
-                } else {
-                    return null;
-                }
-            } else {
-                return null;
-            }
-        } else {
-            return null;
-        }
-
-    }
 }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
index 46c7e33b..e2f14ac5 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
@@ -12,6 +12,8 @@
     <select id="selectByConditionAccountHead" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx">
         select ah.*, s.supplier OrganName, p.Name HandsPersonName, u.username userName, a.Name AccountName
         from jsh_account_head ah
+        left join jsh_account_item ai on ah.id=ai.header_id and ifnull(ai.delete_flag,'0') !='1'
+        left join jsh_depot_head dh on dh.id=ai.bill_id and ifnull(dh.delete_flag,'0') !='1'
         left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1'
         left join jsh_user u on ah.creator=u.id and ifnull(u.Status,'0') !='1'
         left join jsh_person p on ah.hands_person_id=p.id and ifnull(p.delete_Flag,'0') !='1'
@@ -56,11 +58,9 @@
             <bind name="bindRemark" value="'%'+remark+'%'"/>
             and ah.remark like #{bindRemark}
         </if>
-        <if test="ahIdList!=null and ahIdList.size()>0">
-            and ah.id in
-            <foreach collection="ahIdList" item="item" index="index" separator="," open="(" close=")">
-                #{item}
-            </foreach>
+        <if test="number != null and number !=''">
+            <bind name="bindNumber" value="'%'+number+'%'"/>
+            and dh.number like #{bindNumber}
         </if>
         and ifnull(ah.delete_flag,'0') !='1'
         order by ah.id desc
@@ -72,55 +72,55 @@
 
     <select id="countsByAccountHead" resultType="java.lang.Long">
         SELECT
-        COUNT(id)
-        FROM jsh_account_head
+        COUNT(ah.id)
+        FROM jsh_account_head ah
+        left join jsh_account_item ai on ah.id=ai.header_id and ifnull(ai.delete_flag,'0') !='1'
+        left join jsh_depot_head dh on dh.id=ai.bill_id and ifnull(dh.delete_flag,'0') !='1'
         WHERE 1=1
         <if test="billNo != null">
             <bind name="bindBillNo" value="'%'+billNo+'%'"/>
-            and bill_no like #{bindBillNo}
+            and ah.bill_no like #{bindBillNo}
         </if>
         <if test="type != null">
-            and type=#{type}
+            and ah.type=#{type}
         </if>
         <if test="beginTime != null">
-            and bill_time &gt;= #{beginTime}
+            and ah.bill_time &gt;= #{beginTime}
         </if>
         <if test="endTime != null">
-            and bill_time &lt;= #{endTime}
+            and ah.bill_time &lt;= #{endTime}
         </if>
         <if test="organId != null">
-            and organ_id=#{organId}
+            and ah.organ_id=#{organId}
         </if>
         <if test="handsPersonId != null">
-            and hands_person_id=#{handsPersonId}
+            and ah.hands_person_id=#{handsPersonId}
         </if>
         <if test="creator != null">
-            and creator=#{creator}
+            and ah.creator=#{creator}
         </if>
         <if test="creatorArray != null">
-            and creator in (
+            and ah.creator in (
             <foreach collection="creatorArray" item="creator" separator=",">
                 #{creator}
             </foreach>
             )
         </if>
         <if test="accountId != null">
-            and account_id=#{accountId}
+            and ah.account_id=#{accountId}
         </if>
         <if test="status != null and status != ''">
-            and status=#{status}
+            and ah.status=#{status}
         </if>
         <if test="remark != null and remark !=''">
             <bind name="bindRemark" value="'%'+remark+'%'"/>
-            and remark like #{bindRemark}
+            and ah.remark like #{bindRemark}
         </if>
-        <if test="ahIdList!=null and ahIdList.size()>0">
-            and id in
-            <foreach collection="ahIdList" item="item" index="index" separator="," open="(" close=")">
-                #{item}
-            </foreach>
+        <if test="number != null and number !=''">
+            <bind name="bindNumber" value="'%'+number+'%'"/>
+            and dh.number like #{bindNumber}
         </if>
-        and ifnull(delete_flag,'0') !='1'
+        and ifnull(ah.delete_flag,'0') !='1'
     </select>
 
     <select id="findAllMoney" resultType="java.math.BigDecimal">