admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guo 2024-01-22 14:20:44 +08:00
parent c6bfeddb02
commit 2083e3fee3
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java
View File

@ -125,10 +125,14 @@ public class FrontierProtectionNoNetData implements Serializable {
@ApiModelProperty(value = "操作时间") @ApiModelProperty(value = "操作时间")
private java.util.Date operateTime; private java.util.Date operateTime;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "设备名称") @ApiModelProperty(value = "设备名称")
private java.lang.String devName; private java.lang.String devName;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "设备位置") @ApiModelProperty(value = "设备位置")
private java.lang.String location; private java.lang.String location;
@TableField(exist = false)
@ApiModelProperty(value = "操作人")
private java.lang.String operateName;
} }

2
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDataMapper"> <mapper namespace="com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDataMapper">
<select id="queryList" <select id="queryList"
resultType="com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData"> resultType="com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData">
select fpnnd.*,fpd.location,fpd.dev_name from frontier_protection_no_net_data fpnnd select fpnnd.*,fpd.location,fpd.dev_name,su.real_name operateName from frontier_protection_no_net_data fpnnd
join frontier_protection_dev fpd on fpd.dev_sn=fpnnd.dev_sn join frontier_protection_dev fpd on fpd.dev_sn=fpnnd.dev_sn
left join system_user su on su.user_id=fpnnd.operate_id left join system_user su on su.user_id=fpnnd.operate_id
${ew.customSqlSegment} ${ew.customSqlSegment}