ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 80264 未符合项-查询条件工作令编号失效

Browse Source 
fix 80261 未符合项-查询 建议改成模糊查询
fix 80820 未符合项--建议查询条件增加设计工程师
This commit is contained in:
lijiarao
2024-01-25 16:27:08 +08:00
parent c3064401c9
commit 493ad9c6c5
5 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
+12 -2
View File
@@ -54,6 +54,8 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
//企业标准
@Resource
private ILawsEnterpriseStandardService lawsEnterpriseStandardService;
@Resource
private LawsEvaluationNotMetMapper notMetMapper;
/**
* 分页查询
*
@@ -67,8 +69,16 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
public IPage<LawsEvaluationNotMet> queryPage(LawsEvaluationNotMet lawsEvaluationNotMet, Integer pageNo, Integer pageSize,
HttpServletRequest req) {
QueryWrapper<LawsEvaluationNotMet> queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, req.getParameterMap());
Page<LawsEvaluationNotMet> page = new Page<>(pageNo, pageSize);
return page(page, queryWrapper);
String engineerName = lawsEvaluationNotMet.getEngineerName();
if (StringUtils.isNotBlank(engineerName)){
queryWrapper.like("su.realname",engineerName);
}
String workNumber = lawsEvaluationNotMet.getWorkNumber();
if (StringUtils.isNotBlank(workNumber)){
queryWrapper.like("lpl.work_number",workNumber);
}
Page<LawsEvaluationNotMet> page = new Page<>(pageNo, pageSize);
return notMetMapper.pageList(page,queryWrapper,lawsEvaluationNotMet);
}
@Override