master
周文涛 2 years ago
parent f9e2b5401f
commit 2775305af5

@ -87,15 +87,15 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
if (StringUtils.isNotBlank(ocrRuleCheck.getConfigName())) { /*if (StringUtils.isNotBlank(ocrRuleCheck.getConfigName())) {
ocrRuleCheck.setConfigName("*" + ocrRuleCheck.getConfigName() + "*"); ocrRuleCheck.setConfigName("*" + ocrRuleCheck.getConfigName() + "*");
} }*/
/*if (StringUtils.isNotBlank(ocrRuleCheck.getResultName())){ /*if (StringUtils.isNotBlank(ocrRuleCheck.getResultName())){
ocrRuleCheck.setResultName("*"+ocrRuleCheck.getResultName()+"*"); ocrRuleCheck.setResultName("*"+ocrRuleCheck.getResultName()+"*");
}*/ }*/
if (StringUtils.isNotBlank(ocrRuleCheck.getConfigRule())) { /*if (StringUtils.isNotBlank(ocrRuleCheck.getConfigRule())) {
ocrRuleCheck.setConfigRule("*" + ocrRuleCheck.getConfigRule() + "*"); ocrRuleCheck.setConfigRule("*" + ocrRuleCheck.getConfigRule() + "*");
} }*/
Page<OcrRuleCheck> page = new Page<OcrRuleCheck>(pageNo, pageSize); Page<OcrRuleCheck> page = new Page<OcrRuleCheck>(pageNo, pageSize);
IPage<OcrRuleCheckVo> pageList = ocrRuleCheckService.pageVo(page, ocrRuleCheck); IPage<OcrRuleCheckVo> pageList = ocrRuleCheckService.pageVo(page, ocrRuleCheck);
return Result.OK(pageList); return Result.OK(pageList);

@ -118,6 +118,8 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
@Override @Override
public IPage<OcrRuleCheckVo> pageVo(Page<OcrRuleCheck> page, OcrRuleCheck ocrRuleCheck) { public IPage<OcrRuleCheckVo> pageVo(Page<OcrRuleCheck> page, OcrRuleCheck ocrRuleCheck) {
Map<String,Object> params=new LinkedHashMap<>(); Map<String,Object> params=new LinkedHashMap<>();
params.put("configName",ocrRuleCheck.getConfigName());
params.put("configRule",ocrRuleCheck.getConfigRule());
return baseMapper.pageVo(page,params); return baseMapper.pageVo(page,params);
} }

Loading…
Cancel
Save