|
|
|
@ -18,9 +18,7 @@ package org.energy.modules.leger.controller; |
|
|
|
|
import com.alibaba.excel.EasyExcel; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import com.dayu.daf.core.log.annotation.ApiLog; |
|
|
|
|
import com.dayu.daf.core.secure.DafUser; |
|
|
|
|
import com.dayu.daf.core.tool.constant.DafConstant; |
|
|
|
|
import com.qiniu.util.StringUtils; |
|
|
|
|
import com.xkcoding.http.util.StringUtil; |
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
@ -51,11 +49,8 @@ import springfox.documentation.annotations.ApiIgnore; |
|
|
|
|
|
|
|
|
|
import java.net.URLEncoder; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
import java.util.stream.Stream; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 设备台账编码一览 控制器 |
|
|
|
@ -90,7 +85,6 @@ public class EquipmentLedgerController extends DafController { |
|
|
|
|
@GetMapping("/list") |
|
|
|
|
@ApiOperationSupport(order = 2) |
|
|
|
|
@ApiOperation(value = "分页", notes = "传入equipmentLedger") |
|
|
|
|
// public R<IPage<EquipmentLedger>> list(@ApiIgnore @RequestParam Map<String, Object> equipmentLedger, Query query) {
|
|
|
|
|
public R<IPage<EquipmentLedger>> list(EquipmentLedger equipmentLedger, Query query) { |
|
|
|
|
QueryWrapper<EquipmentLedger> qw = new QueryWrapper<>(); |
|
|
|
|
qw.orderByAsc("eq_ledger_code"); |
|
|
|
|