From 902c5015acc63033049a5e005e25df31ef280ad3 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Wed, 3 Apr 2024 17:20:33 +0800
Subject: [PATCH] =?UTF-8?q?bug=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/app/BackReceiveMapper.xml   |  3 +++
 .../sgzb/material/domain/PurchaseMacodeInfo.java      | 11 +++++++++++
 .../mapper/material/PurchaseMacodeInfoMapper.xml      |  1 +
 .../sgzb/system/service/impl/SelectServiceImpl.java   |  8 +++++---
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index dc5f40af..f2e4fd1e 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -679,6 +679,9 @@
       ) aa on aa.typeId=bad.type_id
     WHERE
       bai.id=#{id}
+      <if test="code != null and code != ''">
+        and CONCAT('NSJJ',mt.`code`,mt.model_code) like concat ('%',#{code},'%')
+      </if>
   </select>
 
   <select id="selectTaskNumByMonthWx" resultType="java.lang.Integer">
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
index 5c9bb831..8cce80ce 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
@@ -112,6 +112,17 @@ public class PurchaseMacodeInfo extends BaseEntity
     /** 到货日期 */
     @ApiModelProperty(value = "到货日期")
     private String arrivalTime;
+    /** 单位名称 */
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
 
     @ApiModelProperty(value = "0,正常 1, 重复数据")
     private int statusFlag;
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index a9363189..5603680b 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -409,6 +409,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         pcd.type_id typeId,
         pcd.task_id taskId,
         mt.CODE specsCode,
+        mt.unit_name unitName,
         mt1.CODE typeCode,
         CASE
 
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java
index 8161486c..48f4174c 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.system.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.bonus.sgzb.common.core.utils.GlobalConstants;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.system.domain.AgreementVo;
@@ -42,13 +43,14 @@ public class SelectServiceImpl implements SelectService {
 
     @Override
     public AjaxResult getProData(SelectDto dto) {
-        List<SelectVo> list = new ArrayList<>();
         try {
-            list = mapper.getProData(dto);
+            List<SelectVo> list = mapper.getProData(dto);
+            list.removeIf(item -> item == null);
+            return AjaxResult.success(list);
         } catch (Exception e) {
             log.error("工程-查询失败", e);
         }
-        return AjaxResult.success(list);
+        return AjaxResult.success();
     }
 
     @Override