添加材料排序

fill-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumPrintVo.java

@@ -19,4 +19,9 @@ public class MatterDatumPrintVo extends BaseEntityLong {
 
     /** 结束 创建时间 */
     private String createTimeEnd;
+
+
+    private String matterFullName;
+
+    private String materiaFullName;
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumPrintServiceImpl.java

 package com.mortals.xhx.module.matter.service.impl;
 
 import cn.hutool.core.util.IdUtil;
+import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.utils.WordUtil;
 import com.mortals.xhx.module.device.model.DeviceEntity;
@@ -21,6 +22,8 @@ import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumPrintService;
 import org.springframework.util.ObjectUtils;
 
+import java.util.List;
+
 /**
  * MatterDatumPrintService
  * 打印提交 service实现
@@ -70,4 +73,19 @@ public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterD
 
         super.saveBefore(entity, context);
     }
+
+
+    @Override
+    protected void findAfter(MatterDatumPrintEntity params, PageInfo pageInfo, Context context, List<MatterDatumPrintEntity> list) throws AppException {
+        super.findAfter(params, pageInfo, context, list);
+
+        list.stream().forEach(entity -> {
+            MatterEntity matterEntity = matterService.get(entity.getMatterId(), context);
+            if (!ObjectUtils.isEmpty(matterEntity)) {
+                entity.setMatterFullName(matterEntity.getMatterName());
+                entity.setMateriaFullName(entity.getMaterialName());
+            }
+        });
+
+    }
 }
\ No newline at end of file