diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaReportScheduleController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaReportScheduleController.java index e6e3915..ea66ba8 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaReportScheduleController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaReportScheduleController.java @@ -27,7 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 项目排产 * - * @author liujingchao + * @author ruoyi * @date 2025-07-15 */ @Validated @@ -63,7 +63,7 @@ public class OaReportScheduleController extends BaseController { */ @GetMapping("/{scheduleId}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long scheduleId) { + @PathVariable Long scheduleId) { return R.ok(iOaReportScheduleService.queryById(scheduleId)); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaReportSchedule.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaReportSchedule.java index 00afcc3..22fdb01 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaReportSchedule.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaReportSchedule.java @@ -14,7 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 项目排产对象 oa_report_schedule * - * @author liujingchao + * @author ruoyi * @date 2025-07-15 */ @Data diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java index eddb6e8..1159499 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaReportScheduleBo.java @@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 项目排产业务对象 oa_report_schedule * - * @author liujingchao + * @author ruoyi * @date 2025-07-15 */ @@ -23,6 +23,11 @@ import com.ruoyi.common.core.domain.BaseEntity; @EqualsAndHashCode(callSuper = true) public class OaReportScheduleBo extends BaseEntity { + /** + * 主键ID + */ + private Long scheduleId; + /** * 项目ID */ @@ -83,6 +88,11 @@ public class OaReportScheduleBo extends BaseEntity { */ private String accessory; + /** + * 排序 + */ + private Long sort; + /** * 状态 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java index 3afc0dd..a8daa34 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaReportScheduleVo.java @@ -14,7 +14,7 @@ import java.util.Date; /** * 项目排产视图对象 oa_report_schedule * - * @author liujingchao + * @author ruoyi * @date 2025-07-15 */ @Data @@ -23,6 +23,12 @@ public class OaReportScheduleVo { private static final long serialVersionUID = 1L; + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long scheduleId; + /** * 项目ID */ @@ -97,6 +103,12 @@ public class OaReportScheduleVo { @ExcelProperty(value = "OSS附件ID列表,多个ID用逗号分隔") private String accessory; + /** + * 排序 + */ + @ExcelProperty(value = "排序") + private Long sort; + /** * 状态 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaReportScheduleMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaReportScheduleMapper.java index ed0e98a..4f53318 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaReportScheduleMapper.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaReportScheduleMapper.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; /** * 项目排产Mapper接口 * - * @author liujingchao + * @author ruoyi * @date 2025-07-15 */ public interface OaReportScheduleMapper extends BaseMapperPlus { diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaReportScheduleService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaReportScheduleService.java index 11d7dc1..f1b5271 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaReportScheduleService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaReportScheduleService.java @@ -12,7 +12,7 @@ import java.util.List; /** * 项目排产Service接口 * - * @author liujingchao + * @author ruoyi * @date 2025-07-15 */ public interface IOaReportScheduleService { diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportScheduleServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportScheduleServiceImpl.java index 45b2988..76dc7c5 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportScheduleServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportScheduleServiceImpl.java @@ -22,7 +22,7 @@ import java.util.Collection; /** * 项目排产Service业务层处理 * - * @author liujingchao + * @author ruoyi * @date 2025-07-15 */ @RequiredArgsConstructor @@ -70,6 +70,10 @@ public class OaReportScheduleServiceImpl implements IOaReportScheduleService { lqw.eq(StringUtils.isNotBlank(bo.getHeader()), OaReportSchedule::getHeader, bo.getHeader()); lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), OaReportSchedule::getContactPhone, bo.getContactPhone()); lqw.eq(bo.getDeliveryStatus() != null, OaReportSchedule::getDeliveryStatus, bo.getDeliveryStatus()); + lqw.eq(bo.getDeliveryId() != null, OaReportSchedule::getDeliveryId, bo.getDeliveryId()); + lqw.eq(bo.getDeliveryTime() != null, OaReportSchedule::getDeliveryTime, bo.getDeliveryTime()); + lqw.eq(StringUtils.isNotBlank(bo.getAccessory()), OaReportSchedule::getAccessory, bo.getAccessory()); + lqw.eq(bo.getSort() != null, OaReportSchedule::getSort, bo.getSort()); lqw.eq(bo.getStatus() != null, OaReportSchedule::getStatus, bo.getStatus()); return lqw; } @@ -82,6 +86,9 @@ public class OaReportScheduleServiceImpl implements IOaReportScheduleService { OaReportSchedule add = BeanUtil.toBean(bo, OaReportSchedule.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setScheduleId(add.getScheduleId()); + } return flag; } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaReportScheduleMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaReportScheduleMapper.xml index 64943cc..a5229fc 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaReportScheduleMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaReportScheduleMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd">