1.添加主播 flag 旗帜字段
This commit is contained in:
@@ -126,4 +126,7 @@ public class EmployeeHostsPageReqVO extends PageParam {
|
|||||||
private String sortName;
|
private String sortName;
|
||||||
|
|
||||||
private Long tenantId;
|
private Long tenantId;
|
||||||
|
|
||||||
|
@Schema(description = "旗帜")
|
||||||
|
private String flag;
|
||||||
}
|
}
|
||||||
@@ -76,4 +76,7 @@ public class EmployeeHostsRespVO {
|
|||||||
|
|
||||||
@Schema(description = "uid", example = "1")
|
@Schema(description = "uid", example = "1")
|
||||||
private String uid;
|
private String uid;
|
||||||
|
|
||||||
|
@Schema(description = "旗帜")
|
||||||
|
private String flag;
|
||||||
}
|
}
|
||||||
@@ -51,4 +51,6 @@ public class EmployeeHostsSaveReqVO {
|
|||||||
@Schema(description = "备注", example = "1")
|
@Schema(description = "备注", example = "1")
|
||||||
private String remake;
|
private String remake;
|
||||||
|
|
||||||
|
@Schema(description = "旗帜")
|
||||||
|
private String flag;
|
||||||
}
|
}
|
||||||
@@ -47,5 +47,8 @@ public class AllocationHostsSaveReqVO {
|
|||||||
@Schema(description = "用户 Id", example = "10967")
|
@Schema(description = "用户 Id", example = "10967")
|
||||||
private Long userId;
|
private Long userId;
|
||||||
|
|
||||||
|
@Schema(description = "旗帜")
|
||||||
|
private String flag;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -138,4 +138,7 @@ public class NewHostsPageReqVO extends PageParam {
|
|||||||
|
|
||||||
@Schema(description = "是否删除原数据")
|
@Schema(description = "是否删除原数据")
|
||||||
private Boolean deleteFlag;
|
private Boolean deleteFlag;
|
||||||
|
|
||||||
|
@Schema(description = "旗帜")
|
||||||
|
private String flag;
|
||||||
}
|
}
|
||||||
@@ -87,4 +87,7 @@ public class NewHostsRespVO {
|
|||||||
@ExcelProperty("是否建联")
|
@ExcelProperty("是否建联")
|
||||||
private Byte operationStatus;
|
private Byte operationStatus;
|
||||||
|
|
||||||
|
@Schema(description = "旗帜")
|
||||||
|
@ExcelProperty("旗帜")
|
||||||
|
private String flag;
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package cn.iocoder.yudao.module.tkdata.controller.admin.newhosts.vo;
|
package cn.iocoder.yudao.module.tkdata.controller.admin.newhosts.vo;
|
||||||
|
|
||||||
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
@@ -58,4 +59,6 @@ public class NewHostsSaveReqVO {
|
|||||||
@Schema(description = "是否建联", example = "1")
|
@Schema(description = "是否建联", example = "1")
|
||||||
private Byte operationStatus;
|
private Byte operationStatus;
|
||||||
|
|
||||||
|
@Schema(description = "旗帜")
|
||||||
|
private String flag;
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts;
|
package cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts;
|
||||||
|
|
||||||
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -82,4 +83,6 @@ public class EmployeeHostsDO extends BaseDO {
|
|||||||
private String uid;
|
private String uid;
|
||||||
|
|
||||||
private Long tenantId;
|
private Long tenantId;
|
||||||
|
|
||||||
|
private String flag;
|
||||||
}
|
}
|
||||||
@@ -65,12 +65,15 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService {
|
|||||||
// 校验存在
|
// 校验存在
|
||||||
validateEmployeeHostsExists(updateReqVO.getId());
|
validateEmployeeHostsExists(updateReqVO.getId());
|
||||||
// 更新
|
// 更新
|
||||||
List<EmployeeHostsDO> employeeHostsDOS = employeeHostsMapper.selectList(new LambdaQueryWrapper<EmployeeHostsDO>().
|
List<EmployeeHostsDO> employeeHostsDOS = employeeHostsMapper.selectList(new LambdaQueryWrapper<EmployeeHostsDO>()
|
||||||
eq(EmployeeHostsDO::getHostsId, updateReqVO.getHostsId())
|
.eq(EmployeeHostsDO::getHostsId, updateReqVO.getHostsId())
|
||||||
.eq(EmployeeHostsDO::getUserId, updateReqVO.getUserId()));
|
.eq(EmployeeHostsDO::getUserId, updateReqVO.getUserId()));
|
||||||
for (EmployeeHostsDO hostsDO : employeeHostsDOS) {
|
for (EmployeeHostsDO hostsDO : employeeHostsDOS) {
|
||||||
hostsDO.setOperationStatus(updateReqVO.getOperationStatus());
|
hostsDO.setOperationStatus(updateReqVO.getOperationStatus());
|
||||||
hostsDO.setRemake(updateReqVO.getRemake());
|
hostsDO.setRemake(updateReqVO.getRemake());
|
||||||
|
if (updateReqVO.getFlag() != null){
|
||||||
|
hostsDO.setFlag(updateReqVO.getFlag());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
employeeHostsMapper.updateById(employeeHostsDOS);
|
employeeHostsMapper.updateById(employeeHostsDOS);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,7 +63,7 @@
|
|||||||
<select id="selectPageWithXMLWithSelf" resultType="cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts.EmployeeHostsDO">
|
<select id="selectPageWithXMLWithSelf" resultType="cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts.EmployeeHostsDO">
|
||||||
select ns.id,hosts_id, hosts_level, hosts_coins, Invitation_type, fans, fllowernum,
|
select ns.id,hosts_id, hosts_level, hosts_coins, Invitation_type, fans, fllowernum,
|
||||||
yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,
|
yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,
|
||||||
operation_status,ns.user_id ,ns.update_time from server_employee_hosts ns left join server_country_info ci ON ns.country = ci.country_name
|
operation_status,ns.user_id ,ns.update_time,ns.flag from server_employee_hosts ns left join server_country_info ci ON ns.country = ci.country_name
|
||||||
WHERE tenant_id =#{req.tenantId,jdbcType=BIGINT}
|
WHERE tenant_id =#{req.tenantId,jdbcType=BIGINT}
|
||||||
and ns.user_id =#{req.userId,jdbcType=BIGINT}
|
and ns.user_id =#{req.userId,jdbcType=BIGINT}
|
||||||
<!-- 主播国家筛选 -->
|
<!-- 主播国家筛选 -->
|
||||||
@@ -84,6 +84,10 @@
|
|||||||
<if test="req.hostsId != '' and req.hostsId != null ">
|
<if test="req.hostsId != '' and req.hostsId != null ">
|
||||||
and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%')
|
and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%')
|
||||||
</if>
|
</if>
|
||||||
|
<!-- 主播旗帜搜索 -->
|
||||||
|
<if test="req.flag != null">
|
||||||
|
and ns.flag =#{req.flag}
|
||||||
|
</if>
|
||||||
<!-- 主播等级筛选 -->
|
<!-- 主播等级筛选 -->
|
||||||
<if test="req.hostsLevel != null and req.hostsLevel.size() > 0">
|
<if test="req.hostsLevel != null and req.hostsLevel.size() > 0">
|
||||||
AND ns.hosts_level IN
|
AND ns.hosts_level IN
|
||||||
@@ -191,7 +195,8 @@
|
|||||||
|
|
||||||
<select id="selectPageWithXML" resultType="cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts.EmployeeHostsDO">
|
<select id="selectPageWithXML" resultType="cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts.EmployeeHostsDO">
|
||||||
select ns.id,hosts_id, hosts_level, hosts_coins, Invitation_type, fans, fllowernum,
|
select ns.id,hosts_id, hosts_level, hosts_coins, Invitation_type, fans, fllowernum,
|
||||||
yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,operation_status,user_id,uid,ns.update_time from server_employee_hosts ns left join server_country_info ci ON ns.country = ci.country_name
|
yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,operation_status,user_id,uid,ns.update_time,ns.flag
|
||||||
|
from server_employee_hosts ns left join server_country_info ci ON ns.country = ci.country_name
|
||||||
WHERE tenant_id = #{req.tenantId,jdbcType=BIGINT}
|
WHERE tenant_id = #{req.tenantId,jdbcType=BIGINT}
|
||||||
and deleted = 0
|
and deleted = 0
|
||||||
<!-- 筛选员工名下主播 -->
|
<!-- 筛选员工名下主播 -->
|
||||||
@@ -216,6 +221,10 @@
|
|||||||
<if test="req.hostsId != '' and req.hostsId != null ">
|
<if test="req.hostsId != '' and req.hostsId != null ">
|
||||||
and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%')
|
and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%')
|
||||||
</if>
|
</if>
|
||||||
|
<!-- 主播旗帜搜索 -->
|
||||||
|
<if test="req.flag != null">
|
||||||
|
and ns.flag =#{req.flag}
|
||||||
|
</if>
|
||||||
<!-- 主播等级筛选 -->
|
<!-- 主播等级筛选 -->
|
||||||
<if test="req.hostsLevel != null and req.hostsLevel.size() > 0">
|
<if test="req.hostsLevel != null and req.hostsLevel.size() > 0">
|
||||||
AND ns.hosts_level IN
|
AND ns.hosts_level IN
|
||||||
|
|||||||
Reference in New Issue
Block a user