zenglf
2023-09-28 1a9153391a21cc6c5cccb930024b13bd8fa0c6ed
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
@@ -12,6 +12,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
@@ -19,8 +26,12 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentUnsealDetail;
import org.jeecg.modules.eam.entity.EquipmentUnseal;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEquipmentUnsealDetailService;
import org.jeecg.modules.eam.service.IEquipmentUnsealService;
import org.jeecg.modules.eam.vo.EquipmentUnsealPage;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -74,9 +85,9 @@
   @ApiOperation(value="设备启封-分页列表查询", notes="设备启封-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<EquipmentUnseal>> queryPageList(EquipmentUnseal equipmentUnseal,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
                                          @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                          HttpServletRequest req) {
      //QueryWrapper<EquipmentUnseal> queryWrapper = QueryGenerator.initQueryWrapper(equipmentUnseal, req.getParameterMap());
      //Page<EquipmentUnseal> page = new Page<EquipmentUnseal>(pageNo, pageSize);
      QueryWrapper<EquipmentUnseal> queryWrapper = new QueryWrapper<>();