项目管理

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -539,8 +539,7 @@ public class PmPurchaseExecutionController extends BaseController {
                                         @RequestParam(value = "openBidTime", required = true) String openBidTime) {
         LambdaQueryWrapper<PmBidOpening> pmBidOpeningLambdaQueryWrapper = new LambdaQueryWrapper<>();
         pmBidOpeningLambdaQueryWrapper.eq(PmBidOpening::getDemandId,demandId)
-        .eq(PmBidOpening::getOpenBidTime,openBidTime).orderByDesc(PmBidOpening::getScore)
-        ;
+        .eq(PmBidOpening::getOpenBidTime,openBidTime).orderByDesc(PmBidOpening::getScore);
         List<PmBidOpening> pmBidOpeningList = pmBidOpeningService.list(pmBidOpeningLambdaQueryWrapper);
         return success(pmBidOpeningList);
     }

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

@@ -718,18 +718,19 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     public boolean uploadFile(Long redId, Integer fileType, List<SysFileRef> sysFileRefs, String upateBy) {
 
         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);
+            }
+            //添加新的
             for (SysFileRef ref : sysFileRefs) {
                 if (ref.getFileId() == null) {
                     continue;
                 }
-                QueryWrapper<SysFileRef> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(SysFileRef::getFileId, ref.getFileId())
-                        .eq(SysFileRef::getRedId, redId)
-                        .eq(SysFileRef::getType, fileType);
-                List<SysFileRef> sysFileRefList = sysFileRefService.list(queryWrapper);
-                if (!CollectionUtils.isEmpty(sysFileRefList)) {
-                    sysFileRefService.remove(queryWrapper);
-                }
                 ref.setRedId(redId);
                 ref.setType(fileType);
                 ref.setCreated(upateBy);