Skip to content

A
amos-boot-biz
Commit e27bb50d authored by limei's avatar limei
Browse files
Options

标准规则库

parent c374e4c5
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 10 deletions
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/SuperviseRuleServiceImpl.java
View file @ e27bb50d
...@@ -38,22 +38,26 @@ public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,Super ...@@ -38,22 +38,26 @@ public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,Super
Long superviseDeptId = superviseRule.getSuperviseDeptId(); Long superviseDeptId = superviseRule.getSuperviseDeptId();
Long inspectionUnitId = superviseRule.getInspectionUnitId(); Long inspectionUnitId = superviseRule.getInspectionUnitId();
LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
if(!ValidationUtil.isEmpty(adminRegionCode)){ if(ValidationUtil.isEmpty(adminRegionCode)){
wrapper.eq(SuperviseRule::getAdminRegionCode,adminRegionCode); return null;
}else {
// if(!ValidationUtil.isEmpty(adminRegionCode)){
// wrapper.eq(SuperviseRule::getAdminRegionCode, adminRegionCode);
// }
wrapper.eq(SuperviseRule::getAdminRegionCode, adminRegionCode);
} }
if(!ValidationUtil.isEmpty(superviseDeptId)){ if (!ValidationUtil.isEmpty(superviseDeptId)) {
wrapper.like(SuperviseRule::getSuperviseDeptId,superviseDeptId); wrapper.like(SuperviseRule::getSuperviseDeptId, superviseDeptId);
} }
if(!ValidationUtil.isEmpty(inspectionUnitId)){ if (!ValidationUtil.isEmpty(inspectionUnitId)) {
wrapper.like(SuperviseRule::getInspectionUnitId,inspectionUnitId); wrapper.like(SuperviseRule::getInspectionUnitId, inspectionUnitId);
} }
page = this.page(page, wrapper);
page = this.page(page,wrapper);
List<SuperviseRule> superviseRuleList = page.getRecords(); List<SuperviseRule> superviseRuleList = page.getRecords();
List<SuperviseRuleDto> superviseRuleDtoList = new ArrayList<>(); List<SuperviseRuleDto> superviseRuleDtoList = new ArrayList<>();
for(SuperviseRule rule: superviseRuleList){ for (SuperviseRule rule : superviseRuleList) {
SuperviseRuleDto superviseRuleDto = new SuperviseRuleDto(); SuperviseRuleDto superviseRuleDto = new SuperviseRuleDto();
BeanUtils.copyProperties(rule,superviseRuleDto); BeanUtils.copyProperties(rule, superviseRuleDto);
superviseRuleDto.setSuperviseDept(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getSuperviseDeptId())).getBizOrgName()); superviseRuleDto.setSuperviseDept(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getSuperviseDeptId())).getBizOrgName());
superviseRuleDto.setInspectionUnit(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getInspectionUnitId())).getBizOrgName()); superviseRuleDto.setInspectionUnit(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getInspectionUnitId())).getBizOrgName());
superviseRuleDto.setCreateUnit(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getCreateUnitId())).getBizOrgName()); superviseRuleDto.setCreateUnit(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getCreateUnitId())).getBizOrgName());
...@@ -61,6 +65,7 @@ public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,Super ...@@ -61,6 +65,7 @@ public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,Super
} }
page.setRecords(superviseRuleDtoList); page.setRecords(superviseRuleDtoList);
return page; return page;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment