diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanDetailController.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanDetailController.java index 22b4955..e4534ff 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanDetailController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanDetailController.java @@ -1,31 +1,27 @@ package com.ruoyi.mts.controller; -import java.util.List; -import java.util.Arrays; -import java.util.concurrent.TimeUnit; - -import com.ruoyi.mts.domain.vo.GanttVO; -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; -import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; 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.mts.domain.vo.MesPlanDetailVo; import com.ruoyi.mts.domain.bo.MesPlanDetailBo; +import com.ruoyi.mts.domain.vo.GanttVO; +import com.ruoyi.mts.domain.vo.MesPlanDetailVo; import com.ruoyi.mts.service.IMesPlanDetailService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; /** * 生产计划明细 @@ -51,6 +47,17 @@ public class MesPlanDetailController extends BaseController { return R.ok(list); } + /** + * 查询生产计划明细列表 + * 临时使用 + */ + //@SaCheckPermission("mts:planDetail:list") + @GetMapping("/selectList") + public R> selectList(MesPlanDetailBo bo) { + List list = iMesPlanDetailService.querySelectList(bo); + return R.ok(list); + } + /** * 查询生产计划甘特列表 * diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java index 8f8aca9..dba77ce 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java @@ -1,11 +1,11 @@ package com.ruoyi.mts.mapper; +import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.mts.domain.MesPlanDetail; import com.ruoyi.mts.domain.bo.MesPlanDetailBo; import com.ruoyi.mts.domain.vo.AncestorsVO; import com.ruoyi.mts.domain.vo.GanttVO; import com.ruoyi.mts.domain.vo.MesPlanDetailVo; -import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -22,4 +22,5 @@ public interface MesPlanDetailMapper extends BaseMapperPlus queryGanttList(MesPlanDetailBo bo); AncestorsVO findMaxAncestors(); + } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanDetailService.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanDetailService.java index 7cb5697..539402b 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanDetailService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanDetailService.java @@ -1,9 +1,8 @@ package com.ruoyi.mts.service; -import com.ruoyi.mts.domain.MesPlanDetail; +import com.ruoyi.mts.domain.bo.MesPlanDetailBo; import com.ruoyi.mts.domain.vo.GanttVO; import com.ruoyi.mts.domain.vo.MesPlanDetailVo; -import com.ruoyi.mts.domain.bo.MesPlanDetailBo; import java.util.Collection; import java.util.List; @@ -27,6 +26,12 @@ public interface IMesPlanDetailService { */ List queryList(MesPlanDetailBo bo); + /** + * 查询计划明细父类型 + * @return + */ + List querySelectList(MesPlanDetailBo bo); + /** * 查询生产计划甘特列表 * diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java index c745b5f..be90a63 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java @@ -64,7 +64,7 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService { } } int size = res.size(); - List data = new ArrayList<>(size<<2); + List data = new ArrayList<>(size << 2); for (int i = 0; i < size; i++) { //默认第一个为计划数据 MesPlanDetailVo planVo = res.get(i); @@ -91,6 +91,13 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService { return data; } + @Override + public List querySelectList(MesPlanDetailBo bo) { + bo.setParentId(0L); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + /** * 查询生产计划甘特列表 * diff --git a/ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml b/ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml index 3dd1f12..30a0f3c 100644 --- a/ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml +++ b/ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml @@ -29,5 +29,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LIMIT 1 -