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

Merge branch 'master' of http://101.37.69.204:3000/mozhe/demo

This commit is contained in:
cjw 2024-02-22 10:00:52 +08:00
parent 0ce0f2dda3 1d0ecbacc6
commit 3665b4ff2d
5 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanDetail.java
View File

@ -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;
} }

5
ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanDetailBo.java
View File

@ -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
*/ */

6
ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java
View File

@ -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
*/ */

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

@ -38,8 +38,6 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
private final IMesPlanRecordService recordService; private final IMesPlanRecordService recordService;
// public static final String TAB_PREFIX = " ";
/** /**
* 查询生产计划明细 * 查询生产计划明细
*/ */
@ -84,7 +82,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");
@ -113,7 +110,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);

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

@ -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"/>