From 8e06982e54ba9597de3db3a111f95e3cc0e673ba Mon Sep 17 00:00:00 2001
From: zhouhy <zhouhy3@mesnac.com>
Date: Fri, 20 Oct 2023 08:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8D=95=E5=85=83=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-local.yml  | 10 ++--
 .../controller/BaseWorkUnitController.java    | 12 +++++
 .../com/aucma/base/domain/BaseWorkUnit.java   | 54 ++++++++++++-------
 .../mapper/base/BaseWorkUnitMapper.xml        |  1 +
 4 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/aucma-admin/src/main/resources/application-local.yml b/aucma-admin/src/main/resources/application-local.yml
index 4a568db..bb57be4 100644
--- a/aucma-admin/src/main/resources/application-local.yml
+++ b/aucma-admin/src/main/resources/application-local.yml
@@ -74,9 +74,9 @@ spring:
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -100,7 +100,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -119,4 +119,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
\ No newline at end of file
+                        multi-statement-allow: true
diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseWorkUnitController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseWorkUnitController.java
index fbe363c..818fde0 100644
--- a/aucma-base/src/main/java/com/aucma/base/controller/BaseWorkUnitController.java
+++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseWorkUnitController.java
@@ -4,7 +4,9 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.aucma.base.domain.BaseMonitorInfo;
+import com.aucma.base.domain.BaseProductLine;
 import com.aucma.base.domain.TreeSelects;
+import com.aucma.base.service.IBaseProductLineService;
 import com.aucma.common.utils.DateUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,8 @@ import com.aucma.common.utils.poi.ExcelUtil;
 public class BaseWorkUnitController extends BaseController {
     @Autowired
     private IBaseWorkUnitService baseWorkUnitService;
+    @Autowired
+    private IBaseProductLineService baseProductLineService;
 
     /**
      * 查询统计单元信息列表
@@ -43,6 +47,14 @@ public class BaseWorkUnitController extends BaseController {
     @GetMapping("/list" )
         public AjaxResult list(BaseWorkUnit baseWorkUnit) {
             List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit);
+        BaseProductLine baseProductLine = new BaseProductLine();
+            for (int i=0;i<list.size();i++){
+                if (list.get(i).getProductLineCode()!=null){
+                    baseProductLine.setProductLineCode(list.get(i).getProductLineCode());
+                    list.get(i).setProductLineName(baseProductLineService.selectBaseProductLineList(baseProductLine).get(0).getProductLineName());
+                }
+
+            }
             return success(list);
         }
     /**
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseWorkUnit.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseWorkUnit.java
index eb5bdc4..ee68480 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseWorkUnit.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseWorkUnit.java
@@ -45,7 +45,17 @@ private static final long serialVersionUID=1L;
             @Excel(name = "产线/工位")
     private String productLineCode;
 
-    /** 统计单元类型 */
+    private String productLineName;
+
+            public String getProductLineName() {
+                return productLineName;
+            }
+
+            public void setProductLineName(String productLineName) {
+                this.productLineName = productLineName;
+            }
+
+            /** 统计单元类型 */
             @Excel(name = "统计单元类型")
     private Long workUnitType;
 
@@ -229,23 +239,27 @@ private static final long serialVersionUID=1L;
             return updatedTime;
             }
 
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("objId",getObjId())
-            .append("workUnitCode",getWorkUnitCode())
-            .append("parentId",getParentId())
-            .append("workUnitName",getWorkUnitName())
-            .append("workUnitAddress",getWorkUnitAddress())
-            .append("ancestors",getAncestors())
-            .append("workUnitSort",getWorkUnitSort())
-            .append("productLineCode",getProductLineCode())
-            .append("workUnitType",getWorkUnitType())
-            .append("isFlag",getIsFlag())
-            .append("createdBy",getCreatedBy())
-            .append("createdTime",getCreatedTime())
-            .append("updatedBy",getUpdatedBy())
-            .append("updatedTime",getUpdatedTime())
-        .toString();
-        }
+            @Override
+            public String toString() {
+                return "BaseWorkUnit{" +
+                        "objId=" + objId +
+                        ", workUnitCode='" + workUnitCode + '\'' +
+                        ", workUnitName='" + workUnitName + '\'' +
+                        ", workUnitAddress='" + workUnitAddress + '\'' +
+                        ", workUnitSort=" + workUnitSort +
+                        ", productLineCode='" + productLineCode + '\'' +
+                        ", productLineName='" + productLineName + '\'' +
+                        ", workUnitType=" + workUnitType +
+                        ", isFlag=" + isFlag +
+                        ", createdBy='" + createdBy + '\'' +
+                        ", createdTime=" + createdTime +
+                        ", updatedBy='" + updatedBy + '\'' +
+                        ", updatedTime=" + updatedTime +
+                        ", children=" + children +
+                        ", parentName='" + parentName + '\'' +
+                        ", parentId=" + parentId +
+                        ", orderNum=" + orderNum +
+                        ", ancestors='" + ancestors + '\'' +
+                        '}';
+            }
         }
diff --git a/aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml
index c03a2fc..f730f09 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml
@@ -13,6 +13,7 @@
             <result property="ancestors"    column="ancestors"    />
             <result property="workUnitSort"    column="work_unit_sort"    />
             <result property="productLineCode"    column="product_line_code"    />
+            <result property="productLineName"    column="product_line_name"    />
             <result property="workUnitType"    column="work_unit_type"    />
             <result property="isFlag"    column="is_flag"    />
             <result property="createdBy"    column="created_by"    />