事项材料附件自动下载；材料加入公共库，公共库加入材料

single-matter/src/main/java/com/mortals/xhx/module/site/service/SiteDatumLibraryService.java

@@ -19,5 +19,5 @@ public interface SiteDatumLibraryService extends ICRUDService<SiteDatumLibraryEn
      * @param libraryIds
      * @param context
      */
-    Rest<String> addToMatterDatum(String libraryIds, Context context);
+    Rest<String> addToMatterDatum(String libraryIds, Long matterId, Context context);
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteDatumLibraryServiceImpl.java

@@ -3,7 +3,9 @@ import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.utils.BeanUtil;
 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.service.MatterDatumService;
+import com.mortals.xhx.module.matter.service.MatterService;
 import com.mortals.xhx.module.site.model.SiteDatumLibraryQuery;
 import com.mortals.xhx.module.site.model.SiteEntity;
 import org.checkerframework.checker.units.qual.A;
@@ -33,11 +35,14 @@ import java.util.stream.Collectors;
 @Service("siteDatumLibraryService")
 public class SiteDatumLibraryServiceImpl extends AbstractCRUDServiceImpl<SiteDatumLibraryDao, SiteDatumLibraryEntity, Long> implements SiteDatumLibraryService {
 
+    @Autowired
+    private MatterService matterService;
+
     @Autowired
     private MatterDatumService matterDatumService;
 
     @Override
-    public Rest<String> addToMatterDatum(String libraryIds, Context context) {
+    public Rest<String> addToMatterDatum(String libraryIds, Long matterId, Context context) {
         List<Long> libraryIdList = Arrays.asList(libraryIds.split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
         SiteDatumLibraryQuery query = new SiteDatumLibraryQuery();
         query.setIdList(libraryIdList);
@@ -47,7 +52,7 @@ public class SiteDatumLibraryServiceImpl extends AbstractCRUDServiceImpl<SiteDat
         List<MatterDatumEntity> addEntities = new ArrayList<>();
 
         for (SiteDatumLibraryEntity library : entities) {
-            MatterDatumEntity datum = updateOrSave(library, context);
+            MatterDatumEntity datum = updateOrSave(library, matterId, context);
             //SiteMatterEntity siteMatterEntity = updateOrSave(matterEntity, siteId, context);
             if (!ObjectUtils.isEmpty(datum)) {
                 addEntities.add(datum);
@@ -76,10 +81,14 @@ public class SiteDatumLibraryServiceImpl extends AbstractCRUDServiceImpl<SiteDat
         return Rest.ok(msg);
     }
 
-    private MatterDatumEntity updateOrSave(SiteDatumLibraryEntity item, Context context) {
+    private MatterDatumEntity updateOrSave(SiteDatumLibraryEntity item, Long matterId, Context context) {
         if(item.getDatumId()==null){
             item.setDatumId(-1l);
         }
+        MatterEntity matterEntity = matterService.get(matterId);
+        if(ObjectUtils.isEmpty(matterEntity)){
+            return null;
+        }
         MatterDatumEntity matterDatumEntity = matterDatumService.get(item.getDatumId());
         if (ObjectUtils.isEmpty(matterDatumEntity)) {
             MatterDatumEntity datumEntity = BeanUtil.covert(item,MatterDatumEntity.class);
@@ -87,6 +96,9 @@ public class SiteDatumLibraryServiceImpl extends AbstractCRUDServiceImpl<SiteDat
             if(context!=null&&context.getUser()!=null) {
                 datumEntity.setCreateUserId(context.getUser().getId());
             }
+            datumEntity.setMatterName(matterEntity.getMatterName());
+            datumEntity.setMatterId(matterId);
+            datumEntity.setMatterCode(matterEntity.getMatterNo());
             return datumEntity;
         }
         return null;

single-matter/src/main/java/com/mortals/xhx/module/site/web/SiteDatumLibraryController.java

@@ -65,10 +65,10 @@ public class SiteDatumLibraryController extends BaseCRUDJsonBodyMappingControlle
         JSONObject jsonObject = new JSONObject();
         Map<String, Object> model = new HashMap<String, Object>();
         String libraryIds = (String) map.get("libraryIds");
-        //Long siteId = DataUtil.converStr2Long(map.get("siteId").toString(), 0L);
+        Long matterId = DataUtil.converStr2Long(map.get("matterId").toString(), 0L);
 
         try {
-            Rest<String> rest = this.service.addToMatterDatum(libraryIds, getContext());
+            Rest<String> rest = this.service.addToMatterDatum(libraryIds, matterId, getContext());
             jsonObject.put(KEY_RESULT_MSG, rest.getMsg());
             jsonObject.put(KEY_RESULT_DATA, model);
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);