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-06-09 09:03:51 +08:00
parent 5058931d4f
commit 18e945b058
12 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,10 +20,8 @@
id, dev_type, version_no, version_date, file_path, create_by, create_time, update_by,
update_time, `status`
</sql><select id="getPage" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
SELECT a.*,
b.code as devName
SELECT a.*
FROM cs_dev_model a
LEFT JOIN sys_dict_data b ON a.dev_type = b.id
WHERE
1 = 1 And a.`status`='1'
<if test="csDevModelQueryParm.versionStartDate != null and csDevModelQueryParm.versionStartDate != ''">
@@ -34,7 +32,7 @@
</if>
<if test="csDevModelQueryParm.devName != null and csDevModelQueryParm.devName != ''">
AND b.CODE LIKE concat('%',#{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}
@@ -43,10 +41,8 @@
AND a.name = #{csDevModelQueryParm.name}
</if>
</select><select id="queryOne" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
SELECT a.*,
b.code as devName
SELECT a.*
FROM cs_dev_model a
LEFT JOIN sys_dict_data b ON a.dev_type = b.id
WHERE
1 = 1 And a.`status`='1'
<!-- <if test="csDevModelQueryListParm.versionStartDate != null and csDevModelQueryListParm.versionStartDate != ''">-->
@@ -67,7 +63,7 @@
AND a.dev_type = #{csDevModelQueryListParm.devType}
</if>
<if test="csDevModelQueryListParm.devName != null and csDevModelQueryListParm.devName != ''">
AND b.code = #{csDevModelQueryListParm.devName}
AND a.dev_type_name = #{csDevModelQueryListParm.devName}
</if>
<if test="csDevModelQueryListParm.name != null and csDevModelQueryListParm.name != ''">
AND a.name = #{csDevModelQueryListParm.name}

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

@@ -24,10 +24,7 @@
`status`, file_path, create_by, create_time, update_by, update_time
</sql>
<select id="getPage" resultType="com.njcn.csdevice.pojo.vo.CsEdDataVO">
SELECT a.*,
b.code as devName
FROM cs_ed_data a
LEFT JOIN sys_dict_data b ON a.dev_type = b.id
SELECT a.* FROM cs_ed_data a
WHERE
1 = 1
<if test="csEdDataQueryParm.versionStartDate != null and csEdDataQueryParm.versionStartDate != ''">
@@ -38,7 +35,7 @@
</if>
<if test="csEdDataQueryParm.devName != null and csEdDataQueryParm.devName != ''">
AND b.CODE LIKE concat('%',#{csEdDataQueryParm.devName},'%')
AND a.dev_type_name LIKE concat('%',#{csEdDataQueryParm.devName},'%')
</if>
<if test="csEdDataQueryParm.devType != null and csEdDataQueryParm.devType != ''">
AND a.dev_type = #{csEdDataQueryParm.devType}