添加材料分类字段

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java

@@ -28,5 +28,14 @@ public class MatterDatumVo extends BaseEntityLong {
 
     private Integer pub;
 
+    /**
+     * 分类id
+     */
+    private Long categoryId;
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
 
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

 package com.mortals.xhx.module.matter.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.text.StrSplitter;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
-import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
-import com.deepoove.poi.config.ConfigureBuilder;
-import com.deepoove.poi.data.PictureRenderData;
-import com.deepoove.poi.data.PictureType;
-import com.deepoove.poi.data.Pictures;
-import com.deepoove.poi.plugin.table.MultipleRowTableRenderPolicy;
-import com.deepoove.poi.template.MetaTemplate;
-import com.deepoove.poi.util.RegexUtils;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.StringUtils;
-import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.base.system.upload.service.UploadService;
-import com.mortals.xhx.common.code.ComponentEnum;
-import com.mortals.xhx.common.code.MatterSourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.common.formdesign.*;
 import com.mortals.xhx.common.key.Constant;
-import com.mortals.xhx.common.key.ParamKey;
-import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.common.utils.ExportDocUtil;
 import com.mortals.xhx.common.utils.WordUtil;
-import com.mortals.xhx.module.matter.dao.MatterDao;
+import com.mortals.xhx.module.datum.model.DatumCategoryEntity;
+import com.mortals.xhx.module.datum.model.DatumCategoryQuery;
+import com.mortals.xhx.module.datum.service.DatumCategoryService;
+import com.mortals.xhx.module.matter.dao.MatterDatumDao;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
 import com.mortals.xhx.module.matter.model.MatterDatumQuery;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
+import com.mortals.xhx.module.matter.service.MatterDatumService;
 import com.mortals.xhx.module.matter.service.MatterService;
 import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
 import com.mortals.xhx.module.pubdatum.service.PubdatumService;
-import com.mortals.xhx.module.sheet.model.SheetMatterEntity;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.http.entity.ContentType;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.xhx.module.matter.dao.MatterDatumDao;
-import com.mortals.xhx.module.matter.model.MatterDatumEntity;
-import com.mortals.xhx.module.matter.service.MatterDatumService;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -80,6 +54,8 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     private MatterService matterService;
     @Autowired
     private PubdatumService pubdatumService;
+    @Autowired
+    private DatumCategoryService datumCategoryService;
 
     public static String word[] = {"doc", "dot", "wps", "wpt", "docx", "dotx", "docm", "dotm"};
 
@@ -289,7 +265,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         for (MatterEntity matterEntity : matterEntities) {
             recommendCount += this.count(new MatterDatumQuery().matterId(matterEntity.getId()).isRecommend(YesNoEnum.YES.getValue()), context);
         }
-        if (!ObjectUtils.isEmpty(matterDatumEntity.getIsRecommend() )&&matterDatumEntity.getIsRecommend() == YesNoEnum.NO.getValue()) {
+        if (!ObjectUtils.isEmpty(matterDatumEntity.getIsRecommend()) && matterDatumEntity.getIsRecommend() == YesNoEnum.NO.getValue()) {
             if (recommendCount >= GlobalSysInfo.getParamIntValue(Constant.PARAMS_RECOMMEND_COUNT, 7)) {
                 throw new AppException("超过推荐个数!");
             }
@@ -304,11 +280,28 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
 
     @Override
     protected void findAfter(MatterDatumEntity params, PageInfo pageInfo, Context context, List<MatterDatumEntity> list) throws AppException {
+        List<Long> matterIdList = list.stream().map(item -> item.getMatterId()).collect(Collectors.toList());
+        MatterQuery matterQuery = new MatterQuery();
+        matterQuery.setIdList(matterIdList);
+        Map<Long, MatterEntity> matterEntityMap = matterService.find(matterQuery).stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
+
+        DatumCategoryQuery datumCategoryQuery = new DatumCategoryQuery();
+        datumCategoryQuery.setMaterialIdList(matterIdList);
+        Map<Long, DatumCategoryEntity> collect = datumCategoryService.find(datumCategoryQuery).stream().collect(Collectors.toMap(x -> x.getMaterialId(), y -> y, (o, n) -> n));
         list.stream().forEach(entity -> {
-            MatterEntity matterEntity = matterService.get(entity.getMatterId(), context);
-            if (!ObjectUtils.isEmpty(matterEntity)) {
-                entity.setMatterNo(matterEntity.getMatterNo());
-                entity.setMatterName(matterEntity.getMatterName());
+            if (!ObjectUtils.isEmpty(matterEntityMap)) {
+                MatterEntity matterEntity = matterEntityMap.get(entity.getMatterId());
+                if (!ObjectUtils.isEmpty(matterEntity)) {
+                    entity.setMatterNo(matterEntity.getMatterNo());
+                    entity.setMatterName(matterEntity.getMatterName());
+                }
+            }
+            if (!ObjectUtils.isEmpty(collect)) {
+                DatumCategoryEntity datumCategoryEntity = collect.get(entity.getId());
+                if (!ObjectUtils.isEmpty(datumCategoryEntity)) {
+                    entity.setCategoryId(datumCategoryEntity.getCategoryId());
+                    entity.setCategoryName(datumCategoryEntity.getCategoryName());
+                }
             }
         });
         super.findAfter(params, pageInfo, context, list);