修复申请事项材料数不正确的问题

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterApplyServiceImpl.java

@@ -13,7 +13,10 @@ import com.mortals.xhx.feign.matter.IMatterFeign;
 import com.mortals.xhx.feign.site.ISiteMatterFeign;
 import com.mortals.xhx.feign.site.ISiteThemeMatterFeign;
 import com.mortals.xhx.module.matter.model.MatterApplyQuery;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
 import com.mortals.xhx.module.matter.model.vo.MatterApplyGroupVo;
+import com.mortals.xhx.module.matter.service.MatterDatumService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
@@ -45,6 +48,32 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
     private ISiteThemeMatterFeign siteThemeMatterFeign;
     @Autowired
     private IMatterDatumFeign matterDatumFeign;
+    @Autowired
+    private MatterDatumService matterDatumService;
+
+    @Override
+    protected void findAfter(MatterApplyEntity entity, Context context, List<MatterApplyEntity> list) throws AppException {
+        if(CollectionUtils.isNotEmpty(list)){
+            for(MatterApplyEntity item:list){
+                MatterDatumEntity query = new MatterDatumEntity();
+                query.setMatterId(entity.getId());
+                int datumCount = matterDatumService.count(query,context);
+                item.setDatumCount(datumCount);
+            }
+        }
+    }
+
+    @Override
+    protected void findAfter(MatterApplyEntity params, PageInfo pageInfo, Context context, List<MatterApplyEntity> list) throws AppException {
+        if(CollectionUtils.isNotEmpty(list)){
+            for(MatterApplyEntity item:list){
+                MatterDatumEntity query = new MatterDatumEntity();
+                query.setMatterId(params.getId());
+                int datumCount = matterDatumService.count(query,context);
+                item.setDatumCount(datumCount);
+            }
+        }
+    }
 
     @Override
     public void addReportCount(Long id) {

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumFileServiceImpl.java

@@ -60,17 +60,17 @@ public class MatterDatumFileServiceImpl extends AbstractCRUDServiceImpl<MatterDa
     @Override
     protected void saveAfter(MatterDatumFileEntity entity, Context context) throws AppException {
         super.saveAfter(entity,context);
-        matterApplyService.addDatumCount(entity.getMatterId(),1);
+        //matterApplyService.addDatumCount(entity.getMatterId(),1);
     }
 
     @Override
     protected void removeBefore(Long[] ids, Context context) throws AppException {
-        for(Long id:ids){
-            MatterDatumFileEntity entity = this.get(id);
-            if(entity!=null){
-                matterApplyService.addDatumCount(entity.getMatterId(),-1);
-            }
-        }
+//        for(Long id:ids){
+//            MatterDatumFileEntity entity = this.get(id);
+//            if(entity!=null){
+//                matterApplyService.addDatumCount(entity.getMatterId(),-1);
+//            }
+//        }
     }
 
     @Override

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

@@ -59,6 +59,18 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         super.findAfter(params, context, list);
     }
 
+    @Override
+    protected void removeBefore(Long[] ids, Context context) throws AppException {
+        for(Long id:ids){
+            MatterDatumEntity entity = this.get(id);
+            if(entity!=null){
+                MatterDatumFileEntity fileEntity = new MatterDatumFileEntity();
+                fileEntity.setDatumId(entity.getId());
+                matterDatumFileService.remove(fileEntity,context);
+            }
+        }
+    }
+
     @Override
     protected void saveBefore(MatterDatumEntity entity, Context context) throws AppException {
         super.saveBefore(entity,context);
@@ -74,6 +86,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
             entity.setNeedOriginal(0);
         }
     }
+
     @Override
     protected void saveAfter(MatterDatumEntity entity, Context context) throws AppException {
         if (!ObjectUtils.isEmpty(entity.getMatterDatumFileList())) {