diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmLeaveReq.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmLeaveReq.java index 074d5e0..1828f39 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmLeaveReq.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmLeaveReq.java @@ -19,6 +19,7 @@ public class HrmLeaveReq extends BaseEntity implements Serializable { @TableId private Long bizId; private Long empId; + private Long projectId; private String leaveType; private Date startTime; private Date endTime; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmReimburseReq.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmReimburseReq.java index 99403e7..a4b4ce9 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmReimburseReq.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmReimburseReq.java @@ -19,6 +19,8 @@ public class HrmReimburseReq extends BaseEntity { private Long empId; + private Long projectId; + private String reimburseType; private BigDecimal totalAmount; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmSealReq.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmSealReq.java index 41c7504..670fe43 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmSealReq.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmSealReq.java @@ -26,6 +26,9 @@ public class HrmSealReq extends BaseEntity implements Serializable { /** 申请人ID */ private Long empId; + /** 项目ID */ + private Long projectId; + /** 用印类型(公章/合同章/财务章等) */ private String sealType; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmTravelReq.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmTravelReq.java index fbbd37a..5253b2b 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmTravelReq.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmTravelReq.java @@ -18,6 +18,7 @@ public class HrmTravelReq extends BaseEntity { @TableId private Long bizId; private Long empId; + private Long projectId; private Date startTime; private Date endTime; private String travelType; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmLeaveReqBo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmLeaveReqBo.java index 81556d2..e77384e 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmLeaveReqBo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmLeaveReqBo.java @@ -18,6 +18,8 @@ public class HrmLeaveReqBo extends BaseEntity { @NotNull(message = "员工ID不能为空") private Long empId; + private Long projectId; + @NotBlank(message = "请假类型不能为空") private String leaveType; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmReimburseReqBo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmReimburseReqBo.java index 7e47f33..c9a6445 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmReimburseReqBo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmReimburseReqBo.java @@ -16,6 +16,8 @@ public class HrmReimburseReqBo extends BaseEntity { @NotNull(message = "员工ID不能为空") private Long empId; + private Long projectId; + private String reimburseType; @NotNull(message = "报销总金额不能为空") diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmSealReqBo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmSealReqBo.java index 57e580a..2fbdbbe 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmSealReqBo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmSealReqBo.java @@ -21,6 +21,9 @@ public class HrmSealReqBo extends BaseEntity { @NotNull(message = "申请人不能为空") private Long empId; + /** 项目ID */ + private Long projectId; + /** 用印类型 */ @NotBlank(message = "用印类型不能为空") private String sealType; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmTravelReqBo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmTravelReqBo.java index 9a74110..ee4b457 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmTravelReqBo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmTravelReqBo.java @@ -17,6 +17,8 @@ public class HrmTravelReqBo extends BaseEntity { @NotNull(message = "员工ID不能为空") private Long empId; + private Long projectId; + @NotNull(message = "开始时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8") private Date startTime; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmLeaveReqVo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmLeaveReqVo.java index edbf70f..9d38776 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmLeaveReqVo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmLeaveReqVo.java @@ -15,6 +15,40 @@ public class HrmLeaveReqVo implements Serializable { private Long bizId; @Excel(name = "员工ID") private Long empId; + @Excel(name = "项目ID") + private Long projectId; + @Excel(name = "项目代号") + private String projectCode; + @Excel(name = "项目名称") + private String projectName; + @Excel(name = "项目编号") + private String projectNum; + @Excel(name = "项目类型") + private String projectType; + @Excel(name = "项目地址") + private String address; + @Excel(name = "项目总款") + private java.math.BigDecimal funds; + @Excel(name = "项目负责人") + private String functionary; + @Excel(name = "开始日期") + private Date beginTime; + @Excel(name = "结束日期") + private Date finishTime; + @Excel(name = "交货期") + private String delivery; + @Excel(name = "质保期") + private String guarantee; + @Excel(name = "优先级") + private String projectGrade; + @Excel(name = "状态") + private String projectStatus; + @Excel(name = "生产结项状态") + private Integer productStatus; + @Excel(name = "项目代表色") + private String color; + @Excel(name = "客户ID") + private Long customerId; @Excel(name = "请假类型") private String leaveType; @Excel(name = "开始时间", width = 25, dateFormat = "yyyy-MM-dd HH:mm:ss") diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmReimburseReqVo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmReimburseReqVo.java index c943411..1abe722 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmReimburseReqVo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmReimburseReqVo.java @@ -17,6 +17,57 @@ public class HrmReimburseReqVo implements Serializable { @Excel(name = "员工ID") private Long empId; + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "项目代号") + private String projectCode; + + @Excel(name = "项目名称") + private String projectName; + + @Excel(name = "项目编号") + private String projectNum; + + @Excel(name = "项目类型") + private String projectType; + + @Excel(name = "项目地址") + private String address; + + @Excel(name = "项目总款") + private BigDecimal funds; + + @Excel(name = "项目负责人") + private String functionary; + + @Excel(name = "开始日期") + private Date beginTime; + + @Excel(name = "结束日期") + private Date finishTime; + + @Excel(name = "交货期") + private String delivery; + + @Excel(name = "质保期") + private String guarantee; + + @Excel(name = "优先级") + private String projectGrade; + + @Excel(name = "状态") + private String projectStatus; + + @Excel(name = "生产结项状态") + private Integer productStatus; + + @Excel(name = "项目代表色") + private String color; + + @Excel(name = "客户ID") + private Long customerId; + @Excel(name = "报销类型") private String reimburseType; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmSealReqVo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmSealReqVo.java index d84af79..36c09ca 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmSealReqVo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmSealReqVo.java @@ -19,6 +19,57 @@ public class HrmSealReqVo implements Serializable { @Excel(name = "申请人ID") private Long empId; + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "项目代号") + private String projectCode; + + @Excel(name = "项目名称") + private String projectName; + + @Excel(name = "项目编号") + private String projectNum; + + @Excel(name = "项目类型") + private String projectType; + + @Excel(name = "项目地址") + private String address; + + @Excel(name = "项目总款") + private java.math.BigDecimal funds; + + @Excel(name = "项目负责人") + private String functionary; + + @Excel(name = "开始日期") + private Date beginTime; + + @Excel(name = "结束日期") + private Date finishTime; + + @Excel(name = "交货期") + private String delivery; + + @Excel(name = "质保期") + private String guarantee; + + @Excel(name = "优先级") + private String projectGrade; + + @Excel(name = "状态") + private String projectStatus; + + @Excel(name = "生产结项状态") + private Integer productStatus; + + @Excel(name = "项目代表色") + private String color; + + @Excel(name = "客户ID") + private Long customerId; + @Excel(name = "用印类型") private String sealType; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmTravelReqVo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmTravelReqVo.java index 542b9a5..0d86ebf 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmTravelReqVo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmTravelReqVo.java @@ -14,6 +14,40 @@ public class HrmTravelReqVo implements Serializable { private Long bizId; @Excel(name = "员工ID") private Long empId; + @Excel(name = "项目ID") + private Long projectId; + @Excel(name = "项目代号") + private String projectCode; + @Excel(name = "项目名称") + private String projectName; + @Excel(name = "项目编号") + private String projectNum; + @Excel(name = "项目类型") + private String projectType; + @Excel(name = "项目地址") + private String address; + @Excel(name = "项目总款") + private java.math.BigDecimal funds; + @Excel(name = "项目负责人") + private String functionary; + @Excel(name = "开始日期") + private Date beginTime; + @Excel(name = "结束日期") + private Date finishTime; + @Excel(name = "交货期") + private String delivery; + @Excel(name = "质保期") + private String guarantee; + @Excel(name = "优先级") + private String projectGrade; + @Excel(name = "状态") + private String projectStatus; + @Excel(name = "生产结项状态") + private Integer productStatus; + @Excel(name = "项目代表色") + private String color; + @Excel(name = "客户ID") + private Long customerId; @Excel(name = "开始时间", width = 25, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date startTime; @Excel(name = "结束时间", width = 25, dateFormat = "yyyy-MM-dd HH:mm:ss") diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmLeaveReqMapper.java b/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmLeaveReqMapper.java index 6c1aed1..b2359d5 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmLeaveReqMapper.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmLeaveReqMapper.java @@ -1,8 +1,20 @@ package com.ruoyi.hrm.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.hrm.domain.HrmLeaveReq; +import com.ruoyi.hrm.domain.bo.HrmLeaveReqBo; import com.ruoyi.hrm.domain.vo.HrmLeaveReqVo; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.session.RowBounds; + +import java.util.List; public interface HrmLeaveReqMapper extends BaseMapperPlus { + + HrmLeaveReqVo selectVoWithProjectById(@Param("bizId") Long bizId); + + List selectVoWithProjectByPage(IPage page, @Param("bo") HrmLeaveReqBo bo); + + List selectVoWithProjectList(@Param("bo") HrmLeaveReqBo bo); } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmReimburseReqMapper.java b/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmReimburseReqMapper.java index 14a130a..cd9642d 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmReimburseReqMapper.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmReimburseReqMapper.java @@ -1,9 +1,20 @@ package com.ruoyi.hrm.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.hrm.domain.HrmReimburseReq; +import com.ruoyi.hrm.domain.bo.HrmReimburseReqBo; import com.ruoyi.hrm.domain.vo.HrmReimburseReqVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface HrmReimburseReqMapper extends BaseMapperPlus { + + HrmReimburseReqVo selectVoWithProjectById(@Param("bizId") Long bizId); + + List selectVoWithProjectByPage(IPage page, @Param("bo") HrmReimburseReqBo bo); + + List selectVoWithProjectList(@Param("bo") HrmReimburseReqBo bo); } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmSealReqMapper.java b/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmSealReqMapper.java index 86d8a2e..b0b54d0 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmSealReqMapper.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmSealReqMapper.java @@ -1,11 +1,22 @@ package com.ruoyi.hrm.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.hrm.domain.HrmSealReq; +import com.ruoyi.hrm.domain.bo.HrmSealReqBo; import com.ruoyi.hrm.domain.vo.HrmSealReqVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 用印申请 Mapper */ public interface HrmSealReqMapper extends BaseMapperPlus { + + HrmSealReqVo selectVoWithProjectById(@Param("bizId") Long bizId); + + List selectVoWithProjectByPage(IPage page, @Param("bo") HrmSealReqBo bo); + + List selectVoWithProjectList(@Param("bo") HrmSealReqBo bo); } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmTravelReqMapper.java b/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmTravelReqMapper.java index da13b57..cd25525 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmTravelReqMapper.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/mapper/HrmTravelReqMapper.java @@ -1,8 +1,19 @@ package com.ruoyi.hrm.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.hrm.domain.HrmTravelReq; +import com.ruoyi.hrm.domain.bo.HrmTravelReqBo; import com.ruoyi.hrm.domain.vo.HrmTravelReqVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface HrmTravelReqMapper extends BaseMapperPlus { + + HrmTravelReqVo selectVoWithProjectById(@Param("bizId") Long bizId); + + List selectVoWithProjectByPage(IPage page, @Param("bo") HrmTravelReqBo bo); + + List selectVoWithProjectList(@Param("bo") HrmTravelReqBo bo); } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmLeaveReqService.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmLeaveReqService.java index 4665db3..9ce4081 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmLeaveReqService.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmLeaveReqService.java @@ -16,6 +16,8 @@ public interface IHrmLeaveReqService { List queryList(HrmLeaveReqBo bo); + List queryListWithProject(HrmLeaveReqBo bo); + Boolean insertByBo(HrmLeaveReqBo bo); Boolean updateByBo(HrmLeaveReqBo bo); diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmReimburseReqService.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmReimburseReqService.java index 7df764a..29d8bc2 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmReimburseReqService.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmReimburseReqService.java @@ -16,6 +16,8 @@ public interface IHrmReimburseReqService { List queryList(HrmReimburseReqBo bo); + List queryListWithProject(HrmReimburseReqBo bo); + Boolean insertByBo(HrmReimburseReqBo bo); Boolean updateByBo(HrmReimburseReqBo bo); @@ -23,3 +25,4 @@ public interface IHrmReimburseReqService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } + diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmSealReqService.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmSealReqService.java index 156d926..9964cf6 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmSealReqService.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmSealReqService.java @@ -17,6 +17,8 @@ public interface IHrmSealReqService { List queryList(HrmSealReqBo bo); + List queryListWithProject(HrmSealReqBo bo); + Boolean insertByBo(HrmSealReqBo bo); Boolean updateByBo(HrmSealReqBo bo); diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmTravelReqService.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmTravelReqService.java index eddaf56..d3e24a5 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmTravelReqService.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmTravelReqService.java @@ -16,6 +16,8 @@ public interface IHrmTravelReqService { List queryList(HrmTravelReqBo bo); + List queryListWithProject(HrmTravelReqBo bo); + Boolean insertByBo(HrmTravelReqBo bo); Boolean updateByBo(HrmTravelReqBo bo); diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmLeaveReqServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmLeaveReqServiceImpl.java index 1a98bab..168a110 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmLeaveReqServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmLeaveReqServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.hrm.domain.HrmFlowTemplate; import com.ruoyi.hrm.domain.HrmLeaveReq; +import com.ruoyi.hrm.domain.HrmLeaveReq; import com.ruoyi.hrm.domain.bo.HrmFlowStartBo; import com.ruoyi.hrm.domain.bo.HrmLeaveReqBo; import com.ruoyi.hrm.domain.vo.HrmLeaveReqVo; @@ -33,20 +34,24 @@ public class HrmLeaveReqServiceImpl implements IHrmLeaveReqService { @Override public HrmLeaveReqVo queryById(Long bizId) { - return baseMapper.selectVoById(bizId); + return baseMapper.selectVoWithProjectById(bizId); } @Override public TableDataInfo queryPageList(HrmLeaveReqBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = pageQuery.build(); + result.setRecords(baseMapper.selectVoWithProjectByPage(result, bo)); return TableDataInfo.build(result); } @Override public List queryList(HrmLeaveReqBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return baseMapper.selectVoWithProjectList(bo); + } + + @Override + public List queryListWithProject(HrmLeaveReqBo bo) { + return baseMapper.selectVoWithProjectList(bo); } @Override @@ -114,6 +119,7 @@ public class HrmLeaveReqServiceImpl implements IHrmLeaveReqService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getBizId() != null, HrmLeaveReq::getBizId, bo.getBizId()); lqw.eq(bo.getEmpId() != null, HrmLeaveReq::getEmpId, bo.getEmpId()); + lqw.eq(bo.getProjectId() != null, HrmLeaveReq::getProjectId, bo.getProjectId()); lqw.eq(bo.getLeaveType() != null, HrmLeaveReq::getLeaveType, bo.getLeaveType()); lqw.eq(bo.getStatus() != null, HrmLeaveReq::getStatus, bo.getStatus()); lqw.eq(bo.getStartTime() != null, HrmLeaveReq::getStartTime, bo.getStartTime()); diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmReimburseReqServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmReimburseReqServiceImpl.java index d5b02ae..b240ec4 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmReimburseReqServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmReimburseReqServiceImpl.java @@ -33,20 +33,24 @@ public class HrmReimburseReqServiceImpl implements IHrmReimburseReqService { @Override public HrmReimburseReqVo queryById(Long bizId) { - return baseMapper.selectVoById(bizId); + return baseMapper.selectVoWithProjectById(bizId); } @Override public TableDataInfo queryPageList(HrmReimburseReqBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = pageQuery.build(); + result.setRecords(baseMapper.selectVoWithProjectByPage(result, bo)); return TableDataInfo.build(result); } @Override public List queryList(HrmReimburseReqBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return baseMapper.selectVoWithProjectList(bo); + } + + @Override + public List queryListWithProject(HrmReimburseReqBo bo) { + return baseMapper.selectVoWithProjectList(bo); } @Override @@ -95,6 +99,7 @@ public class HrmReimburseReqServiceImpl implements IHrmReimburseReqService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getBizId() != null, HrmReimburseReq::getBizId, bo.getBizId()); lqw.eq(bo.getEmpId() != null, HrmReimburseReq::getEmpId, bo.getEmpId()); + lqw.eq(bo.getProjectId() != null, HrmReimburseReq::getProjectId, bo.getProjectId()); lqw.eq(bo.getReimburseType() != null, HrmReimburseReq::getReimburseType, bo.getReimburseType()); lqw.eq(bo.getStatus() != null, HrmReimburseReq::getStatus, bo.getStatus()); return lqw; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmSealReqServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmSealReqServiceImpl.java index 51eef05..ed8570c 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmSealReqServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmSealReqServiceImpl.java @@ -50,20 +50,24 @@ public class HrmSealReqServiceImpl implements IHrmSealReqService { @Override public HrmSealReqVo queryById(Long bizId) { - return baseMapper.selectVoById(bizId); + return baseMapper.selectVoWithProjectById(bizId); } @Override public TableDataInfo queryPageList(HrmSealReqBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = pageQuery.build(); + result.setRecords(baseMapper.selectVoWithProjectByPage(result, bo)); return TableDataInfo.build(result); } @Override public List queryList(HrmSealReqBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return baseMapper.selectVoWithProjectList(bo); + } + + @Override + public List queryListWithProject(HrmSealReqBo bo) { + return baseMapper.selectVoWithProjectList(bo); } @Override @@ -151,6 +155,7 @@ public class HrmSealReqServiceImpl implements IHrmSealReqService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getBizId() != null, HrmSealReq::getBizId, bo.getBizId()); lqw.eq(bo.getEmpId() != null, HrmSealReq::getEmpId, bo.getEmpId()); + lqw.eq(bo.getProjectId() != null, HrmSealReq::getProjectId, bo.getProjectId()); lqw.eq(bo.getSealType() != null, HrmSealReq::getSealType, bo.getSealType()); lqw.eq(bo.getStatus() != null, HrmSealReq::getStatus, bo.getStatus()); lqw.orderByDesc(HrmSealReq::getCreateTime); diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmTravelReqServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmTravelReqServiceImpl.java index b9fffa5..00b3908 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmTravelReqServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmTravelReqServiceImpl.java @@ -33,20 +33,24 @@ public class HrmTravelReqServiceImpl implements IHrmTravelReqService { @Override public HrmTravelReqVo queryById(Long bizId) { - return baseMapper.selectVoById(bizId); + return baseMapper.selectVoWithProjectById(bizId); } @Override public TableDataInfo queryPageList(HrmTravelReqBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = pageQuery.build(); + result.setRecords(baseMapper.selectVoWithProjectByPage(result, bo)); return TableDataInfo.build(result); } @Override public List queryList(HrmTravelReqBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return baseMapper.selectVoWithProjectList(bo); + } + + @Override + public List queryListWithProject(HrmTravelReqBo bo) { + return baseMapper.selectVoWithProjectList(bo); } @Override @@ -99,6 +103,7 @@ public class HrmTravelReqServiceImpl implements IHrmTravelReqService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getBizId() != null, HrmTravelReq::getBizId, bo.getBizId()); lqw.eq(bo.getEmpId() != null, HrmTravelReq::getEmpId, bo.getEmpId()); + lqw.eq(bo.getProjectId() != null, HrmTravelReq::getProjectId, bo.getProjectId()); lqw.eq(bo.getStatus() != null, HrmTravelReq::getStatus, bo.getStatus()); lqw.eq(bo.getStartTime() != null, HrmTravelReq::getStartTime, bo.getStartTime()); return lqw; diff --git a/fad-hrm/src/main/resources/mapper/HrmLeaveReqMapper.xml b/fad-hrm/src/main/resources/mapper/HrmLeaveReqMapper.xml index b8d2dde..bb94d63 100644 --- a/fad-hrm/src/main/resources/mapper/HrmLeaveReqMapper.xml +++ b/fad-hrm/src/main/resources/mapper/HrmLeaveReqMapper.xml @@ -4,6 +4,7 @@ + @@ -19,4 +20,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fad-hrm/src/main/resources/mapper/HrmReimburseReqMapper.xml b/fad-hrm/src/main/resources/mapper/HrmReimburseReqMapper.xml new file mode 100644 index 0000000..e6a3177 --- /dev/null +++ b/fad-hrm/src/main/resources/mapper/HrmReimburseReqMapper.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fad-hrm/src/main/resources/mapper/HrmSealReqMapper.xml b/fad-hrm/src/main/resources/mapper/HrmSealReqMapper.xml index 664f4bd..b79d70e 100644 --- a/fad-hrm/src/main/resources/mapper/HrmSealReqMapper.xml +++ b/fad-hrm/src/main/resources/mapper/HrmSealReqMapper.xml @@ -4,6 +4,7 @@ + @@ -18,4 +19,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fad-hrm/src/main/resources/mapper/HrmTravelReqMapper.xml b/fad-hrm/src/main/resources/mapper/HrmTravelReqMapper.xml index 4e17649..932b21f 100644 --- a/fad-hrm/src/main/resources/mapper/HrmTravelReqMapper.xml +++ b/fad-hrm/src/main/resources/mapper/HrmTravelReqMapper.xml @@ -4,6 +4,7 @@ + @@ -23,4 +24,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + +