From d388e2788b7ef088d7cd40f901b0acdcec460bc3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 01 Apr 2021 00:19:23 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 100 insertions(+), 16 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
index 6c35040..0c6cb3c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -90,6 +90,7 @@
<result property="invalidTime" column="invalid_time" />
<result property="useValid" column="use_valid" />
<result property="buyValid" column="buy_valid" />
+ <result property="isInfinite" column="is_infinite" />
@@ -299,7 +300,8 @@
buy_valid,
use_valid,
invalid_time,
- pay_methods
+ pay_methods,
+ is_infinite
)
VALUES (
#{id},
@@ -359,7 +361,8 @@
#{buyValid},
#{useValid},
#{invalidTime},
- #{payMethods}
+ #{payMethods},
+ #{isInfinite}
)
</insert>
@@ -532,6 +535,9 @@
<if test="isDel != null and isDel !='' ">
is_del = #{isDel},
</if>
+ <if test="isInfinite != null and isInfinite !='' ">
+ is_infinite = #{isInfinite},
+ </if>
invalid_time = #{invalidTime},
buy_valid = #{buyValid},
use_valid = #{useValid},
@@ -679,28 +685,25 @@
<if test="record.queryNoGoodsype != null and record.queryNoGoodsype !='' ">
and good_type !=#{record.queryNoGoodsype}
</if>
+
<if test="record.name != null and record.name !='' ">
and (instr(name,#{record.name}) or instr(zjm,#{record.name}))
</if>
+ <if test="record.zjm != null and record.zjm !='' ">
+ and instr(zjm,#{record.zjm})
+ </if>
+
+
<if test="record.staus != null and record.staus !='' ">
and staus =#{record.staus}
</if>
- <if test="record.code != null and record.code !=''">
- and code = #{record.code}
- </if>
+
<if test="record.isAssemble != null and record.isAssemble !='' ">
and is_assemble =#{record.isAssemble}
</if>
<if test="record.deleted != null and record.deleted !='' ">
and deleted =#{record.deleted}
</if>
- <if test="record.isDel != null and record.isDel !='' ">
- and is_del = #{record.isDel}
- </if>
- <if test="record.zjm != null and record.zjm !='' ">
- and instr(zjm,#{record.zjm})
- </if>
-
<if test="record.cateId != null and record.cateId !='' ">
and cate_id =#{record.cateId}
</if>
@@ -716,32 +719,44 @@
and is_vip_car = #{record.isVipCar}
</if>
+
<if test="record.isCourse != null and record.isCourse !=''">
and is_course = #{record.isCourse}
</if>
+
+ <if test="record.code != null and record.code !=''">
+ and code = #{record.code}
+ </if>
+
<if test="record.startTime != null ">
and create_time <![CDATA[ >= ]]> #{record.startTime}
</if>
<if test="record.endTime != null ">
and create_time <![CDATA[ <= ]]> #{record.endTime}
+
</if>
<if test="record.shopId != null and record.shopId !='' ">
- <![CDATA[ and ( shop_id = #{record.shopId}
- or ISNULL(use_shop) || LENGTH(trim(use_shop))<1
- or FIND_IN_SET(#{record.shopId},use_shop) ) ]]>
+ <![CDATA[ and ( shop_id = #{record.shopId} or
+ ( headquarters=1 and ( ISNULL(use_shop) or LENGTH(trim(use_shop))<1 or FIND_IN_SET(#{record.shopId},use_shop))))]]>
</if>
<if test="record.companyId != null and record.companyId !='' ">
and company_id = #{record.companyId}
</if>
+
+ <if test="record.isDel != null and record.isDel !='' ">
+ and is_del = #{record.isDel}
+ </if>
+
<if test="record.headquarters != null and record.headquarters !='' ">
and headquarters = #{record.headquarters}
</if>
-
</if>
+
+
</select>
@@ -1222,4 +1237,73 @@
</select>
+ <select id="selectShoppingGoodsApiInPage" resultType="com.matrix.system.app.vo.ShoppingGoodsListVo">
+ select
+ id id,
+ code goodsCode,
+ name name,
+ seal_pice price,
+ is_present isPresent,
+ unit unit,
+ measure measure,
+ a.good_type goodsType
+ from shopping_goods a
+ where 1=1 and staus = '上架' and a.is_del=1
+ <if test="record.queryKey != null and record.queryKey != ''">
+ and (instr(name,#{record.queryKey}) or instr(code ,#{record.queryKey}) or instr(zjm ,#{record.queryKey}))
+ </if>
+ <if test="record.cateId!=null">
+ and a.cate_id in ( select b.id from shopping_goods_category b where (b.id=#{record.cateId} or b.parent_id=#{record.cateId}))
+ </if>
+ <if test="record.shopId != null and record.shopId !='' ">
+ <![CDATA[ and ( a.shop_id = #{record.shopId} or
+ ( a.headquarters=1 and ( ISNULL(a.use_shop) or LENGTH(trim(a.use_shop))<1 or FIND_IN_SET(#{record.shopId},a.use_shop))))]]>
+ </if>
+ <if test="record.companyId != null and record.companyId !='' ">
+ and a.company_id=#{record.companyId}
+ </if>
+ <if test="record.goodType!=null">
+ and a.good_type=#{record.goodType}
+ </if>
+ <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
+ <if test="pageVo.sort !=null and pageVo.order !=null">
+ order by ${pageVo.sort} ${pageVo.order}
+ </if>
+ <if test="pageVo.offset >=0 and pageVo.limit >0">
+ limit #{pageVo.offset},#{pageVo.limit}
+ </if>
+ </if>
+ </select>
+
+ <select id="selectShopppingGoodsAipTotal" resultType="java.lang.Integer">
+ select count(1)
+ from shopping_goods a
+ where 1=1 and staus = '上架'
+ <if test="record.queryKey != null and record.queryKey != ''">
+ and (instr(name,#{record.queryKey}) or instr(code ,#{record.queryKey}) or instr(zjm ,#{record.queryKey}))
+ </if>
+ <if test="record.cateId!=null">
+ and a.cate_id in ( select b.id from shopping_goods_category b where (b.id=#{record.cateId} or b.parent_id=#{record.cateId}))
+ </if>
+ <if test="record.shopId != null and record.shopId !='' ">
+ <![CDATA[ and ( a.shop_id = #{record.shopId} or
+ ( a.headquarters=1 and ( ISNULL(a.use_shop) or LENGTH(trim(a.use_shop))<1 or FIND_IN_SET(#{record.shopId},a.use_shop))))]]>
+ </if>
+ <if test="record.companyId != null and record.companyId !='' ">
+ and a.company_id=#{record.companyId}
+ </if>
+ <if test="record.goodType!=null">
+ and a.good_type=#{record.goodType}
+ </if>
+ </select>
+
+ <select id="selectByIds" resultMap="ShoppingGoodsSimpleMap">
+ select
+ *
+ from shopping_goods
+ where id in
+ <foreach collection="ids" item="item" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.1