修复bug

jyy

2021-07-14 d13ae240c54c59b04c0571bfc0136ed0c8ba32a3

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml

@@ -67,6 +67,7 @@
      update_time,
         id,
         act_name,
         act_code,
         act_type,
         act_begin_time,
         act_end_time,
@@ -87,6 +88,7 @@
      now(),
         #{item.id},
         #{item.actName},
         #{item.actCode},
         #{item.actType},
         #{item.actBeginTime},
         #{item.actEndTime},
@@ -210,6 +212,13 @@
      <set>
         <if test="record.actName != null and record.actName != '' ">
            act_name  = #{record.actName},
         </if>
         <if test="record.actCode != null ">
            act_code  = #{record.actCode},
         </if>

         <if test="record.actContent != null ">
            act_content  = #{record.actContent},
         </if>
         <if test="record.actType != null ">
            act_type  = #{record.actType}, 
@@ -408,4 +417,26 @@
         a.${record.sort} ${record.order}
      </if>
   </select>

   <select id="selectOneByCompanyIdAndActTypeAndActStatus" resultType="com.matrix.system.shopXcx.bean.ShopActivities">
      SELECT
      *
      FROM
      shop_activities a
      where
         a.company_id=#{companyId}
         and a.act_type=#{activitiesTypeSign}
         and a.act_status=#{actstatusStatusIng}
   </select>

   <select id="selectOneByCompanyIdAndActType" resultType="com.matrix.system.shopXcx.bean.ShopActivities">
      SELECT
         *
      FROM
         shop_activities a
      where
         a.company_id=#{companyId}
        and a.act_type=#{activitiesTypeSign}
        and a.act_status != 5
   </select>
</mapper>