Browse Source

添加可投放费用字段查询调整,添加模板日志

mssql
Yen 3 years ago
parent
commit
81c165224a
  1. 9
      src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
  2. 8
      src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
  3. 3
      src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java
  4. 21
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java
  5. 92
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java
  6. 106
      src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java
  7. 36
      src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateLogSo.java
  8. 14
      src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityTemplateLogMapper.java
  9. 23
      src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateLogService.java
  10. 33
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java
  11. 7
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java
  12. 2
      src/main/resources/mapper/bms/BmsChannelPointMapper.xml
  13. 2
      src/main/resources/mapper/bms/BmsSupplierMapper.xml
  14. 2
      src/main/resources/mapper/goods/GoodsSkuMapper.xml
  15. 2
      src/main/resources/mapper/goods/GoodsSpuMapper.xml

9
src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@ -1,6 +1,7 @@
package com.qs.serve.modules.bms.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.qs.serve.common.model.annotation.SysLog;
import com.qs.serve.common.model.dto.PageVo;
import com.qs.serve.common.model.dto.R;
@ -81,21 +82,21 @@ public class BmsSupplierController {
* @param param
* @return
*/
@GetMapping("/page")
@PostMapping("/page")
@PreAuthorize("hasRole('bms:supplier:query')")
public R<PageVo<BmsSupplier>> getPage(BmsSupplier param){
public R<PageVo<BmsSupplier>> getPage(@RequestBody BmsSupplier param){
if(param.getLoadByCurrent()!=null&&param.getLoadByCurrent().equals(1)){
String userId = AuthContextUtils.getSysUserId();
//初始化
hisUserSupplierService.initByUserId(userId,false);
HisUserSupplier userSupplier = param.toHisUserSupplier(userId,null);
LambdaQueryWrapper<HisUserSupplier> lqw = new LambdaQueryWrapper<>(userSupplier);
PageUtil.startPage();
PageHelper.startPage(param.getPageNum(),param.getPageSize());
List<HisUserSupplier> list = hisUserSupplierService.list(lqw);
List<BmsSupplier> supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList());
return R.byPageHelperList(list,supplierList);
}
PageUtil.startPage();
PageHelper.startPage(param.getPageNum(),param.getPageSize());
List<BmsSupplier> list = bmsSupplierService.selectSupplierList(param);
initSupplierList(list);
initParentList(list);

8
src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@ -228,6 +228,13 @@ public class BmsSupplier implements Serializable {
@TableField(exist = false)
private Object region2FourthlyInfo;
/** 翻页参数 */
@TableField(exist = false)
private Integer pageNum;
/** 翻页参数2 */
@TableField(exist = false)
private Integer pageSize;
public HisUserSupplier toHisUserSupplier(String userId,Integer type){
HisUserSupplier userSupplier = new HisUserSupplier();
@ -249,6 +256,7 @@ public class BmsSupplier implements Serializable {
userSupplier.setBizRegionThird(this.getRegion2Third());
userSupplier.setBizRegionFourthly(this.getRegion2Fourthly());
userSupplier.setType(type);
userSupplier.setCostFlag(this.costFlag);
return userSupplier;
}

3
src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java

@ -98,6 +98,8 @@ public class HisUserSupplier implements Serializable {
@Length(max = 32,message = "行政区域4长度不能超过32字")
private String bizRegionFourthly;
private Integer costFlag;
public BmsSupplier toSupplier(){
BmsSupplier bmsSupplier = new BmsSupplier();
bmsSupplier.setId(this.getSupplierId()+"");
@ -111,6 +113,7 @@ public class HisUserSupplier implements Serializable {
bmsSupplier.setRegion2Second(this.getBizRegionSecond());
bmsSupplier.setRegion2Third(this.getBizRegionThird());
bmsSupplier.setRegionFourthly(this.getBizRegionFourthly());
bmsSupplier.setCostFlag(this.costFlag);
return bmsSupplier;
}

21
src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java

@ -9,7 +9,9 @@ import com.qs.serve.common.model.enums.SystemModule;
import com.qs.serve.common.util.*;
import com.qs.serve.modules.bms.entity.BmsRegionUser;
import com.qs.serve.modules.bms.service.BmsRegionUserService;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplateRegion;
import com.qs.serve.modules.tbs.service.TbsActivityTemplateLogService;
import com.qs.serve.modules.tbs.service.TbsActivityTemplateRegionService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -40,6 +42,7 @@ public class TbsActivityTemplateController {
private TbsActivityTemplateService tbsActivityTemplateService;
private TbsActivityTemplateRegionService tbsActivityTemplateRegionService;
private BmsRegionUserService bmsRegionUserService;
private final TbsActivityTemplateLogService activityTemplateLogService;
/**
* 列表
@ -125,6 +128,11 @@ public class TbsActivityTemplateController {
template.setId(param.getId());
template.setTemplateState(param.getTemplateState());
tbsActivityTemplateService.updateById(template);
TbsActivityTemplate tmp = tbsActivityTemplateService.getById(param.getId());
if(tmp!=null){
TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(template,param.getTemplateState());
activityTemplateLogService.save(templateLog);
}
return R.ok(template);
}
@ -154,6 +162,19 @@ public class TbsActivityTemplateController {
@PreAuthorize("hasRole('tbs:activityTemplate:delete')")
public R<?> deleteById(@PathVariable("ids") String ids){
List<Long> idsLong = StringUtils.splitIdLong(ids);
//校验是否可删除
LambdaQueryWrapper<TbsActivityTemplateRegion> lqw = new LambdaQueryWrapper<>();
lqw.in(TbsActivityTemplateRegion::getTemplateId,idsLong);
if(tbsActivityTemplateRegionService.count(lqw)>0){
return R.error("部分模板被使用无法删除");
}
List<TbsActivityTemplate> tmps = tbsActivityTemplateService.listByIds(idsLong);
if(CollectionUtil.isNotEmpty(tmps)){
for (TbsActivityTemplate template : tmps) {
TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(template,2);
activityTemplateLogService.save(templateLog);
}
}
boolean result = tbsActivityTemplateService.removeByIds(idsLong);
return R.isTrue(result);
}

92
src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java

@ -0,0 +1,92 @@
package com.qs.serve.modules.tbs.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.common.model.annotation.SysLog;
import com.qs.serve.common.model.dto.PageVo;
import com.qs.serve.common.model.dto.R;
import com.qs.serve.common.model.enums.BizType;
import com.qs.serve.common.model.enums.SystemModule;
import com.qs.serve.common.util.PageUtil;
import com.qs.serve.common.util.CopierUtil;
import com.qs.serve.common.util.StringUtils;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import com.qs.serve.modules.tbs.entity.so.TbsActivityTemplateLogSo;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog;
import com.qs.serve.modules.tbs.service.TbsActivityTemplateLogService;
import javax.validation.Valid;
import java.util.List;
/**
* 预算 活动模板日志
* @author YenHex
* @since 2023-01-05
*/
@Slf4j
@AllArgsConstructor
@RestController
@RequestMapping("tbs/activityTemplateLog")
public class TbsActivityTemplateLogController {
private TbsActivityTemplateLogService tbsActivityTemplateLogService;
/**
* 列表
* @param param
* @return
*/
//@GetMapping("/list")
@PreAuthorize("hasRole('tbs:activityTemplateLog:query')")
public R<List<TbsActivityTemplateLog>> getList(TbsActivityTemplateLogSo param){
TbsActivityTemplateLog entity = CopierUtil.copy(param,new TbsActivityTemplateLog());
LambdaQueryWrapper<TbsActivityTemplateLog> lqw = new LambdaQueryWrapper<>(entity);
PageUtil.startPage();
List<TbsActivityTemplateLog> list = tbsActivityTemplateLogService.list(lqw);
return R.ok(list);
}
/**
* 翻页
* @param param
* @return
*/
@GetMapping("/page")
public R<PageVo<TbsActivityTemplateLog>> getPage(TbsActivityTemplateLogSo param){
TbsActivityTemplateLog entity = CopierUtil.copy(param,new TbsActivityTemplateLog());
LambdaQueryWrapper<TbsActivityTemplateLog> lqw = new LambdaQueryWrapper<>(entity);
PageUtil.startPage();
List<TbsActivityTemplateLog> list = tbsActivityTemplateLogService.list(lqw);
return R.byPageHelperList(list);
}
/**
* ID查询
* @param id
* @return
*/
@GetMapping("/getById/{id}")
@SysLog(module = SystemModule.Budget, title = "活动模板", biz = BizType.QUERY)
public R<TbsActivityTemplateLog> getById(@PathVariable("id") String id){
TbsActivityTemplateLog tbsActivityTemplateLog = tbsActivityTemplateLogService.getById(id);
return R.ok(tbsActivityTemplateLog);
}
/**
* 删除
* @param ids
* @return
*/
@DeleteMapping("/deleteById/{ids}")
@SysLog(module = SystemModule.Budget, title = "活动模板", biz = BizType.DELETE)
public R<?> deleteById(@PathVariable("ids") String ids){
List<Long> idsLong = StringUtils.splitIdLong(ids);
boolean result = tbsActivityTemplateLogService.removeByIds(idsLong);
return R.isTrue(result);
}
}

106
src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java

@ -0,0 +1,106 @@
package com.qs.serve.modules.tbs.entity;
import java.time.LocalDate;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
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.NotNull;
import javax.validation.constraints.NotBlank;
/**
* 活动模板 实体类
* @author YenHex
* @since 2023-01-05
*/
@Data
@TableName("tbs_activity_template_log")
public class TbsActivityTemplateLog implements Serializable {
private static final long serialVersionUID = 1L;
/** id */
@TableId(type = IdType.AUTO)
private Long id;
/** 模板id */
@NotNull(message = "模板id不能为空")
private Long templateId;
/** 模板名称 */
@NotBlank(message = "模板名称不能为空")
@Length(max = 30,message = "模板名称长度不能超过30字")
private String templateName;
/** 操作状态:0:关闭;1-开启;2-删除;3-修改 */
private Integer optionState;
/** 模板值 */
@NotBlank(message = "模板值不能为空")
@Length(max = 6000,message = "模板值长度不能超过6000字")
private String templateValue;
/** 销售区域标识:0-全部可见;1-部分可见;2-全部不可见 */
@NotNull(message = "销售区域标识:0-全部可见;1-部分可见;2-全部不可见不能为空")
private Integer saleRegionFlag;
/** 行政区域标识:0-全部可见;1-部分可见;2-全部不可 */
@NotNull(message = "行政区域标识:0-全部可见;1-部分可见;2-全部不可不能为空")
private Integer bizRegionFlag;
/** 备注 */
@Length(max = 255,message = "备注长度不能超过255字")
private String remark;
/** 开始时间 */
@Length(max = 0,message = "开始时间长度不能超过0字")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime startTime;
/** 结束时间 */
@Length(max = 0,message = "结束时间长度不能超过0字")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime endTime;
/** 创建时间 */
@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 createTime;
/** 创建人 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 更新时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
/** 更新人 */
@TableField(fill = FieldFill.UPDATE)
private String updateBy;
/** 租户id */
@JsonIgnore
@JsonProperty
private String tenantId;
/** 删除标识 */
@JsonIgnore
@JsonProperty
private Boolean delFlag;
}

36
src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivityTemplateLogSo.java

@ -0,0 +1,36 @@
package com.qs.serve.modules.tbs.entity.so;
import java.time.LocalDate;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
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.NotNull;
import javax.validation.constraints.NotBlank;
/**
* 活动模板 查询参数
* @author YenHex
* @since 2023-01-05
*/
@Data
public class TbsActivityTemplateLogSo implements Serializable {
/** 模板id */
private Long templateId;
/** 模板名称 */
private String templateName;
/** 操作状态:0:关闭;1-开启;2-删除;3-修改 */
private Integer optionState;
}

14
src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityTemplateLogMapper.java

@ -0,0 +1,14 @@
package com.qs.serve.modules.tbs.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog;
/**
* 活动模板 Mapper
* @author YenHex
* @date 2023-01-05
*/
public interface TbsActivityTemplateLogMapper extends BaseMapper<TbsActivityTemplateLog> {
}

23
src/main/java/com/qs/serve/modules/tbs/service/TbsActivityTemplateLogService.java

@ -0,0 +1,23 @@
package com.qs.serve.modules.tbs.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplate;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog;
/**
* 活动模板 服务接口
* @author YenHex
* @date 2023-01-05
*/
public interface TbsActivityTemplateLogService extends IService<TbsActivityTemplateLog> {
/**
* 模板转换成模板日志对象
* @param template
* @param optState
* @return
*/
TbsActivityTemplateLog toLog(TbsActivityTemplate template,Integer optState);
}

33
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java

@ -0,0 +1,33 @@
package com.qs.serve.modules.tbs.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qs.serve.common.util.CopierUtil;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplate;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog;
import com.qs.serve.modules.tbs.service.TbsActivityTemplateLogService;
import com.qs.serve.modules.tbs.mapper.TbsActivityTemplateLogMapper;
/**
* 活动模板 服务实现类
* @author YenHex
* @since 2023-01-05
*/
@Slf4j
@Service
@AllArgsConstructor
public class TbsActivityTemplateLogServiceImpl extends ServiceImpl<TbsActivityTemplateLogMapper,TbsActivityTemplateLog> implements TbsActivityTemplateLogService {
@Override
public TbsActivityTemplateLog toLog(TbsActivityTemplate template, Integer optState) {
if(template==null){return null;}
TbsActivityTemplateLog templateLog = CopierUtil.copy(template,new TbsActivityTemplateLog());
templateLog.setTemplateId(template.getId());
templateLog.setOptionState(optState);
return templateLog;
}
}

7
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java

@ -8,8 +8,10 @@ import com.qs.serve.modules.bms.entity.BmsRegion;
import com.qs.serve.modules.bms.entity.BmsRegion2;
import com.qs.serve.modules.bms.service.BmsRegion2Service;
import com.qs.serve.modules.bms.service.BmsRegionService;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog;
import com.qs.serve.modules.tbs.entity.TbsActivityTemplateRegion;
import com.qs.serve.modules.tbs.entity.bo.TbsActivityTemplateBo;
import com.qs.serve.modules.tbs.service.TbsActivityTemplateLogService;
import com.qs.serve.modules.tbs.service.TbsActivityTemplateRegionService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -35,11 +37,16 @@ public class TbsActivityTemplateServiceImpl extends ServiceImpl<TbsActivityTempl
private final TbsActivityTemplateRegionService templateRegionService;
private final BmsRegionService saleRegionService;
private final BmsRegion2Service bizRegionService;
private final TbsActivityTemplateLogService activityTemplateLogService;
@Override
public TbsActivityTemplate modify(TbsActivityTemplateBo templateBo) {
TbsActivityTemplate template = CopierUtil.copy(templateBo,new TbsActivityTemplate());
this.saveOrUpdate(template);
if(templateBo.getId()!=null){
TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(template,3);
activityTemplateLogService.save(templateLog);
}
//移除历史
if(templateBo.getBizRegionFlag()!=null&&templateBo.getSaleRegionFlag()!=null){
LambdaQueryWrapper<TbsActivityTemplateRegion> rmRegion = new LambdaQueryWrapper<>();

2
src/main/resources/mapper/bms/BmsChannelPointMapper.xml

@ -28,6 +28,7 @@
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="costFlag" column="cost_flag"/>
</resultMap>
<sql id="bmsChannelPointSql">
@ -52,6 +53,7 @@
bms_channel_point.`update_time`,
bms_channel_point.`tenant_id`,
bms_channel_point.`del_flag`,
bms_channel_point.`cost_flag`,
bms_channel_point.`create_by`,
bms_channel_point.`update_by` </sql>

2
src/main/resources/mapper/bms/BmsSupplierMapper.xml

@ -34,6 +34,7 @@
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="tenantId" column="tenant_id"/>
<result property="costFlag" column="cost_flag"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
@ -66,6 +67,7 @@
bms_supplier.`update_time`,
bms_supplier.`update_by`,
bms_supplier.`tenant_id`,
bms_supplier.`cost_flag`,
bms_supplier.`del_flag` </sql>
<select id="selectSupplierList" parameterType="com.qs.serve.modules.bms.entity.BmsSupplier" resultMap="bmsSupplierMap">

2
src/main/resources/mapper/goods/GoodsSkuMapper.xml

@ -28,6 +28,7 @@
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="costFlag" column="cost_flag"/>
</resultMap>
<sql id="goodsSkuSql">
@ -53,6 +54,7 @@
goods_sku.`tenant_id`,
goods_sku.`del_flag`,
goods_sku.`create_by`,
goods_sku.`cost_flag`,
goods_sku.`update_by` </sql>
<select id="selectGoodsSkuList" parameterType="com.qs.serve.modules.goods.entity.GoodsSku" resultMap="goodsSkuMap">

2
src/main/resources/mapper/goods/GoodsSpuMapper.xml

@ -23,6 +23,7 @@
<result property="updateBy" column="update_by"/>
<result property="tenantId" column="tenant_id"/>
<result property="delFlag" column="del_flag"/>
<result property="costFlag" column="cost_flag"/>
<result property="cateFirstLabel" column="cate_first_label"/>
<result property="cateSecondLabel" column="cate_second_label"/>
<result property="cateThirdLabel" column="cate_third_label"/>
@ -48,6 +49,7 @@
goods_spu.`create_by`,
goods_spu.`update_by`,
goods_spu.`tenant_id`,
goods_spu.`cost_flag`,
goods_spu.`del_flag` </sql>
<select id="selectSpuList" parameterType="com.qs.serve.modules.goods.entity.GoodsSpu" resultMap="goodsSpuMap">

Loading…
Cancel
Save