历史表

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandService.java

@@ -80,6 +80,8 @@ public interface IPmDemandService extends IService<PmDemand> {
      */
     boolean releaseTask(PmDemandReqVo pmDemandReqVo);
 
+    boolean uploadFile(Long redId, Integer fileType, List<SysFileRef> sysFileRefs, String upateBy,boolean delOld);
+
     boolean uploadFile(Long redId, Integer fileType, List<SysFileRef> sysFileRefs, String upateBy);
 
     boolean insertPmReleaseAnnouncement(PmReleaseAnnouncementReqVo pmReleaseAnnouncementReqVo) throws Exception;

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -164,11 +165,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 //采购需求附件
                 List<SysFileInfo> demandFileInfos = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_DEMAND.getType());
                 if (!ObjectUtils.isEmpty(demandFileInfos)) {
-                    List<SysFileInfo> sysFileInfoList = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_DEMAND_EXAMINE.getType());
-                    if (!ObjectUtils.isEmpty(sysFileInfoList)) {
-                        demandFileInfos.addAll(sysFileInfoList);
-                    }
-
                     vo.setDemandFileInfos(demandFileInfos);
                 }
 
@@ -296,7 +292,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                         PmReleaseAnnouncementResVo pmReleaseAnnouncementResVo = new PmReleaseAnnouncementResVo();
                         BeanUtils.copyProperties(pmReleaseAnnouncement, pmReleaseAnnouncementResVo);
 
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncement.getId(), SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType());
+                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncementResVo.getId(), SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
                             fileInfosAll.addAll(fileInfos);
                         }
@@ -831,17 +827,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean uploadFile(Long redId, Integer fileType, List<SysFileRef> sysFileRefs, String upateBy) {
+    public boolean uploadFile(Long redId, Integer fileType, List<SysFileRef> sysFileRefs, String upateBy,boolean delOld) {
 
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             //删除老的
-//            QueryWrapper<SysFileRef> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.lambda().eq(SysFileRef::getRedId, redId)
-//                    .eq(SysFileRef::getType, fileType);
-//            List<SysFileRef> sysFileRefList = sysFileRefService.list(queryWrapper);
-//            if (!CollectionUtils.isEmpty(sysFileRefList)) {
-//                sysFileRefService.remove(queryWrapper);
-//            }
+            if(delOld){
+                QueryWrapper<SysFileRef> queryWrapper = new QueryWrapper<>();
+                queryWrapper.lambda().eq(SysFileRef::getRedId, redId)
+                        .eq(SysFileRef::getType, fileType);
+                List<SysFileRef> sysFileRefList = sysFileRefService.list(queryWrapper);
+                if (!ObjectUtils.isEmpty(sysFileRefList)) {
+                    sysFileRefService.remove(queryWrapper);
+                }
+            }
+
             //添加新的
             for (SysFileRef ref : sysFileRefs) {
                 if (ref.getFileId() == null) {
@@ -859,7 +858,12 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         } else {
             return false;
         }
+    }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean uploadFile(Long redId, Integer fileType, List<SysFileRef> sysFileRefs, String upateBy) {
+        return uploadFile(redId, fileType, sysFileRefs, upateBy,false);
     }
 
     @Override