From f15ac8c6f55b57eb3ce56ad498079a0847bb9c5f Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 26 Nov 2024 08:54:00 +0800
Subject: [PATCH] =?UTF-8?q?add(base):=20=E6=AF=8D=E7=BA=BF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=8B=8D=E7=85=A7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 BaseBusbarInfo 类中添加 isPictures 字段，用于表示是否拍照- 在 BaseBusbarInfoMapper.xml 中添加 isPictures 的映射- 更新相关 SQL 语句，支持 isPictures 字段的查询和插入
---
 .../com/ruoyi/base/domain/BaseBusbarInfo.java | 13 ++++++++++-
 .../mapper/base/BaseBusbarInfoMapper.xml      | 22 +++++--------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java b/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java
index 5f4dee2..678ed32 100644
--- a/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java
+++ b/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java
@@ -68,6 +68,9 @@ public class BaseBusbarInfo extends BaseEntity
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedTime;
 
+    /** 是否拍照:1-是;0-否 */
+    @Excel(name = "是否拍照:1-是;0-否")
+    private Long isPictures;
 
     public void setObjId(Long objId) 
     {
@@ -177,8 +180,15 @@ public class BaseBusbarInfo extends BaseEntity
     {
         return updatedTime;
     }
+    public void setIsPictures(Long isPictures) 
+    {
+        this.isPictures = isPictures;
+    }
 
-
+    public Long getIsPictures() 
+    {
+        return isPictures;
+    }
 
     @Override
     public String toString() {
@@ -196,6 +206,7 @@ public class BaseBusbarInfo extends BaseEntity
             .append("createdTime", getCreatedTime())
             .append("updatedBy", getUpdatedBy())
             .append("updatedTime", getUpdatedTime())
+            .append("isPictures", getIsPictures())
             .toString();
     }
 }
diff --git a/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml b/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
index 2a396a4..5980b9a 100644
--- a/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
+++ b/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
@@ -18,24 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createdTime"    column="created_time"    />
         <result property="updatedBy"    column="updated_by"    />
         <result property="updatedTime"    column="updated_time"    />
-
+        <result property="isPictures"    column="is_pictures"    />
     </resultMap>
 
     <sql id="selectBaseBusbarInfoVo">
-        select obj_id,
-               busbar_code,
-               busbar_alias,
-               cabinet_code,
-               busbar_dist,
-               is_checked,
-               is_end,
-               is_flag,
-               remark,
-               created_by,
-               created_time,
-               updated_by,
-               updated_time
-        from base_busbar_info bbi
+        select obj_id, busbar_code, busbar_alias, cabinet_code, busbar_dist, is_checked, is_end, is_flag, remark, created_by, created_time, updated_by, updated_time, is_pictures from base_busbar_info
     </sql>
 
     <select id="selectBaseBusbarInfoList" parameterType="BaseBusbarInfo" resultMap="BaseBusbarInfoResult">
@@ -54,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginCreatedTime != null and params.beginCreatedTime != '' and params.endCreatedTime != null and params.endCreatedTime != ''"> and created_time between #{params.beginCreatedTime} and #{params.endCreatedTime}</if>
             <if test="updatedBy != null  and updatedBy != ''"> and updated_by = #{updatedBy}</if>
             <if test="params.beginUpdatedTime != null and params.beginUpdatedTime != '' and params.endUpdatedTime != null and params.endUpdatedTime != ''"> and updated_time between #{params.beginUpdatedTime} and #{params.endUpdatedTime}</if>
-
+            <if test="isPictures != null "> and is_pictures = #{isPictures}</if>
         </where>
     </select>
     
@@ -78,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time,</if>
             <if test="updatedBy != null">updated_by,</if>
             <if test="updatedTime != null">updated_time,</if>
+            <if test="isPictures != null">is_pictures,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="busbarCode != null">#{busbarCode},</if>
@@ -92,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">#{createdTime},</if>
             <if test="updatedBy != null">#{updatedBy},</if>
             <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="isPictures != null">#{isPictures},</if>
          </trim>
     </insert>
 
@@ -110,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time = #{createdTime},</if>
             <if test="updatedBy != null">updated_by = #{updatedBy},</if>
             <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+            <if test="isPictures != null">is_pictures = #{isPictures},</if>
         </trim>
         where obj_id = #{objId}
     </update>