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

1.暂降列表查询报错解决

Browse Source
This commit is contained in:
chendaofei
2024-11-22 13:32:49 +08:00
parent d681bdedfe
commit 2c9d17c0ff
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml
View File

@@ -49,7 +49,7 @@
</where> </where>
) UNION ALL ) UNION ALL
( /* (
SELECT SELECT
ppd.id, ppd.id,
ppd.Name, ppd.Name,
@@ -62,7 +62,7 @@
ppd.Line_Name ppd.Line_Name
FROM FROM
pms_power_distributionarea AS ppd pms_power_distributionarea AS ppd
) UNION ALL ) UNION ALL*/
( (
SELECT SELECT
ppc.id, ppc.id,
@@ -176,7 +176,7 @@
</foreach> </foreach>
</if> </if>
</where> </where>
) UNION ALL ) /*UNION ALL
( (
SELECT SELECT
ppd.id, ppd.id,
@@ -191,7 +191,7 @@
FROM FROM
pms_power_distributionarea AS ppd pms_power_distributionarea AS ppd
) )
) AS monitor ) AS monitor*/
INNER JOIN pms_distribution_monitor AS pdm ON monitor.id = pdm.Monitor_Id INNER JOIN pms_distribution_monitor AS pdm ON monitor.id = pdm.Monitor_Id
WHERE WHERE
monitor.Status = 1 monitor.Status = 1

4
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java
View File

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -121,7 +121,7 @@ public class RmpEventDetailPO implements Serializable {
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty(value = "用于计算数量") @ApiModelProperty(value = "用于计算数量")
@Transient @TableField(exist = false)
private Integer count; private Integer count;
} }