diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java index 46fcc7b..170e330 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java @@ -49,7 +49,7 @@ public class BigBrotherPageReqVO extends PageParam { private String hostDisplayId; @Schema(description = "该数据所属的账号id", example = "30487") - private String userId; + private Long userId; /** diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherRespVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherRespVO.java index b0fbefa..14c821b 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherRespVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherRespVO.java @@ -62,7 +62,7 @@ public class BigBrotherRespVO { @Schema(description = "该数据所属的账号id", example = "30487") @ExcelProperty("该数据所属的账号id") - private String userId; + private Long userId; @Schema(description = "创建时间") @ExcelProperty("创建时间") diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherSaveReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherSaveReqVO.java index 3db6cae..90dfd3d 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherSaveReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherSaveReqVO.java @@ -47,6 +47,9 @@ public class BigBrotherSaveReqVO { private String hostDisplayId; @Schema(description = "该数据所属的账号id", example = "30487") - private String userId; + private Long userId; + + @Schema(description = "操作状态", example = "30487") + private Byte operation_status; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/EmployeeBigBrotherController.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/EmployeeBigBrotherController.java index e0d95f3..44e0fda 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/EmployeeBigBrotherController.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/EmployeeBigBrotherController.java @@ -104,4 +104,19 @@ public class EmployeeBigBrotherController { BeanUtils.toBean(list, EmployeeBigBrotherRespVO.class)); } + @PostMapping("/allocation") + @Operation(summary = "分配大哥给员工") + @PreAuthorize("@ss.hasPermission('server:employee-big-brother:allocation')") + public CommonResult createEmployeeBigBrother(@Valid @RequestBody List createReqVO) { + return success(employeeBigBrotherService.allocationEmployeeBigBrother(createReqVO)); + } + + + @GetMapping("/self_page") + @Operation(summary = "获得大哥数据员工业务分页") + @PreAuthorize("@ss.hasPermission('server:employee-big-brother:query')") + public CommonResult> getEmployeeBigBrotherPagewithSelf(@Valid EmployeeBigBrotherPageReqVO pageReqVO) { + PageResult pageResult = employeeBigBrotherService.getEmployeeBigBrotherPageWithSelf(pageReqVO); + return success(BeanUtils.toBean(pageResult, EmployeeBigBrotherRespVO.class)); + } } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/vo/EmployeeBigBrotherPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/vo/EmployeeBigBrotherPageReqVO.java index d5ce374..47ed11e 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/vo/EmployeeBigBrotherPageReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/vo/EmployeeBigBrotherPageReqVO.java @@ -47,7 +47,7 @@ public class EmployeeBigBrotherPageReqVO extends PageParam { private String hostDisplayId; @Schema(description = "该数据所属的账号id", example = "533") - private String userId; + private Long userId; @Schema(description = "是否洽谈", example = "2") diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/bigbrother/BigBrotherDO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/bigbrother/BigBrotherDO.java index 303347c..3cbf25b 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/bigbrother/BigBrotherDO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/bigbrother/BigBrotherDO.java @@ -74,7 +74,7 @@ public class BigBrotherDO extends BaseDO { /** * 该数据所属的账号id */ - private String userId; + private Long userId; /** * 该数据所属的租户id diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeebigbrother/EmployeeBigBrotherDO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeebigbrother/EmployeeBigBrotherDO.java index 2e66c4b..9445bba 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeebigbrother/EmployeeBigBrotherDO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeebigbrother/EmployeeBigBrotherDO.java @@ -74,7 +74,7 @@ public class EmployeeBigBrotherDO extends BaseDO { /** * 该数据所属的账号id */ - private String userId; + private Long userId; /** * 是否洽谈 */ diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherService.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherService.java index 3ae1ee3..38ecef1 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherService.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherService.java @@ -60,4 +60,7 @@ public interface EmployeeBigBrotherService { */ PageResult getEmployeeBigBrotherPage(EmployeeBigBrotherPageReqVO pageReqVO); + Boolean allocationEmployeeBigBrother(@Valid List createReqVO); + + PageResult getEmployeeBigBrotherPageWithSelf(@Valid EmployeeBigBrotherPageReqVO pageReqVO); } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherServiceImpl.java index 9a109d7..46cf3f3 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherServiceImpl.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.tkdata.service.employeebigbrother; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.security.core.LoginUser; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.module.tkdata.controller.admin.employeebigbrother.vo.EmployeeBigBrotherPageReqVO; import cn.iocoder.yudao.module.tkdata.controller.admin.employeebigbrother.vo.EmployeeBigBrotherSaveReqVO; @@ -9,6 +11,7 @@ import cn.iocoder.yudao.module.tkdata.dal.dataobject.employeebigbrother.Employee import cn.iocoder.yudao.module.tkdata.dal.mysql.employeebigbrother.EmployeeBigBrotherMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.generator.IFill; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -98,4 +101,27 @@ public class EmployeeBigBrotherServiceImpl implements EmployeeBigBrotherService return new PageResult<>(bigBrotherDOIPage.getRecords(),bigBrotherDOIPage.getTotal()); } + @Override + public Boolean allocationEmployeeBigBrother(List createReqVO) { + ArrayList employeeBigBrotherDOS = new ArrayList<>(); + for (EmployeeBigBrotherSaveReqVO employeeBigBrotherSaveReqVO : createReqVO) { + employeeBigBrotherDOS.add(BeanUtils.toBean(employeeBigBrotherSaveReqVO, EmployeeBigBrotherDO.class)); + } + return employeeBigBrotherMapper.insertBatch(employeeBigBrotherDOS); + } + + @Override + public PageResult getEmployeeBigBrotherPageWithSelf(EmployeeBigBrotherPageReqVO pageReqVO) { + pageReqVO.setTenantId(TenantContextHolder.getTenantId()); + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + if (loginUser!= null){ + pageReqVO.setUserId(loginUser.getId()); + IPage iPage = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); + IPage bigBrotherDOIPage = employeeBigBrotherMapper.selectPagewithSelf(iPage, pageReqVO); + return new PageResult<>(bigBrotherDOIPage.getRecords(),bigBrotherDOIPage.getTotal()); + }else{ + return null; + } + } + } \ No newline at end of file diff --git a/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml b/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml index 30c8bc6..434f421 100644 --- a/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml @@ -24,7 +24,7 @@ - + diff --git a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml index 3eec8c7..7a4cee1 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml @@ -24,7 +24,7 @@ - +