From 2db76f2066701cbe292f206ad49a7f8523b8aa9f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 14 八月 2026 16:30:25 +0800
Subject: [PATCH] feat:银行流水关联多个合同,新增预收款开票,所有List校验调整为ColUtil

---
 platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml |   74 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
index aa2b472..ca39318 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
@@ -5,11 +5,9 @@
 
   <resultMap id="productMap" type="com.by4cloud.platformx.business.entity.Product">
         <id property="id" column="id"/>
-        <result property="categoryId" column="category_id"/>
         <result property="productName" column="product_name"/>
         <result property="erpCode" column="erp_code"/>
         <result property="mainCode" column="main_code"/>
-        <result property="price" column="price"/>
         <result property="taxRate" column="tax_rate"/>
         <result property="compId" column="comp_id"/>
         <result property="createBy" column="create_by"/>
@@ -18,4 +16,76 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
   </resultMap>
+    <select id="getProductListByScope" resultType="com.by4cloud.platformx.business.vo.ProductSelectVo">
+		SELECT
+			t.id,
+			t.product_name,
+			t.main_code,
+			t.erp_code,
+			t.product_type,
+			t.tax_rate,
+			t.tax_class,
+			t.tax_code,
+			t.parent_id,
+			t.create_by,
+			t.update_by,
+			t.create_time,
+			t.update_time,
+			t.del_flag,
+			t.comp_id
+		FROM
+			product t
+		WHERE
+			del_flag = '0'
+		<if test="product.productName !=null and product.productName !=''">
+			and t.product_name LIKE CONCAT('%', #{product.productName}, '%')
+		</if>
+		  AND (
+			NOT EXISTS ( SELECT 1 FROM product t1 WHERE t1.parent_id = t.id ))
+	</select>
+	<select id="getProductListByParentId" resultType="com.by4cloud.platformx.business.vo.ProductSelectVo">
+		SELECT
+			t.id,
+			t.product_name,
+			t.main_code,
+			t.erp_code,
+			t.product_type,
+			t.tax_rate,
+			t.tax_class,
+			t.tax_code,
+			t.parent_id,
+			t.create_by,
+			t.update_by,
+			t.create_time,
+			t.update_time,
+			t.del_flag,
+			t.comp_id ,
+			( SELECT count( 1 ) FROM product t1 WHERE t1.parent_id = t.id ) AS childNum
+		FROM
+			product t
+		WHERE
+			del_flag = '0'
+		<if test="queryDTO.productName !=null and queryDTO.productName !=''">
+			and ( t.product_name LIKE CONCAT('%', #{queryDTO.productName}, '%') or
+			t.erp_code LIKE CONCAT('%', #{queryDTO.productName}, '%'))
+		</if>
+		<if test="queryDTO.parentId !=null ">
+			and t.parent_id = #{queryDTO.parentId}
+		</if>
+		<choose>
+			<when test="queryDTO.contractCategory !=null and queryDTO.contractCategory !='' and queryDTO.contractCategory=='water_house'">
+				and t.erp_code in
+				<foreach collection="erpCodes" item="erp" open="(" separator="," close=")">
+					#{erp}
+				</foreach>
+			</when>
+			<otherwise>
+				and t.erp_code not in
+				<foreach collection="erpCodes" item="erp" open="(" separator="," close=")">
+					#{erp}
+				</foreach>
+			</otherwise>
+		</choose>
+
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1