Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交

Browse Source
This commit is contained in:
huangzj
2023-09-21 15:58:38 +08:00
parent a53561c07f
commit b86cb8ddd8
24 changed files with 336 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentProcessPOMapper.java
View File

@@ -1,7 +1,11 @@
package com.njcn.csdevice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.csdevice.pojo.dto.CsEquipmentProcessDTO;
import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO;
import com.njcn.web.pojo.param.BaseParam;
import org.apache.ibatis.annotations.Param;
/**
*
@@ -12,4 +16,5 @@ import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO;
* @version V1.0.0
*/
public interface CsEquipmentProcessPOMapper extends BaseMapper<CsEquipmentProcessPO> {
Page<CsEquipmentProcessDTO> selectPages(Page<CsEquipmentProcessDTO> returnpage, @Param("baseParam") BaseParam baseParam);
}

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml
View File

@@ -34,9 +34,9 @@
<if test="csDevModelQueryParm.devName != null and csDevModelQueryParm.devName != ''">
AND a.dev_type_name LIKE concat('%',#{csDevModelQueryParm.devName},'%')
</if>
<if test="csDevModelQueryParm.devType != null and csDevModelQueryParm.devType != ''">
AND a.dev_type = #{csDevModelQueryParm.devType}
</if>
<!-- <if test="csDevModelQueryParm.devType != null and csDevModelQueryParm.devType != ''">-->
<!-- AND a.dev_type = #{csDevModelQueryParm.devType}-->
<!-- </if>-->
<if test="csDevModelQueryParm.name != null and csDevModelQueryParm.name != ''">
AND a.name = #{csDevModelQueryParm.name}
</if>

15
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentProcessPOMapper.xml
View File

@@ -16,4 +16,19 @@
<!--@mbg.generated-->
id, dev_id, `operator`, start_time, end_time, `status`, `process`
</sql>
<select id="selectPages" resultType="com.njcn.csdevice.pojo.dto.CsEquipmentProcessDTO">
select a.*,b.name devName from cs_equipment_process a left join cs_equipment_delivery b on a.dev_id =b.ndid
where 1=1
<if test="baseParam!=null and baseParam.searchValue != null and baseParam.searchValue !=''">
AND b.name like concat(concat("%",#{baseParam.searchValue}),"%")
</if>
<if test="baseParam!=null and baseParam.searchEndTime != null and baseParam.searchEndTime !=''">
AND DATE(a.start_time) &lt;= DATE(#{baseParam.searchEndTime})
</if>
<if test="baseParam!=null and baseParam.searchBeginTime != null and baseParam.searchBeginTime !=''">
AND DATE(a.start_time) &gt;= DATE(#{baseParam.searchBeginTime})
</if>
order by a.start_time desc
</select>
</mapper>

10
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEventSendMsgMapper.xml
View File

@@ -3,6 +3,14 @@
<mapper namespace="com.njcn.csdevice.mapper.CsEventSendMsgMapper">
<select id="selectPages" resultType="com.njcn.csdevice.pojo.vo.CsEventSendMsgVO">
select * from cs_event_send_msg a LEFT JOIN cs_event b on a.event_id =b.id
select a.*,b.*,c.name devName from cs_event_send_msg a LEFT JOIN cs_event b on a.event_id =b.id left JOIN cs_ledger c on b.device_id =c.id
where 1=1
<if test="baseParam!=null and baseParam.searchEndTime != null and baseParam.searchEndTime !=''">
AND DATE(a.send_time) &lt;= DATE(#{baseParam.searchEndTime})
</if>
<if test="baseParam!=null and baseParam.searchBeginTime != null and baseParam.searchBeginTime !=''">
AND DATE(a.send_time) &gt;= DATE(#{baseParam.searchBeginTime})
</if>
order by send_time desc
</select>
</mapper>