Browse Source

预算添加附件

v1.0
15989082884@163.com 2 years ago
parent
commit
0d7abad4bd
  1. 11
      src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java
  2. 2
      src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java
  3. 1
      src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java
  4. 11
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

11
src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java

@ -10,7 +10,9 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
import lombok.Data; import lombok.Data;
import org.apache.ibatis.type.JdbcType;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -23,7 +25,7 @@ import javax.validation.constraints.NotBlank;
* @since 2022-11-12 * @since 2022-11-12
*/ */
@Data @Data
@TableName("tbs_budget") @TableName(value = "tbs_budget", autoResultMap = true)
public class TbsBudget implements Serializable { public class TbsBudget implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -123,9 +125,16 @@ public class TbsBudget implements Serializable {
@JsonProperty @JsonProperty
private String delFlag; private String delFlag;
/** 附件id */
@TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
private String[] attachIds;
/** 后端传输dto */ /** 后端传输dto */
@TableField(exist = false) @TableField(exist = false)
private List<TbsBudgetCondition> budgetConditionList; private List<TbsBudgetCondition> budgetConditionList;
@TableField(exist = false)
private List<?> attachList;
} }

2
src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java

@ -74,6 +74,8 @@ public class TbsBudgetBo implements Serializable {
/** skuId列表(前端显示为单品) */ /** skuId列表(前端显示为单品) */
private List<Long> skuIds; private List<Long> skuIds;
private String[] attachIds;
@Data @Data
public static class ScheduleItem{ public static class ScheduleItem{

1
src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java

@ -75,6 +75,7 @@ public class TbsBudgetVo implements Serializable {
private List<?> spuConditions; private List<?> spuConditions;
private List<?> scheduleItem; private List<?> scheduleItem;
private List<TbsScheduleItemBudget> scheduleItemBudgets; private List<TbsScheduleItemBudget> scheduleItemBudgets;
private List<?> attachList;
} }

11
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@ -17,7 +17,9 @@ import com.qs.serve.modules.goods.entity.dto.TbsCenterDto;
import com.qs.serve.modules.goods.service.GoodsCategoryService; import com.qs.serve.modules.goods.service.GoodsCategoryService;
import com.qs.serve.modules.goods.service.GoodsSkuService; import com.qs.serve.modules.goods.service.GoodsSkuService;
import com.qs.serve.modules.goods.service.GoodsSpuService; import com.qs.serve.modules.goods.service.GoodsSpuService;
import com.qs.serve.modules.sys.entity.SysAttach;
import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.entity.SysUser;
import com.qs.serve.modules.sys.service.SysAttachService;
import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.sys.service.SysUserService;
import com.qs.serve.modules.tbs.common.TbsCenterType; import com.qs.serve.modules.tbs.common.TbsCenterType;
import com.qs.serve.modules.tbs.common.TbsGoodsType; import com.qs.serve.modules.tbs.common.TbsGoodsType;
@ -73,6 +75,9 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
private final TbsBudgetCostItemPolicyService tbsBudgetCostItemPolicyService; private final TbsBudgetCostItemPolicyService tbsBudgetCostItemPolicyService;
private final VtbFundFlowService vtbFundFlowService; private final VtbFundFlowService vtbFundFlowService;
private SysAttachService attachService;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void modify(TbsBudgetBo budgetBo) { public void modify(TbsBudgetBo budgetBo) {
@ -433,6 +438,12 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
a.setBudgetAmount(logList.stream().map(b->b.getAmount()).reduce(BigDecimal.ZERO,BigDecimal::add)); a.setBudgetAmount(logList.stream().map(b->b.getAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
}); });
budgetVo.setScheduleItem(scheduleItemBudgets); budgetVo.setScheduleItem(scheduleItemBudgets);
if(CollectionUtil.isNotEmpty(budget.getAttachIds())){
List<String> attachIds = Arrays.asList(budget.getAttachIds());
List<SysAttach> attachList = attachService.listByIds(attachIds);
budgetVo.setAttachList(attachList);
}
return budgetVo; return budgetVo;
} }

Loading…
Cancel
Save