WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证-参数模板-编号搜索

Browse Source
This commit is contained in:
liyawei
2022-11-29 13:36:27 +08:00
parent 1c20e1c637
commit 34992878ce
6 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+12 -9
View File
@@ -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<ParamsInfoEO, IParams
@RequestParam(name="orderByField", required = false) String orderByField,
@RequestParam(name="orderBy", required = false) String orderBy,
@RequestParam(name="cut") String cut,
@RequestParam(name="allNumber") String allNumber,
HttpServletRequest req) {
if (StringUtils.isNotEmpty(paramsInfoEO.getNioNumber())) {
paramsInfoEO.setNioNumber(paramsInfoEO.getNioNumber().replace("%","\\%"));
if (StringUtils.isNotEmpty(allNumber)) {
paramsInfoEO.setNioNumber(allNumber.replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsInfoEO.getParamsName())) {
paramsInfoEO.setParamsName(paramsInfoEO.getParamsName().replace("%","\\%"));
@@ -79,14 +81,15 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
}
LambdaQueryWrapper<ParamsInfoEO> 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<ParamsInfoEO> 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<ParamsInfoEO> page = new Page<ParamsInfoEO>(pageNo, pageSize);
IPage<ParamsInfoEO> pageList = paramsInfoEOService.page(page, queryWrapper);
// IPage<ParamsInfoEO> pageList = paramsInfoEOService.page(page, queryWrapper);
IPage<ParamsInfoEO> pageList = paramsInfoEOService.selectpage(page, queryWrapper);
// List<ParamsInfoEO> rows = pageList.getRecords();
// paramsInfoEOService.getTreeDictItemText(rows, cut);
return Result.OK(cut, pageList);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java
+6 -1
View File
@@ -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<ParamsInfoEO> {
List<ParamsInfoEO> selectListByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds);
IPage selectpage(@Param("page") IPage page, @Param("ew") Wrapper<ParamsInfoEO> queryWrapper);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
+6
View File
@@ -177,4 +177,10 @@
</foreach>
</delete>
<select id="selectpage" resultMap="ParamsInfoEOResultMap">
select DISTINCT pi.*
from params_info pi
left join cert_category_params_info ccpi on pi.nio_number = ccpi.nio_number and pi.params_template_id = ccpi.params_template_id
${ew.customSqlSegment}
</select>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java
+4
View File
@@ -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<ParamsInfoEO> {
int deleteByParamsTemplateIds(String paramsTemplateIds);
List<ParamsInfoEO> selectListByParamsTemplateIds(String paramsTemplateIds);
IPage selectpage(IPage page, Wrapper<ParamsInfoEO> queryWrapper);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+7
View File
@@ -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<ParamsInfoEOMapper, Par
public List<ParamsInfoEO> selectListByParamsTemplateIds(String paramsTemplateIds) {
return paramsInfoEOMapper.selectListByParamsTemplateIds(paramsTemplateIds);
}
@Override
public IPage selectpage(IPage page, Wrapper<ParamsInfoEO> queryWrapper) {
return paramsInfoEOMapper.selectpage(page, queryWrapper);
}
}
jero-web/src/views/parameter/parameterlist/index.vue
+4 -4
View File
@@ -5,11 +5,11 @@
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('NiONumber')">
<span>{{$t('NiONumber')}}</span>
<div class="title-text" :title="$t('ParameterNo')">
<span>{{$t('ParameterNo')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NiONumber')"
v-model="queryParam.nioNumber"></a-input>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterNo')"
v-model="queryParam.allNumber"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">