修改bug

single-matter/src/main/java/com/mortals/xhx/daemon/task/SyncSiteMatterTaskImpl.java

@@ -9,16 +9,19 @@ import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SiteMatterPdu;
 import com.mortals.xhx.common.pdu.site.SitePdu;
+import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.feign.site.ISiteMatterFeign;
 import com.mortals.xhx.module.site.model.SiteMatterEntity;
 import com.mortals.xhx.module.site.model.SiteMatterQuery;
 import com.mortals.xhx.module.site.service.SiteMatterService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -65,21 +68,13 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
                         //删除后新增
                         log.info("事项总数量：{}",siteMatterRest.getData().getData().size());
                         List<SiteMatterEntity> siteMatterEntities = siteMatterRest.getData().getData().stream().map(siteMatter -> {
-                            SiteMatterEntity sheetMatterEntity = new SiteMatterEntity();
-                            sheetMatterEntity.initAttrValue();
-                            sheetMatterEntity.setId(siteMatter.getMatterId());
-                            sheetMatterEntity.setSiteId(siteMatter.getSiteId());
-                            sheetMatterEntity.setMatterName(siteMatter.getMatterName());
-                            sheetMatterEntity.setMatterCode(siteMatter.getMatterCode());
-                            sheetMatterEntity.setDeptId(siteMatter.getDeptId());
-                            sheetMatterEntity.setDeptCode(siteMatter.getDeptCode());
-                            sheetMatterEntity.setDeptName(siteMatter.getDeptName());
-                            sheetMatterEntity.setAreaCode(siteMatter.getAreaCode());
-                            sheetMatterEntity.setSource(siteMatter.getSource());
-                            sheetMatterEntity.setEventTypeShow(siteMatter.getEventTypeShow());
-                            sheetMatterEntity.setViewsCount(0l);
-                            sheetMatterEntity.setIsConvert(0);
-                            return sheetMatterEntity;
+                            SiteMatterEntity target = new SiteMatterEntity();
+                            target.initAttrValue();
+                            BeanUtils.copyProperties(siteMatter, target, BeanUtil.getNullPropertyNames(siteMatter));
+                            target.setCreateTime(new Date());
+                            target.setViewsCount(0l);
+                            target.setIsConvert(0);
+                            return target;
                         }).collect(Collectors.toList());
 
                         if (!ObjectUtils.isEmpty(siteMatterEntities)) {

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

@@ -40,31 +40,31 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao
     @Autowired
     private SingleMatterService singleMatterService;
 
-    @Override
-    protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
-        list.stream().peek(item->{
-            List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
-            if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
-                item.setDatumCount(matterDatumFileEntities.size());
-            }else {
-                item.setDatumCount(0);
-            }
-        }).count();
-        super.findAfter(params, context, list);
-    }
-
-    @Override
-    protected void findAfter(SiteMatterEntity params, Context context, List<SiteMatterEntity> list) throws AppException {
-        list.stream().peek(item->{
-            List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
-            if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
-                item.setDatumCount(matterDatumFileEntities.size());
-            }else {
-                item.setDatumCount(0);
-            }
-        }).count();
-        super.findAfter(params, context, list);
-    }
+//    @Override
+//    protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
+//        list.stream().peek(item->{
+//            List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+//            if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+//                item.setDatumCount(matterDatumFileEntities.size());
+//            }else {
+//                item.setDatumCount(0);
+//            }
+//        }).count();
+//        super.findAfter(params, context, list);
+//    }
+//
+//    @Override
+//    protected void findAfter(SiteMatterEntity params, Context context, List<SiteMatterEntity> list) throws AppException {
+//        list.stream().peek(item->{
+//            List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+//            if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+//                item.setDatumCount(matterDatumFileEntities.size());
+//            }else {
+//                item.setDatumCount(0);
+//            }
+//        }).count();
+//        super.findAfter(params, context, list);
+//    }
 
     @Override
     public void addViewsCount(Long id) {