From c0b5a4a4ccf63e09b90c3c8a97732e7589768a9b Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 13 Dec 2024 15:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/tc/entity/Unit.java   | 33 +++++++++++++++++++
 .../tc/service/UnitOtherConcatService.java    |  4 +--
 .../src/main/resources/mapper/UnitMapper.xml  | 10 ++++++
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java
index fb3e0d1..1b99dca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java
@@ -169,6 +169,39 @@ public class Unit implements Serializable {
     @Excel(name="第一联系人职务职称")
     private String dylxrzwzc;
 
+    @ApiModelProperty("首席数据官")
+    @Excel(name="首席数据官")
+    private String sxsjg;
+
+    @ApiModelProperty("首席数据官联系方式")
+    @Excel(name="首席数据官联系方式")
+    private String sxsjglxfs;
+
+    @ApiModelProperty("首席数据官邮箱")
+    @Excel(name="首席数据官邮箱")
+    private String sxsjgyx;
+
+    @ApiModelProperty("首席数据官职务职称")
+    @Excel(name="首席数据官职务职称")
+    private String sxsjgzwzc;
+
+    @ApiModelProperty("数据官联络人")
+    @Excel(name="数据官联络人")
+    private String sjgllr;
+
+    @ApiModelProperty("数据官联络人联系方式")
+    @Excel(name="数据官联络人联系方式")
+    private String sjgllrlxfs;
+
+    @ApiModelProperty("数据官联络人邮箱")
+    @Excel(name="数据官联络人邮箱")
+    private String sjgllryx;
+
+    @ApiModelProperty("数据官联络人职务职称")
+    @Excel(name="数据官联络人职务职称")
+    private String sjgllrzwzc;
+
+
     @ApiModelProperty("单位其他联系人")
     @TableField(exist = false)
     private List<UnitOtherConcat> otherConcat;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java
index c6319bf..d3b3bef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java
@@ -26,7 +26,7 @@ public interface UnitOtherConcatService extends IService<UnitOtherConcat> {
 
     /**
      * 删除
-     * @param UnitOtherConcatidList
+     * @param unitOtherConcatidList
      */
-    void  deleteIdList(List<Long> UnitOtherConcatidList);
+    void  deleteIdList(List<Long> unitOtherConcatidList);
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml
index 3467425..53504c3 100644
--- a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml
@@ -52,6 +52,16 @@
         <result property="delFlag" column="del_flag"/>
         <result property="deptName" column="deptName"/>
         <result property="ancestors" column="ancestors"/>
+
+        <result property="sxsjg" column="sxsjg"/>
+        <result property="sxsjglxfs" column="sxsjglxfs"/>
+        <result property="sxsjgyx" column="sxsjgyx"/>
+        <result property="sxsjgzwzc" column="sxsjgzwzc"/>
+        <result property="sjgllr" column="sjgllr"/>
+        <result property="sjgllrlxfs" column="sjgllrlxfs"/>
+        <result property="sjgllryx" column="sjgllryx"/>
+        <result property="sjgllrzwzc" column="sjgllrzwzc"/>
+
         <collection property="otherConcat" javaType="java.util.List" ofType="com.ruoyi.tc.entity.UnitOtherConcat">
             <id property="concatId" column="concat_id"/>
             <result property="qtlxrxm" column="qtlxrlxfs"/>