mozhe
/
demo
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

临时修改任务下拉列表接口

This commit is contained in:
cjw 2024-02-22 11:08:39 +08:00
parent fe14279ce9
commit d0e973b6b5
5 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanDetailController.java
View File

@ -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<List<MesPlanDetailVo>> selectList(MesPlanDetailBo bo) {
List<MesPlanDetailVo> list = iMesPlanDetailService.querySelectList(bo);
return R.ok(list);
}
/**
* 查询生产计划甘特列表
*

3
ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java
View File

@ -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<MesPlanDetailMapper,
List<GanttVO> queryGanttList(MesPlanDetailBo bo);
AncestorsVO findMaxAncestors();
}

9
ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanDetailService.java
View File

@ -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<MesPlanDetailVo> queryList(MesPlanDetailBo bo);
/**
* 查询计划明细父类型
* @return
*/
List<MesPlanDetailVo> querySelectList(MesPlanDetailBo bo);
/**
* 查询生产计划甘特列表
*

9
ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java
View File

@ -64,7 +64,7 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
}
}
int size = res.size();
List<MesPlanDetailVo> data = new ArrayList<>(size<<2);
List<MesPlanDetailVo> 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<MesPlanDetailVo> querySelectList(MesPlanDetailBo bo) {
bo.setParentId(0L);
LambdaQueryWrapper<MesPlanDetail> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
/**
* 查询生产计划甘特列表
*

1
ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml
View File

@ -29,5 +29,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LIMIT 1
</select>
</mapper>