From 14502ba6ce24d7ac44c2c2f39f70d6bb8291fe17 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 13 Dec 2024 11:19:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/service/impl/BmContractServiceImpl.java     | 9 ++++++++-
 .../mapper/material/contract/BmContractMapper.xml        | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
index f1cd184..418aaf8 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
@@ -31,7 +31,14 @@ public class BmContractServiceImpl implements BmContractService {
     @Override
     public List<BmContract> list(BmContract bmContract) {
         bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
-        return bmContractMapper.list(bmContract);
+        List<BmContract> list = bmContractMapper.list(bmContract);
+        for (BmContract contract : list) {
+            BmFileInfo bmFileInfo = new BmFileInfo();
+            bmFileInfo.setModelId(Long.valueOf(contract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L);
+            List<BmFileInfo> bmFileInfos = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo);
+            contract.setBmFileInfoList(bmFileInfos);
+        }
+        return list;
     }
 
     @Override
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
index 35dec01..e81efc4 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
@@ -29,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contractName != null and contractName != ''">
                 and contract_name like concat('%', #{contractName}, '%')
             </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
         </where>
     </select>
     <select id="selectTaskNumByMonth" resultType="java.lang.String">