From 2908fc089fcb34984c0220dc2a0f7c68525e967e Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sun, 4 Feb 2024 11:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=80=83=E6=A0=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E6=88=91=E7=9A=84=E8=80=83=E6=A0=B8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervise/entity/IndicatorsEntity.java    |  1 -
 .../supervise/mapper/IndicatorsMapper.xml     |  4 ++--
 .../WarehouseUpdownStockupAreaMapper.xml      | 21 +++++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java
index 71a011d59..5fdb00beb 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java
@@ -30,7 +30,6 @@ public class IndicatorsEntity  extends TenantEntity {
 	private Long classifyId;
 
 
-
 	@ApiModelProperty(value = "分数")
 	private int point;
 
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
index 5a0533953..d7809f059 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
@@ -67,8 +67,8 @@
         sc.NAME AS classifyName
         FROM
         sup_indicators AS si
-        LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
-        WHERE si.assess_dept = #{params.deptId} AND si.is_deleted = 0 AND sc.is_deleted = 0
+        LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id AND sc.is_deleted = 0
+        WHERE si.assess_dept = #{params.deptId} AND si.is_deleted = 0
         <if test="params.startTime != null and params.startTime != ''" >
             AND date_format(si.create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
         </if>
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml
index 395dbc2ac..8ee43e3f8 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml
@@ -103,7 +103,8 @@
         GROUP_CONCAT(ldpl.waybill_number) AS waybillNumber,
         ldsa.total_number AS totalNumber,
         sum(lwusa.num) AS totalNum,
-        IF(ldsa.total_number = sum( lwusa.num ),1,0) AS complete
+        IF(ldsa.total_number = sum( lwusa.num ),1,0) AS complete,
+        2 AS goodsType
         FROM
         logpm_warehouse_updown_stockup_area AS lwusa
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON lwusa.association_id = ldpl.id
@@ -115,14 +116,16 @@
     </select>
     <select id="selectStockUpAreaStockList" resultType="java.util.Map">
         SELECT
-        lwusa.materiel_code,
-        lwusa.materiel_name,
-        ldsl.quantity_stock,
-        ldsl.order_code,
-        ldsl.market_name,
-        lwusa.market_id,
-        lwusa.incoming_batch,
-        sum(lwusa.num)
+        lwusa.materiel_code AS materielCode,
+        lwusa.materiel_name AS materielName,
+        ldsl.quantity_stock AS quantityStock,
+        ldsl.order_code AS orderCode,
+        ldsl.market_name AS marketName,
+        lwusa.market_id AS  marketId,
+        lwusa.incoming_batch AS incomingBatch,
+        sum(lwusa.num) AS  totalNum,
+        if(ldsl.quantity_stock = sum(lwusa.num),1,0) AS complete,
+        3 AS goodsType
         FROM
         logpm_warehouse_updown_stockup_area AS lwusa
         LEFT JOIN logpm_distribution_stock_list AS ldsl ON lwusa.association_value = ldsl.cargo_number