修改材料附件上传

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

 package com.mortals.xhx.module.matter.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -15,6 +16,6 @@ import java.util.List;
 public class MatterDatumVo extends BaseEntityLong {
 
 
-    private List<MatterDatumEntity> datumFileList;
+    private List<MatterDatumFileEntity> datumFileList;
 
 }
\ No newline at end of file

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

@@ -3,19 +3,18 @@ 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.model.*;
 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;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 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 java.util.List;
+
 /**
  * MatterDatumService
  * 事项申请材料 service实现
@@ -33,12 +32,22 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     @Autowired
     private UploadService uploadService;
 
+
     @Override
-    protected void saveBefore(MatterDatumEntity entity, Context context) throws AppException {
+    protected void findAfter(MatterDatumEntity params, Context context, List<MatterDatumEntity> list) throws AppException {
+
+        list.stream().peek(item->{
+            List<MatterDatumFileEntity> matterDatumFileEntities = matterDatumFileService.find(new MatterDatumFileQuery().datumId(item.getId()));
+            item.setDatumFileList(matterDatumFileEntities);
+        }).count();
+        super.findAfter(params, context, list);
+    }
 
+    @Override
+    protected void saveBefore(MatterDatumEntity entity, Context context) throws AppException {
         if (!ObjectUtils.isEmpty(entity.getMatterId())) {
             MatterEntity matterEntity = matterService.get(entity.getMatterId());
-            //entity.setMatterName(matterEntity==null?"":matterEntity.getMatterName());
+            entity.setMatterName(matterEntity==null?"":matterEntity.getMatterName());
         }
         super.saveBefore(entity, context);
     }
@@ -72,4 +81,6 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         }
         super.updateAfter(entity, context);
     }
+
+
 }
\ No newline at end of file

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

@@ -39,6 +39,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     @Autowired
     private SiteService siteService;
 
+
     @Override
     protected void saveBefore(MatterEntity entity, Context context) throws AppException {
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

 package com.mortals.xhx.module.matter.web;
 
+import com.mortals.framework.exception.AppException;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
+import com.mortals.xhx.module.matter.model.MatterDatumFileQuery;
+import com.mortals.xhx.module.matter.service.MatterDatumFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -36,6 +40,8 @@ public class MatterDatumController extends BaseCRUDJsonPhpController<MatterDatum
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private MatterDatumFileService matterDatumFileService;
 
     public MatterDatumController(){
         super.setFormClass(MatterDatumForm.class);
@@ -208,4 +214,12 @@ public class MatterDatumController extends BaseCRUDJsonPhpController<MatterDatum
             log.error("事项申请材料导出错误", e);
         }
     }
+
+
+    @Override
+    protected int viewAfter(HttpServletRequest request, HttpServletResponse response, MatterDatumForm form, Map<String, Object> model, MatterDatumEntity entity, Context context) throws AppException {
+        List<MatterDatumFileEntity> matterDatumFileEntities = matterDatumFileService.find(new MatterDatumFileQuery().datumId(entity.getId()));
+        entity.setDatumFileList(matterDatumFileEntities);
+        return super.viewAfter(request, response, form, model, entity, context);
+    }
 }
\ No newline at end of file