feat: 在查询中增加专业化模块筛选条件

- 在LawsConformityAssessmentLibraryServiceImpl和LawsEvaluationNotMetLibraryServiceImpl中,分别为conformity和non-conformity查询添加了专业化模块(specialized_module)的筛选条件。
- 这个修改使得用户可以根据专业化模块进行更精确的查询,提高了系统的筛选功能和用户体验。
This commit is contained in:
2024-10-14 16:00:40 +08:00
parent ee58781ef2
commit 86dca29a44
2 changed files with 4 additions and 0 deletions
@@ -132,6 +132,8 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
"model", lawsConformityAssessmentLibraryDetail.getModel()); "model", lawsConformityAssessmentLibraryDetail.getModel());
queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getResult()), queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getResult()),
"result", lawsConformityAssessmentLibraryDetail.getResult()); "result", lawsConformityAssessmentLibraryDetail.getResult());
queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getSpecializedModule()),
"specialized_module", lawsConformityAssessmentLibraryDetail.getSpecializedModule());
if (StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getAuthDept())) { if (StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getAuthDept())) {
queryWrapper.in("auth_dept", Arrays.asList(lawsConformityAssessmentLibraryDetail.getAuthDept().split(","))); queryWrapper.in("auth_dept", Arrays.asList(lawsConformityAssessmentLibraryDetail.getAuthDept().split(",")));
} }
@@ -79,6 +79,8 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
} }
queryWrapper.eq(StringUtils.isNotBlank(lawsEvaluationNotMet.getRectifyStatus()), queryWrapper.eq(StringUtils.isNotBlank(lawsEvaluationNotMet.getRectifyStatus()),
"nm.rectify_status", lawsEvaluationNotMet.getRectifyStatus()); "nm.rectify_status", lawsEvaluationNotMet.getRectifyStatus());
queryWrapper.eq(StringUtils.isNotBlank(lawsEvaluationNotMet.getSpecializedModule()),
"nm.specialized_module", lawsEvaluationNotMet.getSpecializedModule());
queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getPcrNo()), queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getPcrNo()),
"nm.pcr_no", lawsEvaluationNotMet.getPcrNo()); "nm.pcr_no", lawsEvaluationNotMet.getPcrNo());
if (StringUtils.isNotBlank(lawsEvaluationNotMet.getSelections())) { if (StringUtils.isNotBlank(lawsEvaluationNotMet.getSelections())) {