diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectScheduleDelayController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectScheduleDelayController.java new file mode 100644 index 0000000..e66ac25 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectScheduleDelayController.java @@ -0,0 +1,101 @@ +package com.ruoyi.oa.controller; + +import java.util.List; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.core.validate.QueryGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.oa.domain.vo.OaProjectScheduleDelayVo; +import com.ruoyi.oa.domain.bo.OaProjectScheduleDelayBo; +import com.ruoyi.oa.service.IOaProjectScheduleDelayService; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 项目进度步骤延期记录 + * + * @author Joshi + * @date 2025-12-10 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/oa/projectScheduleDelay") +public class OaProjectScheduleDelayController extends BaseController { + + private final IOaProjectScheduleDelayService iOaProjectScheduleDelayService; + + /** + * 查询项目进度步骤延期记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(OaProjectScheduleDelayBo bo, PageQuery pageQuery) { + return iOaProjectScheduleDelayService.queryPageList(bo, pageQuery); + } + + /** + * 导出项目进度步骤延期记录列表 + */ + @Log(title = "项目进度步骤延期记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(OaProjectScheduleDelayBo bo, HttpServletResponse response) { + List list = iOaProjectScheduleDelayService.queryList(bo); + ExcelUtil.exportExcel(list, "项目进度步骤延期记录", OaProjectScheduleDelayVo.class, response); + } + + /** + * 获取项目进度步骤延期记录详细信息 + * + * @param delayId 主键 + */ + @GetMapping("/{delayId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long delayId) { + return R.ok(iOaProjectScheduleDelayService.queryById(delayId)); + } + + /** + * 新增项目进度步骤延期记录 + */ + @Log(title = "项目进度步骤延期记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody OaProjectScheduleDelayBo bo) { + return toAjax(iOaProjectScheduleDelayService.insertByBo(bo)); + } + + /** + * 修改项目进度步骤延期记录 + */ + @Log(title = "项目进度步骤延期记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody OaProjectScheduleDelayBo bo) { + return toAjax(iOaProjectScheduleDelayService.updateByBo(bo)); + } + + /** + * 删除项目进度步骤延期记录 + * + * @param delayIds 主键串 + */ + @Log(title = "项目进度步骤延期记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{delayIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] delayIds) { + return toAjax(iOaProjectScheduleDelayService.deleteWithValidByIds(Arrays.asList(delayIds), true)); + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectScheduleDelay.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectScheduleDelay.java new file mode 100644 index 0000000..46b8450 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectScheduleDelay.java @@ -0,0 +1,86 @@ +package com.ruoyi.oa.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 项目进度步骤延期记录对象 oa_project_schedule_delay + * + * @author Joshi + * @date 2025-12-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("oa_project_schedule_delay") +public class OaProjectScheduleDelay extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 延期记录主键 + */ + @TableId(value = "delay_id") + private Long delayId; + /** + * 关联的进度步骤跟踪记录主键（关联oa_project_schedule_step.track_id） + */ + private Long trackId; + /** + * 申请人姓名 + */ + private String applyUserName; + /** + * 申请提交时间 + */ + private Date applyTime; + /** + * 延期申请原因 + */ + private String applyReason; + /** + * 原计划结束时间 + */ + private Date originalEndTime; + /** + * 申请延期后的预计结束时间 + */ + private Date expectEndTime; + /** + * 审批人姓名 + */ + private String approveUserName; + /** + * 审批完成时间 + */ + private Date approveTime; + /** + * 审批结果：0-待审批 1-审批通过 2-审批驳回 + */ + private Long approveResult; + /** + * 审批备注/驳回原因 + */ + private String approveRemark; + /** + * 延期记录状态：0-待审批 1-审批通过 2-审批驳回 3-已撤销 + */ + private Long delayStatus; + /** + * 删除标志：0-正常；1-删除 + */ + @TableLogic + private Long delFlag; + /** + * 备注(如需) + */ + private String remark; + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleDelayBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleDelayBo.java new file mode 100644 index 0000000..7e03a14 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleDelayBo.java @@ -0,0 +1,92 @@ +package com.ruoyi.oa.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 项目进度步骤延期记录业务对象 oa_project_schedule_delay + * + * @author Joshi + * @date 2025-12-10 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class OaProjectScheduleDelayBo extends BaseEntity { + + /** + * 延期记录主键 + */ + private Long delayId; + + /** + * 关联的进度步骤跟踪记录主键（关联oa_project_schedule_step.track_id） + */ + private Long trackId; + + /** + * 申请人姓名 + */ + private String applyUserName; + + /** + * 申请提交时间 + */ + private Date applyTime; + + /** + * 延期申请原因 + */ + private String applyReason; + + /** + * 原计划结束时间 + */ + private Date originalEndTime; + + /** + * 申请延期后的预计结束时间 + */ + private Date expectEndTime; + + /** + * 审批人姓名 + */ + private String approveUserName; + + /** + * 审批完成时间 + */ + private Date approveTime; + + /** + * 审批结果：0-待审批 1-审批通过 2-审批驳回 + */ + private Long approveResult; + + /** + * 审批备注/驳回原因 + */ + private String approveRemark; + + /** + * 延期记录状态：0-待审批 1-审批通过 2-审批驳回 3-已撤销 + */ + private Long delayStatus; + + /** + * 备注(如需) + */ + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleDelayVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleDelayVo.java new file mode 100644 index 0000000..d834e11 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleDelayVo.java @@ -0,0 +1,106 @@ +package com.ruoyi.oa.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.annotation.ExcelDictFormat; +import com.ruoyi.common.convert.ExcelDictConvert; +import lombok.Data; +import java.util.Date; + + + +/** + * 项目进度步骤延期记录视图对象 oa_project_schedule_delay + * + * @author Joshi + * @date 2025-12-10 + */ +@Data +@ExcelIgnoreUnannotated +public class OaProjectScheduleDelayVo { + + private static final long serialVersionUID = 1L; + + /** + * 延期记录主键 + */ + @ExcelProperty(value = "延期记录主键") + private Long delayId; + + /** + * 关联的进度步骤跟踪记录主键（关联oa_project_schedule_step.track_id） + */ + @ExcelProperty(value = "关联的进度步骤跟踪记录主键", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联oa_project_schedule_step.track_id") + private Long trackId; + + /** + * 申请人姓名 + */ + @ExcelProperty(value = "申请人姓名") + private String applyUserName; + + /** + * 申请提交时间 + */ + @ExcelProperty(value = "申请提交时间") + private Date applyTime; + + /** + * 延期申请原因 + */ + @ExcelProperty(value = "延期申请原因") + private String applyReason; + + /** + * 原计划结束时间 + */ + @ExcelProperty(value = "原计划结束时间") + private Date originalEndTime; + + /** + * 申请延期后的预计结束时间 + */ + @ExcelProperty(value = "申请延期后的预计结束时间") + private Date expectEndTime; + + /** + * 审批人姓名 + */ + @ExcelProperty(value = "审批人姓名") + private String approveUserName; + + /** + * 审批完成时间 + */ + @ExcelProperty(value = "审批完成时间") + private Date approveTime; + + /** + * 审批结果：0-待审批 1-审批通过 2-审批驳回 + */ + @ExcelProperty(value = "审批结果：0-待审批 1-审批通过 2-审批驳回") + private Long approveResult; + + /** + * 审批备注/驳回原因 + */ + @ExcelProperty(value = "审批备注/驳回原因") + private String approveRemark; + + /** + * 延期记录状态：0-待审批 1-审批通过 2-审批驳回 3-已撤销 + */ + @ExcelProperty(value = "延期记录状态：0-待审批 1-审批通过 2-审批驳回 3-已撤销") + private Long delayStatus; + + /** + * 备注(如需) + */ + @ExcelProperty(value = "备注(如需)") + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaProjectScheduleDelayMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaProjectScheduleDelayMapper.java new file mode 100644 index 0000000..84faa78 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaProjectScheduleDelayMapper.java @@ -0,0 +1,20 @@ +package com.ruoyi.oa.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.oa.domain.OaProjectScheduleDelay; +import com.ruoyi.oa.domain.vo.OaProjectScheduleDelayVo; +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; + +/** + * 项目进度步骤延期记录Mapper接口 + * + * @author Joshi + * @date 2025-12-10 + */ +public interface OaProjectScheduleDelayMapper extends BaseMapperPlus { + + Page selectVoPagePlus(Page build,@Param(Constants.WRAPPER) QueryWrapper lqw); +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaProjectScheduleDelayService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaProjectScheduleDelayService.java new file mode 100644 index 0000000..632a6b0 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaProjectScheduleDelayService.java @@ -0,0 +1,49 @@ +package com.ruoyi.oa.service; + +import com.ruoyi.oa.domain.OaProjectScheduleDelay; +import com.ruoyi.oa.domain.vo.OaProjectScheduleDelayVo; +import com.ruoyi.oa.domain.bo.OaProjectScheduleDelayBo; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 项目进度步骤延期记录Service接口 + * + * @author Joshi + * @date 2025-12-10 + */ +public interface IOaProjectScheduleDelayService { + + /** + * 查询项目进度步骤延期记录 + */ + OaProjectScheduleDelayVo queryById(Long delayId); + + /** + * 查询项目进度步骤延期记录列表 + */ + TableDataInfo queryPageList(OaProjectScheduleDelayBo bo, PageQuery pageQuery); + + /** + * 查询项目进度步骤延期记录列表 + */ + List queryList(OaProjectScheduleDelayBo bo); + + /** + * 新增项目进度步骤延期记录 + */ + Boolean insertByBo(OaProjectScheduleDelayBo bo); + + /** + * 修改项目进度步骤延期记录 + */ + Boolean updateByBo(OaProjectScheduleDelayBo bo); + + /** + * 校验并批量删除项目进度步骤延期记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleDelayServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleDelayServiceImpl.java new file mode 100644 index 0000000..a9aa316 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleDelayServiceImpl.java @@ -0,0 +1,125 @@ +package com.ruoyi.oa.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.ruoyi.oa.domain.bo.OaProjectScheduleDelayBo; +import com.ruoyi.oa.domain.vo.OaProjectScheduleDelayVo; +import com.ruoyi.oa.domain.OaProjectScheduleDelay; +import com.ruoyi.oa.mapper.OaProjectScheduleDelayMapper; +import com.ruoyi.oa.service.IOaProjectScheduleDelayService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 项目进度步骤延期记录Service业务层处理 + * + * @author Joshi + * @date 2025-12-10 + */ +@RequiredArgsConstructor +@Service +public class OaProjectScheduleDelayServiceImpl implements IOaProjectScheduleDelayService { + + private final OaProjectScheduleDelayMapper baseMapper; + + /** + * 查询项目进度步骤延期记录 + */ + @Override + public OaProjectScheduleDelayVo queryById(Long delayId){ + return baseMapper.selectVoById(delayId); + } + + /** + * 查询项目进度步骤延期记录列表 + */ + @Override + public TableDataInfo queryPageList(OaProjectScheduleDelayBo bo, PageQuery pageQuery) { + QueryWrapper lqw = buildQueryWrapperPlus(bo); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + private QueryWrapper buildQueryWrapperPlus(OaProjectScheduleDelayBo bo) { + return null; + } + + /** + * 查询项目进度步骤延期记录列表 + */ + @Override + public List queryList(OaProjectScheduleDelayBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(OaProjectScheduleDelayBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getTrackId() != null, OaProjectScheduleDelay::getTrackId, bo.getTrackId()); + lqw.like(StringUtils.isNotBlank(bo.getApplyUserName()), OaProjectScheduleDelay::getApplyUserName, bo.getApplyUserName()); + lqw.eq(bo.getApplyTime() != null, OaProjectScheduleDelay::getApplyTime, bo.getApplyTime()); + lqw.eq(StringUtils.isNotBlank(bo.getApplyReason()), OaProjectScheduleDelay::getApplyReason, bo.getApplyReason()); + lqw.eq(bo.getOriginalEndTime() != null, OaProjectScheduleDelay::getOriginalEndTime, bo.getOriginalEndTime()); + lqw.eq(bo.getExpectEndTime() != null, OaProjectScheduleDelay::getExpectEndTime, bo.getExpectEndTime()); + lqw.like(StringUtils.isNotBlank(bo.getApproveUserName()), OaProjectScheduleDelay::getApproveUserName, bo.getApproveUserName()); + lqw.eq(bo.getApproveTime() != null, OaProjectScheduleDelay::getApproveTime, bo.getApproveTime()); + lqw.eq(bo.getApproveResult() != null, OaProjectScheduleDelay::getApproveResult, bo.getApproveResult()); + lqw.eq(StringUtils.isNotBlank(bo.getApproveRemark()), OaProjectScheduleDelay::getApproveRemark, bo.getApproveRemark()); + lqw.eq(bo.getDelayStatus() != null, OaProjectScheduleDelay::getDelayStatus, bo.getDelayStatus()); + lqw.orderByDesc(OaProjectScheduleDelay::getCreateTime); + return lqw; + } + + /** + * 新增项目进度步骤延期记录 + */ + @Override + public Boolean insertByBo(OaProjectScheduleDelayBo bo) { + OaProjectScheduleDelay add = BeanUtil.toBean(bo, OaProjectScheduleDelay.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDelayId(add.getDelayId()); + } + return flag; + } + + /** + * 修改项目进度步骤延期记录 + */ + @Override + public Boolean updateByBo(OaProjectScheduleDelayBo bo) { + OaProjectScheduleDelay update = BeanUtil.toBean(bo, OaProjectScheduleDelay.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(OaProjectScheduleDelay entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除项目进度步骤延期记录 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleDelayMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleDelayMapper.xml new file mode 100644 index 0000000..1ceba8b --- /dev/null +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleDelayMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +