From d2306a41a5ea00c16e91d3497ea62f9aa8345e61 Mon Sep 17 00:00:00 2001
From: wangcl <clwangz@qq.com>
Date: Fri, 7 Jan 2022 15:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BB=BB=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=A7=E7=BA=BF=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E7=94=9F=E4=BA=A7=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/busi/domain/BusiPrisonLine.java | 26 +++++++++----------
 .../impl/BusiPrisonLineServiceImpl.java       |  4 +--
 .../service/impl/BusiTaskServiceImpl.java     | 12 +++++++++
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiPrisonLine.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiPrisonLine.java
index 1687d85c1..7a79e69bd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiPrisonLine.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiPrisonLine.java
@@ -16,10 +16,10 @@ public class BusiPrisonLine extends TreeEntity
     private static final long serialVersionUID = 1L;
 
     /** ID主键 */
-    private Long id;
+    private String id;
 
     /** 所属监区 */
-    private Long pid;
+    private String pid;
 
     /** 所属监区名称 */
     @Excel(name = "所属监区")
@@ -45,25 +45,23 @@ public class BusiPrisonLine extends TreeEntity
     @Excel(name = "类型")
     private String classify;
 
-    public void setId(Long id) 
-    {
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
-        return id;
+    public String getPid() {
+        return pid;
     }
-    public void setPid(Long pid) 
-    {
+
+    public void setPid(String pid) {
         this.pid = pid;
     }
 
-    public Long getPid() 
-    {
-        return pid;
-    }
-    public void setDisname(String disname) 
+    public void setDisname(String disname)
     {
         this.disname = disname;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiPrisonLineServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiPrisonLineServiceImpl.java
index 67d18c3cd..31b5d8d59 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiPrisonLineServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiPrisonLineServiceImpl.java
@@ -108,8 +108,8 @@ public class BusiPrisonLineServiceImpl implements IBusiPrisonLineService {
                 continue;
             }
             Ztree ztree = new Ztree();
-            ztree.setId(busiPrisonLine.getId());
-            ztree.setpId(busiPrisonLine.getPid());
+            ztree.setId(Long.valueOf(busiPrisonLine.getId()));
+            ztree.setpId(busiPrisonLine.getPid()==null?0:Long.valueOf(busiPrisonLine.getPid()));
             ztree.setName(busiPrisonLine.getDisname());
             ztree.setTitle(busiPrisonLine.getDisname());
             ztrees.add(ztree);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiTaskServiceImpl.java
index 821709014..ba5ecd0c3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiTaskServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiTaskServiceImpl.java
@@ -1,6 +1,9 @@
 package com.ruoyi.busi.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.busi.domain.BusiPrisonLine;
+import com.ruoyi.busi.mapper.BusiPrisonLineMapper;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,6 +30,9 @@ public class BusiTaskServiceImpl implements IBusiTaskService
     @Autowired
     private BusiTaskMapper busiTaskMapper;
 
+    @Autowired
+    private BusiPrisonLineMapper busiPrisonLineMapper;
+
     /**
      * 查询生产任务
      * 
@@ -62,6 +68,12 @@ public class BusiTaskServiceImpl implements IBusiTaskService
     public int insertBusiTask(BusiTask busiTask)
     {
         busiTask.setCreateTime(DateUtils.getNowDate());
+
+        BusiPrisonLine busiPrisonLine = new BusiPrisonLine();
+        busiPrisonLine.setId(busiTask.getPrisonLineId());
+        busiPrisonLine.setStatus("1"); //生产中
+
+        busiPrisonLineMapper.updateBusiPrisonLine(busiPrisonLine);
         int rows = busiTaskMapper.insertBusiTask(busiTask);
         insertBusiSubTask(busiTask);
         return rows;