修改材料附件上传

base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java

 package com.mortals.xhx.module.matter.model;
 
-import java.util.Date;
 import java.util.List;
-import com.mortals.xhx.module.matter.model.MatterEntity;
 /**
  * 基础事项查询对象
  *

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

@@ -14,4 +14,7 @@ import java.util.List;
 @Data
 public class MatterDatumVo extends BaseEntityLong {
 
+
+    private List<MatterDatumEntity> datumFileList;
+
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.matter.service.impl;
+
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import com.mortals.xhx.module.matter.model.MatterDatumFileQuery;
 import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.service.MatterDatumFileService;
 import com.mortals.xhx.module.matter.service.MatterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,25 +17,59 @@ import com.mortals.xhx.module.matter.service.MatterDatumService;
 import org.springframework.util.ObjectUtils;
 
 /**
-* MatterDatumService
-* 事项申请材料 service实现
-*
-* @author zxfei
-* @date 2022-01-12
-*/
+ * MatterDatumService
+ * 事项申请材料 service实现
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
 @Service("matterDatumService")
 public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumDao, MatterDatumEntity, Long> implements MatterDatumService {
 
     @Autowired
     private MatterService matterService;
+    @Autowired
+    private MatterDatumFileService matterDatumFileService;
+    @Autowired
+    private UploadService uploadService;
 
     @Override
     protected void saveBefore(MatterDatumEntity entity, Context context) throws AppException {
 
-        if(!ObjectUtils.isEmpty(entity.getMatterId())){
+        if (!ObjectUtils.isEmpty(entity.getMatterId())) {
             MatterEntity matterEntity = matterService.get(entity.getMatterId());
             //entity.setMatterName(matterEntity==null?"":matterEntity.getMatterName());
         }
         super.saveBefore(entity, context);
     }
+
+
+    @Override
+    protected void saveAfter(MatterDatumEntity entity, Context context) throws AppException {
+        if (!ObjectUtils.isEmpty(entity.getMatterDatumFileList())) {
+            entity.getMatterDatumFileList().stream().peek(item -> {
+                item.setDatumId(entity.getId());
+            }).count();
+            matterDatumFileService.save(entity.getMatterDatumFileList());
+        }
+        super.saveAfter(entity, context);
+    }
+
+    @Override
+    protected void updateAfter(MatterDatumEntity entity, Context context) throws AppException {
+        if (!ObjectUtils.isEmpty(entity.getMatterDatumFileList())) {
+            //先删除后新增
+            Long[] fileIds = matterDatumFileService.find(new MatterDatumFileQuery().datumId(entity.getId())).stream()
+                    .map(item -> {
+                        uploadService.deleteFile(item.getFileUrl());
+                        return item.getId();
+                    }).toArray(Long[]::new);
+            matterDatumFileService.remove(fileIds, context);
+            entity.getMatterDatumFileList().stream().peek(item -> {
+                item.setDatumId(entity.getId());
+            }).count();
+            matterDatumFileService.save(entity.getMatterDatumFileList());
+        }
+        super.updateAfter(entity, context);
+    }
 }
\ No newline at end of file