diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index ab39e0243..e41276d3a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -3,6 +3,7 @@ package com.jero.modules.cert.template.controller; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; @@ -66,10 +67,11 @@ public class ParamsInfoEOController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId()) - .like(StringUtils.isNotEmpty(paramsInfoEO.getNioNumber()), ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber()) - .like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), ParamsInfoEO::getParamsName, paramsInfoEO.getParamsName()) - .eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), ParamsInfoEO::getDutyTerritory, paramsInfoEO.getDutyTerritory()) - .orderBy(true, "asc".equals(orderBy)?true:false, ParamsInfoEO::getNioNumber); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pi.params_template_id", paramsInfoEO.getParamsTemplateId()) + .and(StringUtils.isNotEmpty(allNumber), wrapper->wrapper.eq("pi.nio_number", allNumber).or().eq("ccpi.params_number", allNumber)) + .like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), "pi.params_name", paramsInfoEO.getParamsName()) + .eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), "pi.duty_territory", paramsInfoEO.getDutyTerritory()) + .orderBy(true, "asc".equals(orderBy)?true:false, "pi.nio_number"); Page page = new Page(pageNo, pageSize); - IPage pageList = paramsInfoEOService.page(page, queryWrapper); +// IPage pageList = paramsInfoEOService.page(page, queryWrapper); + IPage pageList = paramsInfoEOService.selectpage(page, queryWrapper); // List rows = pageList.getRecords(); // paramsInfoEOService.getTreeDictItemText(rows, cut); return Result.OK(cut, pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java index 70c378fc1..267f93f6e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java @@ -1,9 +1,11 @@ package com.jero.modules.cert.template.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.vo.ParamsInfoEnExport; import com.jero.modules.cert.template.vo.ParamsInfoVO; -import com.jero.modules.cert.template.entity.ParamsInfoEO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,4 +26,7 @@ public interface ParamsInfoEOMapper extends BaseMapper { List selectListByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); + IPage selectpage(@Param("page") IPage page, @Param("ew") Wrapper queryWrapper); + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml index 7416091d5..55da74b69 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml @@ -177,4 +177,10 @@ + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java index 986b78b11..7f149fc53 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java @@ -1,5 +1,7 @@ package com.jero.modules.cert.template.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.modules.cert.template.entity.ParamsInfoEO; @@ -100,4 +102,6 @@ public interface IParamsInfoEOService extends IService { int deleteByParamsTemplateIds(String paramsTemplateIds); List selectListByParamsTemplateIds(String paramsTemplateIds); + + IPage selectpage(IPage page, Wrapper queryWrapper); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 3c025261d..f41bf40a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -7,7 +7,9 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; import com.aliyuncs.utils.IOUtils; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; @@ -1824,4 +1826,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl selectListByParamsTemplateIds(String paramsTemplateIds) { return paramsInfoEOMapper.selectListByParamsTemplateIds(paramsTemplateIds); } + + @Override + public IPage selectpage(IPage page, Wrapper queryWrapper) { + return paramsInfoEOMapper.selectpage(page, queryWrapper); + } } diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 68c210b30..11a4bac88 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -5,11 +5,11 @@
-
- {{$t('NiONumber')}} +
+ {{$t('ParameterNo')}}
- +