修改码活动时数据校验问题

修改码活动关联的码包时，删除数据异常问题

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdateActiveReq.java

@@ -28,11 +28,11 @@ public class UpdateActiveReq implements Serializable {
     private Integer activeType;
 
     @ApiModelProperty(value = "活动开始日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime beginTime;
 
     @ApiModelProperty(value = "活动结束日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
     @ApiModelProperty(value = "品牌code")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ActiveServiceImpl.java

@@ -96,7 +96,11 @@ public class ActiveServiceImpl implements ActiveService {
         baseActiveMapper.insert(active);
 
         //添加码活动和码包的关联
-        baseActiveQrPackageMappingMapper.batchInsert(active.getId(), req.getQrPackageIdList(), userId);
+        List<QrPackage> qrPackages = searchReviewPassPackageByPackageIds(req.getQrPackageIdList());
+        List<Long> qrPackageIdsAdd = qrPackages.stream().map(QrPackage::getId).collect(Collectors.toList());
+        if(CollectionUtil.isNotEmpty(qrPackageIdsAdd)) {
+            baseActiveQrPackageMappingMapper.batchInsert(active.getId(), qrPackageIdsAdd, userId);
+        }
 
     }
 
@@ -319,6 +323,7 @@ public class ActiveServiceImpl implements ActiveService {
             UpdateWrapper<BaseActiveQrPackageMapping> aqpmQW = new UpdateWrapper<>();
             aqpmQW.set("is_delete", 1)
                     .set("update_by", loginUserId)
+                    .eq("active_id", activeId)
                     .in("qr_package_id", deleteBatch);
             baseActiveQrPackageMappingMapper.update(null, aqpmQW);
         }
@@ -327,7 +332,9 @@ public class ActiveServiceImpl implements ActiveService {
         if(CollectionUtil.isNotEmpty(addBatch)){
             List<QrPackage> qrPackages = searchReviewPassPackageByPackageIds(addBatch);
             List<Long> qrPackageIdsAdd = qrPackages.stream().map(QrPackage::getId).collect(Collectors.toList());
-            baseActiveQrPackageMappingMapper.batchInsert(activeId, qrPackageIdsAdd, loginUserId);
+            if(CollectionUtil.isNotEmpty(qrPackageIdsAdd)) {
+                baseActiveQrPackageMappingMapper.batchInsert(activeId, qrPackageIdsAdd, loginUserId);
+            }
         }
     }