Commit effa07d5 authored by 高建强's avatar 高建强

item:修改直流中心告警列表分页

parent ec3daec6
...@@ -178,7 +178,7 @@ public class EquipmentAlarmController extends AbstractBaseController { ...@@ -178,7 +178,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
} }
/** /**
* 直流中心告警列表分页 * 直流中心告警列表分页,用于直流中心大数据查询分页,不建议再扩展联表查询
* *
* @return * @return
*/ */
...@@ -186,7 +186,6 @@ public class EquipmentAlarmController extends AbstractBaseController { ...@@ -186,7 +186,6 @@ public class EquipmentAlarmController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", produces = "application/json;charset=UTF-8", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", produces = "application/json;charset=UTF-8", notes = "列表分页查询")
public ResponseModel listPage(@RequestParam(value = "alarmType", required = false) String alarmType, public ResponseModel listPage(@RequestParam(value = "alarmType", required = false) String alarmType,
@RequestParam(value = "isNeedBiz", required = false) Boolean isNeedBiz,
CommonPageable commonPageable) { CommonPageable commonPageable) {
if (commonPageable.getPageNumber() == 0) { if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1); commonPageable.setPageNumber(1);
...@@ -196,15 +195,6 @@ public class EquipmentAlarmController extends AbstractBaseController { ...@@ -196,15 +195,6 @@ public class EquipmentAlarmController extends AbstractBaseController {
request.setName("alarmType"); request.setName("alarmType");
request.setValue(StringUtil.isNotEmpty(alarmType) ? StringUtils.trimToNull(alarmType) : null); request.setValue(StringUtil.isNotEmpty(alarmType) ? StringUtils.trimToNull(alarmType) : null);
queryRequests.add(request); queryRequests.add(request);
if (isNeedBiz != null && isNeedBiz) {
ReginParams reginParams = getSelectedOrgInfo();
if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
CommonRequest request1 = new CommonRequest();
request1.setName("bizOrgCode");
request1.setValue(StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null);
queryRequests.add(request1);
}
}
CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable); CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
Page<Map<String, Object>> list = iEquipmentSpecificAlarmService.zlzxListPage(param); Page<Map<String, Object>> list = iEquipmentSpecificAlarmService.zlzxListPage(param);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
......
...@@ -291,9 +291,6 @@ ...@@ -291,9 +291,6 @@
<if test="param.alarmType == 'BREAKDOWN'">AND wlesal.type = #{param.alarmType}</if> <if test="param.alarmType == 'BREAKDOWN'">AND wlesal.type = #{param.alarmType}</if>
<if test="param.alarmType == 'FIREALARM'">AND wlesal.type = #{param.alarmType}</if> <if test="param.alarmType == 'FIREALARM'">AND wlesal.type = #{param.alarmType}</if>
<if test="param.isFireAlarm == 'false'">AND wlesal.type != 'FIREALARM'</if> <if test="param.isFireAlarm == 'false'">AND wlesal.type != 'FIREALARM'</if>
<if test="param.bizOrgCode != null and param.bizOrgCode != ''">AND
wles.biz_org_code like concat (#{param.bizOrgCode},'%')
</if>
</where> </where>
ORDER BY wlesal.create_date DESC ORDER BY wlesal.create_date DESC
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment