From bf8def0a91a6fc049510bcc3876f243a1afd9638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Mon, 25 Aug 2025 19:28:46 +0800 Subject: [PATCH] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E6=8A=95=E5=85=A5?= =?UTF-8?q?=E5=93=81=E9=9B=86=E5=90=88=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonnelManagementController.java | 7 +++++++ .../ModelFarmingOperationDO.java | 2 +- .../PersonnelManagementService.java | 2 ++ .../PersonnelManagementServiceImpl.java | 12 ++++++++++-- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java index 332d619f..5b4ba08b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java @@ -86,6 +86,13 @@ public class PersonnelManagementController { return success(BeanUtils.toBean(pageResult, PersonnelManagementRespVO.class)); } + @GetMapping("/getList") + @Operation(summary = "获得人员管理全量数据") + public CommonResult> getList(@Valid PersonnelManagementPageReqVO pageReqVO) { + List pageResult = personnelManagementService.getList(pageReqVO); + return success(BeanUtils.toBean(pageResult, PersonnelManagementRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出人员管理 Excel") @ApiAccessLog(operateType = EXPORT) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperation/ModelFarmingOperationDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperation/ModelFarmingOperationDO.java index 2d8bd376..f01271e4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperation/ModelFarmingOperationDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperation/ModelFarmingOperationDO.java @@ -76,6 +76,6 @@ public class ModelFarmingOperationDO extends BaseDO { private String plotName; private String tenantId; - + @TableField(exist = false) private List investGoodsList; } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java index 99ce9dfd..511d4044 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java @@ -63,4 +63,6 @@ public interface PersonnelManagementService { int personnelCount(Long tenantId); void reset(@Valid PersonnelManagementSaveReqVO updateReqVO); + + List getList(@Valid PersonnelManagementPageReqVO pageReqVO); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java index 8c07484a..b3599467 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java @@ -5,13 +5,13 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.SystemUserDO; import cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement.PersonnelManagementMapper; import cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement.SystemUserMapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jakarta.annotation.Resource; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated; import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PERSONNEL_MANAGEMENT_NOT_EXISTS; /** @@ -40,7 +41,7 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic @Override public String createPersonnelManagement(PersonnelManagementSaveReqVO createReqVO) { - LoginUser user = SecurityFrameworkUtils.getLoginUser(); + LoginUser user = getLoginUser(); // 插入 PersonnelManagementDO personnelManagement = BeanUtils.toBean(createReqVO, PersonnelManagementDO.class); personnelManagement.setId(IdUtil.fastUUID()); @@ -135,6 +136,13 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic userMapper.updateById(userDO); } + @Override + public List getList(PersonnelManagementPageReqVO pageReqVO) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("tenant_id", getLoginUser().getTenantId()); + return personnelManagementMapper.selectList(qw); + } + /** * 处理图片集合转换 * 优先使用图片集合，如果图片集合为空则使用字符串