diff --git a/src/main/java/com/qs/serve/modules/bir/entity/BirRemoveId.java b/src/main/java/com/qs/serve/modules/bir/entity/BirRemoveId.java new file mode 100644 index 00000000..ed0d8606 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bir/entity/BirRemoveId.java @@ -0,0 +1,40 @@ +package com.qs.serve.modules.bir.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * ROI费率 实体类 + * @author YenHex + * @since 2023-06-05 + */ +@Data +@TableName("bir_remove_id") +public class BirRemoveId implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime deleteTime; + + +} + diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirRemoveIdMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirRemoveIdMapper.java new file mode 100644 index 00000000..6692f858 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirRemoveIdMapper.java @@ -0,0 +1,22 @@ +package com.qs.serve.modules.bir.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.bir.entity.BirRemoveId; +import com.qs.serve.modules.bir.entity.BirRoiRate; +import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO; +import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo; +import org.apache.ibatis.annotations.Param; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Mapper + * @author YenHex + * @date 2023-06-05 + */ +public interface BirRemoveIdMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java index 495cce0c..fac7bc30 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java @@ -7,7 +7,9 @@ import com.qs.serve.common.model.dto.DateSplitDTO; import com.qs.serve.common.util.DateSplitUtil; import com.qs.serve.common.util.PageUtil; import com.qs.serve.modules.bir.entity.BirBaseActivity; +import com.qs.serve.modules.bir.entity.BirRemoveId; import com.qs.serve.modules.bir.entity.dto.BirCenterGoodSplitDTO; +import com.qs.serve.modules.bir.mapper.BirRemoveIdMapper; import com.qs.serve.modules.bms.entity.BmsCostCenter; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; @@ -36,6 +38,7 @@ import com.qs.serve.modules.bir.mapper.BirActivityCenterGoodsMapper; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -65,6 +68,7 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl birBaseActivityLqw = new LambdaQueryWrapper<>(); birBaseActivityLqw.in(BirActivityCenterGoods::getActivityId,activityIds); + + List removeBirList = this.list(birBaseActivityLqw); + if(removeBirList.size()>0){ + List removeIds = removeBirList.stream().map(a-> { + BirRemoveId birRemoveId = new BirRemoveId(); + birRemoveId.setDeleteTime(LocalDateTime.now()); + birRemoveId.setId(a.getId()); + return birRemoveId; + }).collect(Collectors.toList()); + + removeIds.forEach(a->{ + birRemoveIdMapper.insert(a); + }); + } + this.remove(birBaseActivityLqw); //加载所有自定义成本中心 @@ -220,6 +239,7 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl