添加材料排序

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

@@ -3,7 +3,11 @@ package com.mortals.xhx.module.matter.service.impl;
 import cn.hutool.core.util.IdUtil;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.utils.WordUtil;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.model.DeviceQuery;
+import com.mortals.xhx.module.device.service.DeviceService;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
 import com.mortals.xhx.module.matter.service.MatterService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,11 +32,11 @@ import org.springframework.util.ObjectUtils;
 public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterDatumPrintDao, MatterDatumPrintEntity, Long> implements MatterDatumPrintService {
 
     @Autowired
-    private UploadService uploadService;
+    private MatterDatumService matterDatumService;
     @Autowired
     private MatterService matterService;
     @Autowired
-    private MatterDatumService matterDatumService;
+    private DeviceService deviceService;
 
     @Value("${upload.path}")
     private String filePath;
@@ -40,6 +44,12 @@ public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterD
     @Override
     protected void saveBefore(MatterDatumPrintEntity entity, Context context) throws AppException {
         // MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
+        if (!ObjectUtils.isEmpty(entity.getMatterId())) {
+            MatterEntity matterEntity = matterService.get(entity.getMatterId());
+            entity.setMatterName(matterEntity == null ? "" : matterEntity.getMatterName());
+            entity.setMatterCode(matterEntity == null ? "" : matterEntity.getMatterNo());
+        }
+
         if (!ObjectUtils.isEmpty(entity.getMaterialId())) {
             MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
             if (!ObjectUtils.isEmpty(matterDatumEntity)) {
@@ -51,6 +61,13 @@ public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterD
         String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
         Integer pageByDoc = WordUtil.getPageByDoc(rootPath + entity.getDocPath());
         entity.setPrintPage(pageByDoc);
+
+        if (ObjectUtils.isEmpty(entity.getDeviceCode())) {
+            DeviceEntity deviceEntity = deviceService.selectOne(new DeviceQuery().deviceCode(entity.getDeviceCode()));
+            entity.setDeviceName(deviceEntity == null ? "" : deviceEntity.getDeviceName());
+        }
+
+
         super.saveBefore(entity, context);
     }
 }
\ No newline at end of file