ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新建任务时，修改产线状态为生产中

This commit is contained in:
wangcl 2022-01-07 15:16:19 +08:00
parent d8fd9a0cd0
commit d2306a41a5
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiPrisonLine.java
View File

@ -16,10 +16,10 @@ public class BusiPrisonLine extends TreeEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** ID主键 */ /** ID主键 */
private Long id; private String id;
/** 所属监区 */ /** 所属监区 */
private Long pid; private String pid;
/** 所属监区名称 */ /** 所属监区名称 */
@Excel(name = "所属监区") @Excel(name = "所属监区")
@ -45,24 +45,22 @@ public class BusiPrisonLine extends TreeEntity
@Excel(name = "类型") @Excel(name = "类型")
private String classify; private String classify;
public void setId(Long id) public String getId() {
{ return id;
}
public void setId(String id) {
this.id = id; this.id = id;
} }
public Long getId() public String getPid() {
{ return pid;
return id;
} }
public void setPid(Long pid)
{ public void setPid(String pid) {
this.pid = pid; this.pid = pid;
} }
public Long getPid()
{
return pid;
}
public void setDisname(String disname) public void setDisname(String disname)
{ {
this.disname = disname; this.disname = disname;

4
ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiPrisonLineServiceImpl.java
View File

@ -108,8 +108,8 @@ public class BusiPrisonLineServiceImpl implements IBusiPrisonLineService {
continue; continue;
} }
Ztree ztree = new Ztree(); Ztree ztree = new Ztree();
ztree.setId(busiPrisonLine.getId()); ztree.setId(Long.valueOf(busiPrisonLine.getId()));
ztree.setpId(busiPrisonLine.getPid()); ztree.setpId(busiPrisonLine.getPid()==null?0:Long.valueOf(busiPrisonLine.getPid()));
ztree.setName(busiPrisonLine.getDisname()); ztree.setName(busiPrisonLine.getDisname());
ztree.setTitle(busiPrisonLine.getDisname()); ztree.setTitle(busiPrisonLine.getDisname());
ztrees.add(ztree); ztrees.add(ztree);

12
ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiTaskServiceImpl.java
View File

@ -1,6 +1,9 @@
package com.ruoyi.busi.service.impl; package com.ruoyi.busi.service.impl;
import java.util.List; import java.util.List;
import com.ruoyi.busi.domain.BusiPrisonLine;
import com.ruoyi.busi.mapper.BusiPrisonLineMapper;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -27,6 +30,9 @@ public class BusiTaskServiceImpl implements IBusiTaskService
@Autowired @Autowired
private BusiTaskMapper busiTaskMapper; private BusiTaskMapper busiTaskMapper;
@Autowired
private BusiPrisonLineMapper busiPrisonLineMapper;
/** /**
* 查询生产任务 * 查询生产任务
* *
@ -62,6 +68,12 @@ public class BusiTaskServiceImpl implements IBusiTaskService
public int insertBusiTask(BusiTask busiTask) public int insertBusiTask(BusiTask busiTask)
{ {
busiTask.setCreateTime(DateUtils.getNowDate()); busiTask.setCreateTime(DateUtils.getNowDate());
BusiPrisonLine busiPrisonLine = new BusiPrisonLine();
busiPrisonLine.setId(busiTask.getPrisonLineId());
busiPrisonLine.setStatus("1"); //生产中
busiPrisonLineMapper.updateBusiPrisonLine(busiPrisonLine);
int rows = busiTaskMapper.insertBusiTask(busiTask); int rows = busiTaskMapper.insertBusiTask(busiTask);
insertBusiSubTask(busiTask); insertBusiSubTask(busiTask);
return rows; return rows;