温度监测
This commit is contained in:
parent
586acd1037
commit
ec5ca72d97
|
|
@ -107,6 +107,7 @@ public class SimconfigController extends JeecgController<Simconfig, SimconfigSer
|
|||
customeRuleMap.put("sim", QueryRuleEnum.LIKE_WITH_OR);
|
||||
QueryWrapper<Simconfig> queryWrapper = QueryGenerator.initQueryWrapper(simconfig, req.getParameterMap(),customeRuleMap);
|
||||
queryWrapper.eq("region_type",simconfig.getRegionType());
|
||||
queryWrapper.orderByAsc("company_company_id,source_source_id,station_station_id");
|
||||
Page<Simconfig> page = new Page<Simconfig>(pageNo, pageSize);
|
||||
IPage<Simconfig> pageList = simconfigService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
|
|
|
|||
|
|
@ -104,4 +104,6 @@ public class Heatsourcestation implements Serializable {
|
|||
private String delFlag; // 删除标识
|
||||
@TableField(exist = false)
|
||||
private String typeFlag; // 类型标识 1热源 2换热站
|
||||
@TableField(exist = false)
|
||||
private String regionType; // 地区类型 城区 郊县
|
||||
}
|
||||
|
|
@ -89,6 +89,9 @@
|
|||
<if test="dutyPeople != null and dutyPeople != ''">
|
||||
AND a.duty_people LIKE concat('%',#{dutyPeople},'%')
|
||||
</if>
|
||||
<if test="regionType != null and regionType != ''">
|
||||
AND a.region_type = #{regionType}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY a.id
|
||||
</select>
|
||||
|
|
@ -107,6 +110,9 @@
|
|||
<if test="companyId != null and companyId != ''">
|
||||
AND a.company_id = #{companyId}
|
||||
</if>
|
||||
<if test="regionType != null and regionType != ''">
|
||||
AND a.region_type = #{regionType}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY a.id
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -3,21 +3,27 @@
|
|||
<mapper namespace="org.jeecg.modules.heating.mapper.SimconfigMapper">
|
||||
<select id="findCompanyList" resultType="org.jeecg.modules.heating.entity.Simconfig">
|
||||
SELECT id as companyId, company_name as companyName
|
||||
FROM BL_thermalcompany a
|
||||
FROM bl_thermalcompany a
|
||||
<where>
|
||||
AND del_flag = '0'
|
||||
<if test="regionType != null and regionType != ''">
|
||||
AND a.region_type = #{regionType}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY a.id
|
||||
</select>
|
||||
|
||||
<select id="findSourceList" resultType="org.jeecg.modules.heating.entity.Simconfig">
|
||||
SELECT id as sourceId, source_name as sourceName
|
||||
FROM BL_heatsource a
|
||||
FROM bl_heatsource a
|
||||
<where>
|
||||
a.del_flag = '0'
|
||||
<if test="companyCompanyId != null and companyCompanyId != ''">
|
||||
AND a.company_id = #{companyCompanyId}
|
||||
</if>
|
||||
<if test="regionType != null and regionType != ''">
|
||||
AND a.region_type = #{regionType}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY a.id
|
||||
</select>
|
||||
|
|
|
|||
Loading…
Reference in New Issue