From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口,销售台账查询其产品的状态 2.增添不合格现象字段,取消生产状态字段 3.修改发货审批接口,发货审批通过,生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入,产出2:1调整

---
 src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
index 1018813..aed220c 100644
--- a/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
+++ b/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
@@ -6,12 +6,18 @@
     <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea">
         select * from electricity_consumption_area
         <where>
+            <if test="electricityConsumptionArea.id != null">
+                id = #{electricityConsumptionArea.id}
+            </if>
             <if test="electricityConsumptionArea.areaName != null and electricityConsumptionArea.areaName != ''">
-                area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
+                and area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
             </if>
             <if test="electricityConsumptionArea.areaType != null and electricityConsumptionArea.areaType != ''">
                 and area_type like CONCAT('%', #{electricityConsumptionArea.areaType}, '%')
             </if>
+            <if test="electricityConsumptionArea.sort != null">
+                and sort = #{electricityConsumptionArea.sort}
+            </if>
             <if test="electricityConsumptionArea.fuId != null">
                 and fu_id = #{electricityConsumptionArea.fuId}
             </if>

--
Gitblit v1.9.3