diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java index d9c5da4..bdf765c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java @@ -18,11 +18,11 @@ private String name; @ApiModelProperty(value = "部门名", dataType = "String") private String deptName; - @ApiModelProperty(value = "军衔时间", dataType = "String") - private String rankLevelDate; - @ApiModelProperty(value = "待遇级别时间", dataType = "String") - private String treatmentLevelDate; - @ApiModelProperty(value = "职称职务时间", dataType = "String") + @ApiModelProperty(value = "军衔/时间", dataType = "String") + private String rankExperience; + @ApiModelProperty(value = "待遇级别/时间", dataType = "String") + private String treatmentExperience; + @ApiModelProperty(value = "职称职务/时间", dataType = "String") private String titleExperience; @ApiModelProperty(value = "部门id", dataType = "Long") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java index d9c5da4..bdf765c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java @@ -18,11 +18,11 @@ private String name; @ApiModelProperty(value = "部门名", dataType = "String") private String deptName; - @ApiModelProperty(value = "军衔时间", dataType = "String") - private String rankLevelDate; - @ApiModelProperty(value = "待遇级别时间", dataType = "String") - private String treatmentLevelDate; - @ApiModelProperty(value = "职称职务时间", dataType = "String") + @ApiModelProperty(value = "军衔/时间", dataType = "String") + private String rankExperience; + @ApiModelProperty(value = "待遇级别/时间", dataType = "String") + private String treatmentExperience; + @ApiModelProperty(value = "职称职务/时间", dataType = "String") private String titleExperience; @ApiModelProperty(value = "部门id", dataType = "Long") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java index da638bd..045ccd8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java @@ -323,6 +323,13 @@ private String titleExperience; /** + * 待遇级别/时间 + */ + @ApiModelProperty(value = "待遇级别/时间", dataType = "String") + @TableField("treatment_experience") + private String treatmentExperience; + + /** * 奖惩情况 */ @ApiModelProperty(value = "奖惩情况", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java index d9c5da4..bdf765c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java @@ -18,11 +18,11 @@ private String name; @ApiModelProperty(value = "部门名", dataType = "String") private String deptName; - @ApiModelProperty(value = "军衔时间", dataType = "String") - private String rankLevelDate; - @ApiModelProperty(value = "待遇级别时间", dataType = "String") - private String treatmentLevelDate; - @ApiModelProperty(value = "职称职务时间", dataType = "String") + @ApiModelProperty(value = "军衔/时间", dataType = "String") + private String rankExperience; + @ApiModelProperty(value = "待遇级别/时间", dataType = "String") + private String treatmentExperience; + @ApiModelProperty(value = "职称职务/时间", dataType = "String") private String titleExperience; @ApiModelProperty(value = "部门id", dataType = "Long") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java index da638bd..045ccd8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java @@ -323,6 +323,13 @@ private String titleExperience; /** + * 待遇级别/时间 + */ + @ApiModelProperty(value = "待遇级别/时间", dataType = "String") + @TableField("treatment_experience") + private String treatmentExperience; + + /** * 奖惩情况 */ @ApiModelProperty(value = "奖惩情况", dataType = "String") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java index 71d3938..da000bc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java @@ -102,12 +102,12 @@ @Override public Page listPage(Page page, StaffListRequest request) throws Exception { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.like(StringUtils.isNotEmpty(request.getName()), "staff_name", request.getName()); - wrapper.like(StringUtils.isNotEmpty(request.getDeptName()), "dept_name", request.getDeptName()); + wrapper.like(StringUtils.isNotEmpty(request.getName()), "staff_name", request.getName()); // 姓名 + wrapper.like(StringUtils.isNotEmpty(request.getDeptName()), "dept_name", request.getDeptName()); // 工作部门 + wrapper.like(StringUtils.isNotEmpty(request.getRankExperience()), "rank_experience", request.getRankExperience()); // 军衔/时间 + wrapper.like(StringUtils.isNotEmpty(request.getTreatmentExperience()), "treatment_experience", request.getTreatmentExperience()); // 待遇级别/时间 + wrapper.like(StringUtils.isNotEmpty(request.getTitleExperience()), "title_experience", request.getTitleExperience()); // 职称职务/时间 wrapper.eq(Objects.nonNull(request.getDeptId()), "dept_id", request.getDeptId()); - wrapper.eq(StringUtils.isNotEmpty(request.getRankLevelDate()), "rank_level_date", request.getRankLevelDate()); - wrapper.eq(StringUtils.isNotEmpty(request.getTreatmentLevelDate()), "treatment_level_date", request.getTreatmentLevelDate()); - wrapper.eq(StringUtils.isNotEmpty(request.getTitleExperience()), "rank_experience", request.getTitleExperience()); wrapper.orderByDesc("create_time"); Page staffInfoPage = staffInfoMapper.selectPage(page, wrapper); for (BizResourceStaffInfo record : staffInfoPage.getRecords()) { @@ -124,9 +124,9 @@ wrapper.like(StringUtils.isNotEmpty(request.getName()), "staff_name", request.getName()); wrapper.like(StringUtils.isNotEmpty(request.getDeptName()), "dept_name", request.getDeptName()); wrapper.eq(Objects.nonNull(request.getDeptId()), "dept_id", request.getDeptId()); - wrapper.eq(StringUtils.isNotEmpty(request.getRankLevelDate()), "rank_level_date", request.getRankLevelDate()); - wrapper.eq(StringUtils.isNotEmpty(request.getTreatmentLevelDate()), "treatment_level_date", request.getTreatmentLevelDate()); - wrapper.eq(StringUtils.isNotEmpty(request.getTitleExperience()), "rank_experience", request.getTitleExperience()); + wrapper.like(StringUtils.isNotEmpty(request.getRankExperience()), "rank_experience", request.getRankExperience()); // 军衔/时间 + wrapper.like(StringUtils.isNotEmpty(request.getTreatmentExperience()), "treatment_experience", request.getTreatmentExperience()); // 待遇级别/时间 + wrapper.like(StringUtils.isNotEmpty(request.getTitleExperience()), "title_experience", request.getTitleExperience()); // 职称职务/时间 wrapper.orderByDesc("create_time"); return staffInfoMapper.selectList(wrapper); }