Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

添加字段

Browse Source
This commit is contained in:
huangzj
2023-04-17 11:11:54 +08:00
parent 5c90d14d74
commit 709e47c61d
7 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAddParm.java
View File

@@ -27,6 +27,10 @@ public class CsDevModelAddParm {
@ApiModelProperty(value = "装置型号")
private String devType;
@ApiModelProperty(value = "模板名称")
private String name;
/**
* 版本号
*/

3
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAuditParm.java
View File

@@ -28,7 +28,8 @@ public class CsDevModelAuditParm {
*/
@ApiModelProperty(value = "装置型号")
private String devType;
@ApiModelProperty(value = "模板名称")
private String name;
/**
* 版本号
*/

6
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java
View File

@@ -23,11 +23,13 @@ public class CsDevModelQueryListParm {
/**
* 装置型号(字典数据)
*/
@ApiModelProperty(value = "装置型号")
@ApiModelProperty(value = "装置模板型号")
private String devType;
@ApiModelProperty(value = "装置型号名称")
@ApiModelProperty(value = "装置模板型号名称")
private String devName;
@ApiModelProperty(value = "模板名称")
private String name;
@ApiModelProperty(value = "版本号")
private String versionNo;

7
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryParm.java
View File

@@ -33,11 +33,12 @@ public class CsDevModelQueryParm {
/**
* 装置型号(字典数据)
*/
@ApiModelProperty(value = "装置型号")
@ApiModelProperty(value = "装置模板型号")
private String devType;
@ApiModelProperty(value = "装置名称")
@ApiModelProperty(value = "装置模板型号名称")
private String devName;
@ApiModelProperty(value = "模板名称")
private String name;
/**
* 版本日期

6
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsDevModelPO.java
View File

@@ -36,6 +36,12 @@ public class CsDevModelPO extends BaseEntity {
@TableField(value = "dev_type")
private String devType;
/**
* 模板名称
*/
@TableField(value = "模板名称")
private String name;
/**
* 版本号
*/

7
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java
View File

@@ -29,11 +29,12 @@ public class CsDevModelPageVO extends BaseEntity {
/**
* 设备型号(字典数据)
*/
@ApiModelProperty(value = "设备型号")
@ApiModelProperty(value = "设备模板型号id")
private String devType;
@ApiModelProperty(value = "设备名称")
@ApiModelProperty(value = "设备模板型号id名称")
private String devName;
@TableField(value = "模板名称")
private String name;
/**
* 版本号

11
pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml
View File

@@ -39,6 +39,9 @@
<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>
</select><select id="queryList" resultType="com.njcn.algorithm.pojo.vo.CsDevModelPageVO">
SELECT a.*,
b.code as devName
@@ -63,8 +66,12 @@
<if test="csDevModelQueryListParm.devType != null and csDevModelQueryListParm.devType != ''">
AND a.dev_type = #{csDevModelQueryListParm.devType}
</if>
<if test="csDevModelQueryListParm.devName != null and csDevModelQueryListParm.devName != ''">
AND b.code = #{csDevModelQueryListParm.devName}
<if test="csDevModelQueryListParm.devName != null and csDevModelQueryListParm.devName != ''">
AND b.code = #{csDevModelQueryListParm.devName}
</if>
<if test="csDevModelQueryListParm.name != null and csDevModelQueryListParm.name != ''">
AND a.name = #{csDevModelQueryListParm.name}
</if>
</select>
</mapper>