multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/QualityController.java
@@ -555,6 +555,18 @@ return CommonResult.success(catalogueService.selectCatalogueDocumentList(catalogueReq)); } /** * 项目评审下拉数据 * @param catalogueReq * @return */ @ApiOperation(value = "项目评审下拉数据") @GetMapping("/document/listAll") public CommonResult listAllProjectDocument(CatalogueReq catalogueReq){ return CommonResult.success(catalogueService.selectCatalogueDocumentListAll(catalogueReq)); } } multi-system/src/main/java/com/gkhy/exam/system/domain/ItemReview.java
@@ -102,6 +102,9 @@ @TableField("product_item_ids") private String productItemIds; @TableField("process_item_ids") private String processItemIds; @TableField("del_flag") private Integer delFlag; @@ -122,7 +125,9 @@ private Integer status; @TableField(exist = false) private List<ProductItem> productItems; private List<ProjectDocument> projectDocuments; @TableField(exist = false) private List<ProcessInspection> processInspections; @TableField(exist = false) private List<ItemReviewUser> reviewUsers; multi-system/src/main/java/com/gkhy/exam/system/domain/vo/ItemReviewUserVo.java
@@ -1,7 +1,10 @@ package com.gkhy.exam.system.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.gkhy.exam.system.domain.ItemReviewUser; import com.gkhy.exam.system.domain.ProcessInspection; import com.gkhy.exam.system.domain.ProductItem; import com.gkhy.exam.system.domain.ProjectDocument; import lombok.Data; import java.util.List; @@ -12,5 +15,7 @@ private String stage; private String reviewContent; private String productItemIds; private List<ProductItem> productItems; private String processItemIds; private List<ProjectDocument> projectDocuments; private List<ProcessInspection> processInspections; } multi-system/src/main/java/com/gkhy/exam/system/service/CatalogueService.java
@@ -39,4 +39,6 @@ CommonResult copyCatalogue(List<CatalogueVo> catalogue); CommonResult selectCatalogueDocumentList(CatalogueReq catalogueReq); CommonResult selectCatalogueDocumentListAll(CatalogueReq catalogueReq); } multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
@@ -16,8 +16,10 @@ import com.gkhy.exam.system.mapper.ProductItemMapper; import com.gkhy.exam.system.mapper.SysCompanyMapper; import com.gkhy.exam.system.service.CatalogueService; import com.gkhy.exam.system.service.ProcessInspectionService; import com.gkhy.exam.system.service.ProjectDocumentService; import com.gkhy.exam.system.service.SysCompanyService; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,7 +27,9 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @Service @@ -41,6 +45,9 @@ private ProductItemMapper productItemMapper; @Autowired private ProjectDocumentService projectDocumentService; @Autowired private ProcessInspectionService processInspectionService; /** * 目录管理 @@ -281,6 +288,23 @@ return CommonResult.success(collect); } @Override public CommonResult selectCatalogueDocumentListAll(CatalogueReq catalogueReq) { Map<String, Object> parm = new HashMap<>(); parm.put("company_id",catalogueReq.getCompanyId()); parm.put("item_id",catalogueReq.getItemId()); parm.put("del_flag",1); List<ProjectDocument> projectDocuments = projectDocumentService.listByMap(parm); parm.put("del_flag",0); List<ProcessInspection> processInspections = processInspectionService.listByMap(parm); Map<String, Object> resultMap = new HashMap<>(); resultMap.put("paojectDocuments",projectDocuments); resultMap.put("processInspections",processInspections); return CommonResult.success(resultMap); } private void saveCatalogue(List<CatalogueVo> children,Catalogue catalogue) { for (CatalogueVo child : children) { Catalogue catalogue1 = new Catalogue(); multi-system/src/main/java/com/gkhy/exam/system/service/impl/ItemReviewServiceImpl.java
@@ -6,14 +6,14 @@ import com.gkhy.exam.common.utils.PageUtils; import com.gkhy.exam.common.utils.SecurityUtils; import com.gkhy.exam.common.utils.StringUtils; import com.gkhy.exam.system.domain.ItemReview; import com.gkhy.exam.system.domain.ItemReviewUser; import com.gkhy.exam.system.domain.ProductItem; import com.gkhy.exam.system.domain.*; import com.gkhy.exam.system.domain.vo.ItemReviewUserVo; import com.gkhy.exam.system.mapper.ItemReviewMapper; import com.gkhy.exam.system.mapper.ItemReviewUserMapper; import com.gkhy.exam.system.mapper.ProductItemMapper; import com.gkhy.exam.system.service.ItemReviewService; import com.gkhy.exam.system.service.ProcessInspectionService; import com.gkhy.exam.system.service.ProjectDocumentService; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +36,12 @@ @Autowired private ProductItemMapper productItemMapper; @Autowired private ProjectDocumentService projectDocumentService; @Autowired private ProcessInspectionService processInspectionService; @Override public CommonPage selectItemList(ItemReview itemReview) { @@ -51,9 +57,16 @@ List<ItemReviewUser> itemReviewUsers = itemReviewUserMapper.selectByReviewId(review.getId()); review.setReviewUsers(itemReviewUsers); } List<String> list = Arrays.asList(review.getProductItemIds().split(",")); List<ProductItem> productItems = productItemMapper.selectBatchIds(list); review.setProductItems(productItems); if (!StringUtils.isEmpty(review.getProductItemIds())){ List<String> list = Arrays.asList(review.getProductItemIds().split(",")); List<ProjectDocument> projectDocuments = projectDocumentService.listByIds(list); review.setProjectDocuments(projectDocuments); } if (StringUtils.isNotBlank(review.getProcessItemIds())){ List<String> list2 = Arrays.asList(review.getProcessItemIds().split(",")); List<ProcessInspection> processInspections = processInspectionService.listByIds(list2); review.setProcessInspections(processInspections); } } return CommonPage.restPage(itemReviews); } @@ -127,9 +140,16 @@ public CommonResult approvalList(Integer userId) { List<ItemReviewUserVo> itemReviewUserVos = itemReviewUserMapper.selectByUserId(userId); for (ItemReviewUserVo itemReviewUserVo : itemReviewUserVos) { List<String> list = Arrays.asList(itemReviewUserVo.getProductItemIds().split(",")); List<ProductItem> productItems = productItemMapper.selectBatchIds(list); itemReviewUserVo.setProductItems(productItems); if (!StringUtils.isEmpty(itemReviewUserVo.getProductItemIds())){ List<String> list = Arrays.asList(itemReviewUserVo.getProductItemIds().split(",")); List<ProjectDocument> projectDocuments = projectDocumentService.listByIds(list); itemReviewUserVo.setProjectDocuments(projectDocuments); } if (StringUtils.isNotBlank(itemReviewUserVo.getProcessItemIds())){ List<String> list2 = Arrays.asList(itemReviewUserVo.getProcessItemIds().split(",")); List<ProcessInspection> processInspections = processInspectionService.listByIds(list2); itemReviewUserVo.setProcessInspections(processInspections); } } return CommonResult.success(itemReviewUserVos); } multi-system/src/main/java/com/gkhy/exam/system/service/useSealApply/impl/UseSealApplyServiceImpl.java
@@ -157,6 +157,8 @@ List<UseSealApply> useSealApplies = useSealApplyMapper.selectUseApplyByUserId(userId); for (UseSealApply sealApply : useSealApplies) { List<UseSealApplyFlow> useSealApplyFlows = flowMapper.selectByUseSealId(sealApply.getId()); List<UseSealApplyFile> useSealApplyFiles = fileMapper.selectByUseSealId(sealApply.getId()); sealApply.setFiles(useSealApplyFiles); sealApply.setFlows(useSealApplyFlows); } return CommonResult.success(useSealApplies); multi-system/src/main/resources/mapper/system/ItemReviewMapper.xml
@@ -17,6 +17,7 @@ ir.`review_level`, ir.`review_content`, ir.`product_item_ids`, ir.`process_item_ids`, ir.`del_flag`, ir.`create_by`, ir.`create_time`, multi-system/src/main/resources/mapper/system/ItemReviewUserMapper.xml
@@ -56,6 +56,7 @@ ir.`stage`, ir.`review_content`, ir.`product_item_ids`, ir.`process_item_ids`, i.item_name FROM `item_review_user` iru
