修改材料附件转换任务

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

@@ -68,8 +68,9 @@ public class MatterDatumConvertTaskImpl implements ITaskExcuteService {
             MatterDatumQuery matterDatumQuery = new MatterDatumQuery();
             matterDatumQuery.setMatterIdList(matterIds);
             List<MatterDatumEntity> matterDatumEntityList = matterDatumService.find(matterDatumQuery);
-            List<Long> convertIdList = new ArrayList<>();
+
             if(CollectionUtils.isNotEmpty(matterDatumEntityList)){
+                List<Long> convertIdList = new ArrayList<>();
                 for(MatterDatumEntity datumEntity:matterDatumEntityList){
                     MatterDatumFileQuery fileQuery = new MatterDatumFileQuery();
                     fileQuery.setDatumId(datumEntity.getId());
@@ -107,32 +108,23 @@ public class MatterDatumConvertTaskImpl implements ITaskExcuteService {
                             update.setUpdateTime(new Date());
                             matterDatumFileService.update(update);
                         }
-                        //convertIdList.add(datumEntity.getMatterId());
-                        SiteMatterQuery matterQuery = new SiteMatterQuery();
-                        matterQuery.setMatterId(datumEntity.getMatterId());
-                        List<SiteMatterEntity> matterEntities = siteMatterService.find(matterQuery);
-                        for(SiteMatterEntity matterEntity:matterEntities){
-                            SiteMatterEntity updateEntity = new SiteMatterEntity();
-                            updateEntity.setId(matterEntity.getId());
-                            updateEntity.setIsConvert(1);
-                            updateEntity.setUpdateTime(new Date());
-                            siteMatterService.update(updateEntity);
-                        }
+                        convertIdList.add(datumEntity.getMatterId());
+                    }
+                }
+                if(convertIdList.size()>0){
+                    SiteMatterQuery matterQuery = new SiteMatterQuery();
+                    matterQuery.setMatterIdList(convertIdList);
+                    List<SiteMatterEntity> matterEntities = siteMatterService.find(matterQuery);
+                    for(SiteMatterEntity matterEntity:matterEntities){
+                        SiteMatterEntity updateEntity = new SiteMatterEntity();
+                        updateEntity.setId(matterEntity.getId());
+                        updateEntity.setIsConvert(1);
+                        updateEntity.setUpdateTime(new Date());
+                        siteMatterService.update(updateEntity);
                     }
                 }
             }
-//            if(convertIdList.size()>0){
-//                SiteMatterQuery matterQuery = new SiteMatterQuery();
-//                matterQuery.setMatterIdList(convertIdList);
-//                List<SiteMatterEntity> matterEntities = siteMatterService.find(matterQuery);
-//                for(SiteMatterEntity matterEntity:matterEntities){
-//                    SiteMatterEntity updateEntity = new SiteMatterEntity();
-//                    updateEntity.setId(matterEntity.getId());
-//                    updateEntity.setIsConvert(1);
-//                    updateEntity.setUpdateTime(new Date());
-//                    siteMatterService.update(updateEntity);
-//                }
-//            }
+
         }
         log.info("事项材料处理完成...");
     }