farm模块-投入品集合新增

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<List<PersonnelManagementRespVO>> getList(@Valid PersonnelManagementPageReqVO pageReqVO) {
+        List<PersonnelManagementDO> pageResult = personnelManagementService.getList(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, PersonnelManagementRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出人员管理 Excel")
     @ApiAccessLog(operateType = EXPORT)

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<ModelFarmingOperationInputDO> investGoodsList;
 }

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<PersonnelManagementDO> getList(@Valid PersonnelManagementPageReqVO pageReqVO);
 }

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<PersonnelManagementDO> getList(PersonnelManagementPageReqVO pageReqVO) {
+        QueryWrapper<PersonnelManagementDO> qw = new QueryWrapper<>();
+        qw.eq("tenant_id", getLoginUser().getTenantId());
+        return personnelManagementMapper.selectList(qw);
+    }
+
     /**
      * 处理图片集合转换
      * 优先使用图片集合，如果图片集合为空则使用字符串