1

huimv-farm/src/main/java/vip/xiaonuo/hr/modular/basedepartment/entity/HrBaseDepartment.java

@@ -14,6 +14,7 @@ package vip.xiaonuo.hr.modular.basedepartment.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import java.util.Date;
@@ -24,8 +25,7 @@ import java.util.Date;
  * @author 余
  * @date  2024/12/16 11:09
  **/
-@Getter
-@Setter
+@Data
 @TableName("hr_base_department")
 public class HrBaseDepartment {
 

huimv-farm/src/main/java/vip/xiaonuo/hr/modular/baseemployeeinfo/controller/HrBaseEmployeeInfoController.java

@@ -92,26 +92,26 @@ public class HrBaseEmployeeInfoController {
 
 
     @ApiOperation("获取人员明细详情")
-    @GetMapping("/hr/baseemployeeinfo/detail")
+    @PostMapping("/hr/baseemployeeinfo/detail")
     public CommonResult<HrBaseEmployeeInfo> detail(@Valid HrBaseEmployeeInfoIdParam hrBaseEmployeeInfoIdParam) {
         return CommonResult.data(hrBaseEmployeeInfoService.detail(hrBaseEmployeeInfoIdParam));
     }
 
 
     @ApiOperation("部门本科及以上学历")
-    @GetMapping("/hr/baseemployeeinfo/listByEoucation")
+    @PostMapping("/hr/baseemployeeinfo/listByEoucation")
     public CommonResult<List<EoucationVo>> listByEoucation(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         return CommonResult.data(hrBaseEmployeeInfoService.listByEoucation(employeeInfoEoucation));
     }
 
     @ApiOperation("数量统计及退休人员")
-    @GetMapping("/hr/baseemployeeinfo/countPerson")
+    @PostMapping("/hr/baseemployeeinfo/countPerson")
     public CommonResult<CountPerson> countPerson(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         return CommonResult.data(hrBaseEmployeeInfoService.countPerson(employeeInfoEoucation));
     }
 
     @ApiOperation("历史总人数等")
-    @GetMapping("/hr/baseemployeeinfo/countNum")
+    @PostMapping("/hr/baseemployeeinfo/countNum")
     public CommonResult<CountNum> countNum(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         QueryWrapper<HrBaseEmployeeInfo> mapper = new QueryWrapper<>();
         CountNum countNum = new CountNum();
@@ -128,18 +128,18 @@ public class HrBaseEmployeeInfoController {
     }
 
     @ApiOperation("部门人数统计")
-    @GetMapping("/hr/baseemployeeinfo/listByDepart")
+    @PostMapping("/hr/baseemployeeinfo/listByDepart")
     public CommonResult<List<EoucationVo>> listByDepart(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         return CommonResult.data(hrBaseEmployeeInfoService.listByDepart(employeeInfoEoucation));
     }
     @ApiOperation("部门人数性别统计")
-    @GetMapping("/hr/baseemployeeinfo/listByDepartGender")
+    @PostMapping("/hr/baseemployeeinfo/listByDepartGender")
     public CommonResult<List<EoucationVo>> listByDepartGender(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         return CommonResult.data(hrBaseEmployeeInfoService.listByDepartGender(employeeInfoEoucation));
     }
 
     @ApiOperation("年龄分布")
-    @GetMapping("/hr/baseemployeeinfo/ageDis")
+    @PostMapping("/hr/baseemployeeinfo/ageDis")
     public CommonResult<List<PerNum>> ageDis(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         String orgId = employeeInfoEoucation.getOrgId();
         long age22 = hrBaseEmployeeInfoService.count(new QueryWrapper<HrBaseEmployeeInfo>().eq("ORG_ID", orgId).eq("USER_TYPE",0).between("AGE", 18,22));
@@ -159,7 +159,7 @@ public class HrBaseEmployeeInfoController {
     }
 
     @ApiOperation("性别分布")
-    @GetMapping("/hr/baseemployeeinfo/genderDis")
+    @PostMapping("/hr/baseemployeeinfo/genderDis")
     public CommonResult<List<PerNum>> genderDis(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         String orgId = employeeInfoEoucation.getOrgId();
         long age22 = hrBaseEmployeeInfoService.count(new QueryWrapper<HrBaseEmployeeInfo>().eq("ORG_ID", orgId).eq("USER_TYPE",0).eq("GENDER", 0));
@@ -171,7 +171,7 @@ public class HrBaseEmployeeInfoController {
     }
 
     @ApiOperation("婚姻状况")
-    @GetMapping("/hr/baseemployeeinfo/marrDis")
+    @PostMapping("/hr/baseemployeeinfo/marrDis")
     public CommonResult<List<PerNum>> marrDis(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         String orgId = employeeInfoEoucation.getOrgId();
         long age22 = hrBaseEmployeeInfoService.count(new QueryWrapper<HrBaseEmployeeInfo>().eq("ORG_ID", orgId).eq("USER_TYPE",0).eq("MARRIAGE", 0));
@@ -182,7 +182,7 @@ public class HrBaseEmployeeInfoController {
         return CommonResult.data(perNums);
     }
     @ApiOperation("民族分布")
-    @GetMapping("/hr/baseemployeeinfo/nationDis")
+    @PostMapping("/hr/baseemployeeinfo/nationDis")
     public CommonResult<List<PerNum>> nationDis(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         String orgId = employeeInfoEoucation.getOrgId();
         long age22 = hrBaseEmployeeInfoService.count(new QueryWrapper<HrBaseEmployeeInfo>().eq("ORG_ID", orgId).eq("USER_TYPE",0).eq("NATION", "汉族"));
@@ -194,7 +194,7 @@ public class HrBaseEmployeeInfoController {
     }
 
     @ApiOperation("学历分布")
-    @GetMapping("/hr/baseemployeeinfo/educationDis")
+    @PostMapping("/hr/baseemployeeinfo/educationDis")
     public CommonResult<List<PerNum>> educationDis(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         String orgId = employeeInfoEoucation.getOrgId();
         long age22 = hrBaseEmployeeInfoService.count(new QueryWrapper<HrBaseEmployeeInfo>().eq("ORG_ID", orgId).eq("USER_TYPE",0).eq("EDUCATION", 0));
@@ -215,25 +215,25 @@ public class HrBaseEmployeeInfoController {
     }
 
     @ApiOperation("部门学历分布")
-    @GetMapping("/hr/baseemployeeinfo/listByDepartGenderEducationDis")
+    @PostMapping("/hr/baseemployeeinfo/listByDepartGenderEducationDis")
     public CommonResult<List<EoucationVo>> listByDepartGenderEducationDis(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         return CommonResult.data(hrBaseEmployeeInfoService.listByDepartGenderEducationDis(employeeInfoEoucation));
     }
 
     @ApiOperation("生日分布")
-    @GetMapping("/hr/baseemployeeinfo/birthDis")
+    @PostMapping("/hr/baseemployeeinfo/birthDis")
     public CommonResult<List<PerNum>> birthDis(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         return CommonResult.data(hrBaseEmployeeInfoService.birthDis(employeeInfoEoucation));
     }
 
     @ApiOperation("司龄分布")
-    @GetMapping("/hr/baseemployeeinfo/siLingDis")
+    @PostMapping("/hr/baseemployeeinfo/siLingDis")
     public CommonResult<List<PerNum>> siLingDis(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         return CommonResult.data(hrBaseEmployeeInfoService.siLingDis(employeeInfoEoucation));
     }
 
     @ApiOperation("工龄分布")
-    @GetMapping("/hr/baseemployeeinfo/gongLingDis")
+    @PostMapping("/hr/baseemployeeinfo/gongLingDis")
     public CommonResult<List<PerNum>> gongLingDis(@Valid EmployeeInfoEoucation employeeInfoEoucation) {
         return CommonResult.data(hrBaseEmployeeInfoService.gongLingDis(employeeInfoEoucation));
     }

huimv-farm/src/main/java/vip/xiaonuo/hr/modular/baseemployeeinfo/entity/HrBaseEmployeeInfo.java

@@ -13,9 +13,12 @@
 package vip.xiaonuo.hr.modular.baseemployeeinfo.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.hr.modular.basedepartment.entity.HrBaseDepartment;
 
 import java.util.Date;
 
@@ -101,6 +104,7 @@ public class HrBaseEmployeeInfo {
 
     /** 机构id */
     @ApiModelProperty(value = "机构id", position = 18)
+//    @Trans(type = TransType.SIMPLE, target = HrBaseDepartment.class, fields = "name", alias = "manager", ref = "managerName")
     private String departmentId;
 
     /** 删除标志 */