代码提交
This commit is contained in:
parent
5f3c80eb8a
commit
1d0ecbacc6
|
@ -25,10 +25,6 @@ public class MesPlanDetail extends TreeEntity<MesPlanDetail> {
|
||||||
*/
|
*/
|
||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
/**
|
|
||||||
* 祖级列表
|
|
||||||
*/
|
|
||||||
private String ancestors;
|
|
||||||
/**
|
/**
|
||||||
* 主表id
|
* 主表id
|
||||||
*/
|
*/
|
||||||
|
@ -42,5 +38,4 @@ public class MesPlanDetail extends TreeEntity<MesPlanDetail> {
|
||||||
*/
|
*/
|
||||||
@TableLogic
|
@TableLogic
|
||||||
private String delFlag;
|
private String delFlag;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,11 +27,6 @@ public class MesPlanDetailBo extends TreeEntity<MesPlanDetailBo> {
|
||||||
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
|
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
/**
|
|
||||||
* 祖级列表
|
|
||||||
*/
|
|
||||||
private String ancestors;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 主表id
|
* 主表id
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -30,12 +30,6 @@ public class MesPlanDetailVo implements Serializable {
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "父id")
|
@ExcelProperty(value = "父id")
|
||||||
private Long parentId;
|
private Long parentId;
|
||||||
|
|
||||||
/**
|
|
||||||
* 祖级列表
|
|
||||||
*/
|
|
||||||
private String ancestors;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 主表id
|
* 主表id
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -36,8 +36,6 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
|
||||||
|
|
||||||
private final IMesPlanRecordService recordService;
|
private final IMesPlanRecordService recordService;
|
||||||
|
|
||||||
// public static final String TAB_PREFIX = " ";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询生产计划明细
|
* 查询生产计划明细
|
||||||
*/
|
*/
|
||||||
|
@ -82,7 +80,6 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
|
||||||
MesPlanDetailVo actualVo = new MesPlanDetailVo();
|
MesPlanDetailVo actualVo = new MesPlanDetailVo();
|
||||||
actualVo.setId(planVo.getId());
|
actualVo.setId(planVo.getId());
|
||||||
actualVo.setName(planVo.getName());
|
actualVo.setName(planVo.getName());
|
||||||
actualVo.setAncestors(planVo.getAncestors());
|
|
||||||
actualVo.setParentId(planVo.getParentId());
|
actualVo.setParentId(planVo.getParentId());
|
||||||
actualVo.setMainId(planVo.getMainId());
|
actualVo.setMainId(planVo.getMainId());
|
||||||
actualVo.setFlag("actual");
|
actualVo.setFlag("actual");
|
||||||
|
@ -111,7 +108,6 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
|
||||||
// Map<String, Object> params = bo.getParams();
|
// Map<String, Object> params = bo.getParams();
|
||||||
LambdaQueryWrapper<MesPlanDetail> lqw = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<MesPlanDetail> lqw = Wrappers.lambdaQuery();
|
||||||
lqw.eq(bo.getParentId() != null, MesPlanDetail::getParentId, bo.getParentId());
|
lqw.eq(bo.getParentId() != null, MesPlanDetail::getParentId, bo.getParentId());
|
||||||
lqw.eq(bo.getAncestors() != null, MesPlanDetail::getAncestors, bo.getAncestors());
|
|
||||||
lqw.eq(bo.getMainId() != null, MesPlanDetail::getMainId, bo.getMainId());
|
lqw.eq(bo.getMainId() != null, MesPlanDetail::getMainId, bo.getMainId());
|
||||||
lqw.like(StringUtils.isNotBlank(bo.getName()), MesPlanDetail::getName, bo.getName());
|
lqw.like(StringUtils.isNotBlank(bo.getName()), MesPlanDetail::getName, bo.getName());
|
||||||
lqw.orderByAsc(MesPlanDetail::getId);
|
lqw.orderByAsc(MesPlanDetail::getId);
|
||||||
|
|
|
@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<resultMap type="com.ruoyi.mts.domain.MesPlanDetail" id="MesPlanDetailResult">
|
<resultMap type="com.ruoyi.mts.domain.MesPlanDetail" id="MesPlanDetailResult">
|
||||||
<result property="id" column="id"/>
|
<result property="id" column="id"/>
|
||||||
<result property="parentId" column="parent_id"/>
|
<result property="parentId" column="parent_id"/>
|
||||||
<result property="ancestors" column="ancestors"/>
|
|
||||||
<result property="mainId" column="main_id"/>
|
<result property="mainId" column="main_id"/>
|
||||||
<result property="name" column="name"/>
|
<result property="name" column="name"/>
|
||||||
<result property="createBy" column="create_by"/>
|
<result property="createBy" column="create_by"/>
|
||||||
|
|
Loading…
Reference in New Issue