diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java index 6df2c72..71ba6bb 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java @@ -126,4 +126,7 @@ public class EmployeeHostsPageReqVO extends PageParam { private String sortName; private Long tenantId; + + @Schema(description = "旗帜") + private String flag; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java index b7fdf4d..96253fc 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java @@ -76,4 +76,7 @@ public class EmployeeHostsRespVO { @Schema(description = "uid", example = "1") private String uid; + + @Schema(description = "旗帜") + private String flag; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsSaveReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsSaveReqVO.java index 0f19df3..0fe4765 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsSaveReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsSaveReqVO.java @@ -51,4 +51,6 @@ public class EmployeeHostsSaveReqVO { @Schema(description = "备注", example = "1") private String remake; + @Schema(description = "旗帜") + private String flag; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/AllocationHostsSaveReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/AllocationHostsSaveReqVO.java index d9720df..3de553f 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/AllocationHostsSaveReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/AllocationHostsSaveReqVO.java @@ -47,5 +47,8 @@ public class AllocationHostsSaveReqVO { @Schema(description = "用户 Id", example = "10967") private Long userId; + @Schema(description = "旗帜") + private String flag; + } diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java index a1f5793..ab7b949 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java @@ -138,4 +138,7 @@ public class NewHostsPageReqVO extends PageParam { @Schema(description = "是否删除原数据") private Boolean deleteFlag; + + @Schema(description = "旗帜") + private String flag; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java index 6477c4f..7a6faba 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java @@ -87,4 +87,7 @@ public class NewHostsRespVO { @ExcelProperty("是否建联") private Byte operationStatus; + @Schema(description = "旗帜") + @ExcelProperty("旗帜") + private String flag; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsSaveReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsSaveReqVO.java index 0a6a15c..d66d087 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsSaveReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsSaveReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.tkdata.controller.admin.newhosts.vo; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -58,4 +59,6 @@ public class NewHostsSaveReqVO { @Schema(description = "是否建联", example = "1") private Byte operationStatus; + @Schema(description = "旗帜") + private String flag; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java index 9641a6b..23daf73 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -82,4 +83,6 @@ public class EmployeeHostsDO extends BaseDO { private String uid; private Long tenantId; + + private String flag; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java index 0498d65..5e291ef 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java @@ -65,12 +65,15 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { // 校验存在 validateEmployeeHostsExists(updateReqVO.getId()); // 更新 - List employeeHostsDOS = employeeHostsMapper.selectList(new LambdaQueryWrapper(). - eq(EmployeeHostsDO::getHostsId, updateReqVO.getHostsId()) + List employeeHostsDOS = employeeHostsMapper.selectList(new LambdaQueryWrapper() + .eq(EmployeeHostsDO::getHostsId, updateReqVO.getHostsId()) .eq(EmployeeHostsDO::getUserId, updateReqVO.getUserId())); for (EmployeeHostsDO hostsDO : employeeHostsDOS) { hostsDO.setOperationStatus(updateReqVO.getOperationStatus()); hostsDO.setRemake(updateReqVO.getRemake()); + if (updateReqVO.getFlag() != null){ + hostsDO.setFlag(updateReqVO.getFlag()); + } } employeeHostsMapper.updateById(employeeHostsDOS); } diff --git a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml index 907ad56..31de761 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml @@ -63,7 +63,7 @@ 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} and deleted = 0 @@ -216,6 +221,10 @@ and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%') + + + and ns.flag =#{req.flag} + AND ns.hosts_level IN