bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev

This commit is contained in:
sxu 2023-12-08 13:45:30 +08:00
parent d245ac027e 16ea51a34d
commit e13dc8f6fa
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
View File

@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletResponse;
* @author xsheng
* @date 2023-12-02
*/
@Api(tags = "装备数据接口")
@RestController
@RequestMapping("/dev")
@Api(value = "设备信息",tags = "设备管理")

7
zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml
View File

@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.bonus.zlpt.home.mapper.BmCarouselSetMapper">
<sql id="selectBmCarouseVo">
select id, car_name, car_url, type, open_url, bc.status, bc.create_time, su.user_name AS createBy, sort, is_active
select bc.id, bc.car_name, bc.car_url, bc.type, bc.open_url, bc.status, bc.create_time, su.user_name AS createBy, bc.sort, bc.is_active
from bm_carousel_set bc
left join sys_user su on bc.creator = su.user_id
</sql>
@ -59,12 +59,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
BETWEEN date_format( #{beginTime}, '%Y-%m-%d' )
and date_format( #{endTime}, '%Y-%m-%d' )
</if>
and bc.is_active = '1'
</where>
ORDER BY CASE WHEN sort IS NULL THEN 1 ELSE 0 END, sort
ORDER BY CASE WHEN bc.sort IS NULL THEN 1 ELSE 0 END, bc.sort
</select>
<select id="selectListById" resultType="com.bonus.zlpt.home.pojo.BmCarouselSet">
<include refid="selectBmCarouseVo"/>
where id = #{id}
where bc.id = #{id} and bc.is_active = '1'
</select>
</mapper>

5
zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml
View File

@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.bonus.zlpt.home.mapper.BmTopicInfoMapper">
<sql id="selectBmTopicVo">
select id, topic_name, type, view_num, content, is_active, su.user_name AS creator, bt.create_time
select bt.id, bt.topic_name, bt.type, bt.view_num, bt.content, bt.is_active, su.user_name AS creator, bt.create_time
from bm_topic_info bt
left join sys_user su on bt.creator = su.user_id
</sql>
@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectListById" resultType="com.bonus.zlpt.home.pojo.BmTopicInfo">
<include refid="selectBmTopicVo"/>
where id = #{id}
where bt.id = #{id} and bt.is_active = '1'
</select>
<select id="selectSpecialInfoList" resultType="com.bonus.zlpt.home.pojo.BmTopicInfo">
@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
BETWEEN date_format( #{beginTime}, '%Y-%m-%d' )
and date_format( #{endTime}, '%Y-%m-%d' )
</if>
and bt.is_active = '1'
</where>
</select>
</mapper>