From 7fa48e98bd13ee65135cb5461388c074acde2117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Thu, 8 Aug 2024 17:49:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B0=B4=E5=8D=B0=E5=9B=BE?=
=?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/record/model/vo/ApplyLogVo.java | 2 ++
.../module/record/web/ApplyLogController.java | 22 +++++++++++++++----
2 files changed, 20 insertions(+), 4 deletions(-)
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 1e635e5..4aa2290 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 39c6778..2c7b8bc 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);
}
--
2.24.3