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

高支模测量bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-05-23 13:55:14 +08:00
parent c4fad709f7
commit b529d8282b
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java
View File

@ -66,15 +66,28 @@ public class HighFormworkAlarmData implements Serializable {
@ApiModelProperty(value = "项目SN")
private java.lang.String projectSn;
@ApiModelProperty(value = "测量点名称")
@TableField(exist = false)
private java.lang.String measurePointName;
@ApiModelProperty(value = "测量点名称")
@TableField(exist = false)
private java.lang.String measurePointName;
@TableField(exist = false)
private java.lang.String createTime_begin;
@TableField(exist = false)
private java.lang.String createTime_begin;
@TableField(exist = false)
private java.lang.String createTime_end;
@TableField(exist = false)
private java.lang.String createTime_end;
/**
* 测量点编号
*/
@TableField(exist = false)
@ApiModelProperty(value = "测量点编号")
private java.lang.String measurePointNumber;
/**
* 采集仪编号
*/
@TableField(exist = false)
@ApiModelProperty(value = "采集仪编号")
private java.lang.String acquisitionInstrumentNumber;
}

2
src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkAlarmDataMapper.java
View File

@ -21,7 +21,7 @@ import java.util.Map;
@Mapper
public interface HighFormworkAlarmDataMapper extends BaseMapper<HighFormworkAlarmData> {
IPage<HighFormworkAlarmData> queryPageList(Page<HighFormworkAlarmData> page, @Param("q") HighFormworkAlarmData highFormworkAlarmData);
IPage<HighFormworkAlarmData> queryPageList(Page<HighFormworkAlarmData> page, @Param("param") HighFormworkAlarmData highFormworkAlarmData);
List<NumberDifferentTypesAlarmsRadarChartOneMonthVo> getNumberDifferentTypesAlarmsRadarChartOneMonth(Map<String, Object> map);

22
src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml
View File

@ -6,16 +6,22 @@
FROM `high_formwork_alarm_data` hfad
INNER JOIN high_formwork_measure_point hfmp ON hfmp.id = hfad.measure_point_id
<where>
<if test="q.projectSn != null and q.projectSn != ''">
and hfmp.project_sn = #{q.projectSn}
<if test="param.projectSn != null and param.projectSn != ''">
and hfmp.project_sn = #{param.projectSn}
</if>
<if test="param2.createTime_begin != null and param2.createTime_begin != ''">
and hfad.create_time >= #{param2.createTime_begin}
<if test="param.createTime_begin != null and param.createTime_begin != ''">
and hfad.create_time >= #{param.createTime_begin}
</if>
<if test="param2.createTime_end != null and param2.createTime_end != ''">
and hfad.create_time >= #{param2.createTime_end}
and hfad.create_time <![CDATA[<=]]> if(LENGTH(#{param2.createTime_end}) = 10,
CONCAT(DATE_FORMAT(#{param2.createTime_end}, '%Y-%m-%d'), ' 23:59:59'), #{param2.createTime_end})
<if test="param.createTime_end != null and param.createTime_end != ''">
and hfad.create_time >= #{param.createTime_end}
and hfad.create_time <![CDATA[<=]]> if(LENGTH(#{param.createTime_end}) = 10,
CONCAT(DATE_FORMAT(#{param.createTime_end}, '%Y-%m-%d'), ' 23:59:59'), #{param.createTime_end})
</if>
<if test="param.acquisitionInstrumentNumber != null and param.acquisitionInstrumentNumber != ''">
and hfmp.acquisition_instrument_number = #{param.acquisitionInstrumentNumber}
</if>
<if test="param.measurePointNumber != null and param.measurePointNumber != ''">
and hfmp.measure_point_number = #{param.measurePointNumber}
</if>
</where>
order by hfad.create_time desc