diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanRecordController.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanRecordController.java index 848abfd..90ca723 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanRecordController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanRecordController.java @@ -5,8 +5,10 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; + import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; + import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -67,10 +69,15 @@ public class MesPlanRecordController extends BaseController { @SaCheckPermission("mts:planRecord:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(iMesPlanRecordService.queryById(id)); } + @GetMapping("/queryByBo") + public R queryByBo(MesPlanRecordBo bo) { + return R.ok(iMesPlanRecordService.queryByBo(bo)); + } + /** * 新增生产计划明细日期记录 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanRecord.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanRecord.java index 672d958..706fbe4 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanRecord.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanRecord.java @@ -3,11 +3,13 @@ package com.ruoyi.mts.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; @@ -22,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity; @TableName("mes_plan_record") public class MesPlanRecord extends BaseEntity { - private static final long serialVersionUID=1L; + private static final long serialVersionUID = 1L; /** * 主键 @@ -33,6 +35,10 @@ public class MesPlanRecord extends BaseEntity { * 任务id */ private Long detailId; + /** + * 记录日期 + */ + private Date recordDate; /** * 备注 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java index 55e1377..917f216 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java @@ -4,13 +4,16 @@ 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; +import org.springframework.format.annotation.DateTimeFormat; /** * 生产计划明细日期记录业务对象 mes_plan_record @@ -26,37 +29,39 @@ public class MesPlanRecordBo extends BaseEntity { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) private Long id; /** * 任务id */ - @NotNull(message = "任务id不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "任务id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long detailId; + /** + * 记录日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date recordDate; + /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark; /** * 开始时间 */ - @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date startDate; /** * 结束时间 */ - @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date endDate; /** * oss_id */ - @NotNull(message = "oss_id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long ossId; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java index 3b28c00..d54c01c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java @@ -1,12 +1,14 @@ package com.ruoyi.mts.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; import java.io.Serializable; @@ -35,6 +37,11 @@ public class MesPlanRecordVo implements Serializable { @ExcelProperty(value = "任务id") private Long detailId; + /** + * 记录日期 + */ + private Date recordDate; + /** * 备注 */ @@ -58,6 +65,4 @@ public class MesPlanRecordVo implements Serializable { */ @ExcelProperty(value = "oss_id") private Long ossId; - - } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanRecordMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanRecordMapper.java index 05dea5a..d385fee 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanRecordMapper.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanRecordMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.mts.mapper; import com.ruoyi.mts.domain.MesPlanRecord; import com.ruoyi.mts.domain.vo.MesPlanRecordVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Mapper; /** * 生产计划明细日期记录Mapper接口 @@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; * @author jiangzhe * @date 2024-02-20 */ +@Mapper public interface MesPlanRecordMapper extends BaseMapperPlus { } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanRecordService.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanRecordService.java index 1afe01d..297c320 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanRecordService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanRecordService.java @@ -22,6 +22,8 @@ public interface IMesPlanRecordService { */ MesPlanRecordVo queryById(Long id); + MesPlanRecordVo queryByBo(MesPlanRecordBo bo); + /** * 查询生产计划明细日期记录列表 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanRecordServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanRecordServiceImpl.java index ac27ad6..be9745b 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanRecordServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanRecordServiceImpl.java @@ -35,10 +35,18 @@ public class MesPlanRecordServiceImpl implements IMesPlanRecordService { * 查询生产计划明细日期记录 */ @Override - public MesPlanRecordVo queryById(Long id){ + public MesPlanRecordVo queryById(Long id) { return baseMapper.selectVoById(id); } + @Override + public MesPlanRecordVo queryByBo(MesPlanRecordBo bo) { + return baseMapper.selectVoOne(Wrappers.lambdaQuery(MesPlanRecord.class) + .eq(MesPlanRecord::getDetailId, bo.getDetailId()) + .eq(MesPlanRecord::getRecordDate, bo.getRecordDate()) + .last("limit 1")); + } + /** * 查询生产计划明细日期记录列表 */ @@ -95,7 +103,7 @@ public class MesPlanRecordServiceImpl implements IMesPlanRecordService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(MesPlanRecord entity){ + private void validEntityBeforeSave(MesPlanRecord entity) { //TODO 做一些数据校验,如唯一约束 } @@ -104,7 +112,7 @@ public class MesPlanRecordServiceImpl implements IMesPlanRecordService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteBatchIds(ids) > 0; diff --git a/ruoyi-demo/src/main/resources/mapper/mts/MesPlanRecordMapper.xml b/ruoyi-demo/src/main/resources/mapper/mts/MesPlanRecordMapper.xml index a82887c..89432cc 100644 --- a/ruoyi-demo/src/main/resources/mapper/mts/MesPlanRecordMapper.xml +++ b/ruoyi-demo/src/main/resources/mapper/mts/MesPlanRecordMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-ui-vue3/src/components/FileUpload/index.vue b/ruoyi-ui-vue3/src/components/FileUpload/index.vue index a5c2734..fe21d0a 100644 --- a/ruoyi-ui-vue3/src/components/FileUpload/index.vue +++ b/ruoyi-ui-vue3/src/components/FileUpload/index.vue @@ -1,19 +1,8 @@