diff --git a/one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/ApplyLogVo.java b/one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/ApplyLogVo.java index 1e635e52207d996fcfa4f7b50eb901597b56d44c..4aa2290f9205d43bfb102c938835c15419248af0 100644 --- a/one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/ApplyLogVo.java +++ b/one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/ApplyLogVo.java @@ -38,4 +38,6 @@ public class ApplyLogVo extends BaseEntityLong { */ private Long industryId; + private List <Long> catalogIdList; + } \ No newline at end of file diff --git a/one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java b/one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java index 39c6778750601533692899749371e6d6c29a99e6..2c7b8bce031cb1575af2a29aa5065f18cd429f32 100644 --- a/one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java +++ b/one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java @@ -16,10 +16,11 @@ import com.mortals.xhx.base.system.user.service.UserService; import com.mortals.xhx.common.code.*; import com.mortals.xhx.common.utils.ImportExcelUtil; import com.mortals.xhx.common.utils.ReadExcelPictureUtil; -import com.mortals.xhx.module.certificate.model.CertificateDocumentEntity; -import com.mortals.xhx.module.certificate.model.CertificateDocumentQuery; +import com.mortals.xhx.module.certificate.model.*; import com.mortals.xhx.module.certificate.model.vo.CertificateDocumentPdu; +import com.mortals.xhx.module.certificate.service.CertificateCatalogService; import com.mortals.xhx.module.certificate.service.CertificateDocumentService; +import com.mortals.xhx.module.certificate.service.CertificateIndustryService; import org.apache.poi.ss.usermodel.PictureData; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -73,6 +74,11 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL private CertificateDocumentService certificateDocumentService; @Autowired private UserService userService; + @Autowired + private CertificateIndustryService certificateIndustryService; + @Autowired + private CertificateCatalogService certificateCatalogService; + public ApplyLogController(){ super.setModuleDesc( "璇佺収鐢宠"); @@ -94,8 +100,16 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL if(!ObjectUtils.isEmpty(query.getIndustryId())){ //鑾峰彇琛屼笟涓庡瓙琛屼笟 - - //鑾峰彇瀵归槾鐩綍idlist; + CertificateIndustryEntity industryEntity = certificateIndustryService.get(query.getIndustryId()); + if(ObjectUtils.isEmpty(industryEntity)) return; + List<Long> industryIdList = certificateIndustryService.find(new CertificateIndustryQuery() + .ancestors(industryEntity.getAncestors() + "%")) + .stream().map(x -> x.getId()).collect(Collectors.toList()); + if(ObjectUtils.isEmpty(industryIdList)) return; + List<Long> catalogIdlist = certificateCatalogService.find(new CertificateCatalogQuery().industryIdList(industryIdList)) + .stream().map(x -> x.getId()).collect(Collectors.toList()); + if(ObjectUtils.isEmpty(catalogIdlist)) return; + query.setCatalogIdList(catalogIdlist); }