ws-增加人员电话

RuoYi-Vue-v3.8.7/ruoyi-admin/src/main/resources/application-druid.yml

@@ -13,9 +13,12 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:sqlserver://192.168.1.250:1433;DatabaseName=asset
+#                url: jdbc:sqlserver://192.168.1.250:1433;DatabaseName=asset
+#                username: sa
+#                password: 123456
+                url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=asset
                 username: sa
-                password: 123456
+                password: Yun@wocloud.cn486
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

RuoYi-Vue-v3.8.7/ruoyi-admin/src/main/resources/application.yml

@@ -68,13 +68,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 58.144.199.81
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 2
     # 密码
-#    password: cqf2024!
+#    password: Jlp2024!zc
     # 连接超时时间
     timeout: 10s
     lettuce:

RuoYi-Vue-v3.8.7/ruoyi-system/src/main/java/com/ruoyi/system/domain/Assetlog.java

@@ -176,6 +176,15 @@ public class Assetlog implements Serializable {
 
     private String usefor;
 
+    private String telPhone;
+
+    public String getTelPhone() {
+        return telPhone;
+    }
+
+    public void setTelPhone(String telPhone) {
+        this.telPhone = telPhone;
+    }
 
     public Integer getId() {
         return id;

RuoYi-Vue-v3.8.7/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/DepartMentDto.java

@@ -14,6 +14,16 @@ public class DepartMentDto {
     private String personName;
     private String location;
 
+    private String telPhone;
+
+    public String getTelPhone() {
+        return telPhone;
+    }
+
+    public void setTelPhone(String telPhone) {
+        this.telPhone = telPhone;
+    }
+
     public Integer getCompanyId() {
         return companyId;
     }

RuoYi-Vue-v3.8.7/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DepartmentServiceImpl.java

@@ -35,6 +35,7 @@ public class DepartmentServiceImpl implements DepartmentService {
         List<DepartMentDto> copy = null;
         List<String> ids = null;
         List<String> names = null;
+        List<String> phones = null;
         List<Map<String, Object>> maps = new ArrayList<>();
         int i = 0;
         for (DepartMentDto department : departments) {
@@ -45,21 +46,25 @@ public class DepartmentServiceImpl implements DepartmentService {
                     map.put("DepartMentDto", copy.get(0));
                     map.put("kgyIds", ids);
                     map.put("kgyNames", names);
+                    map.put("phones", phones);
                     maps.add(map);
                 }
                 copy = new ArrayList<>();
                 ids = new ArrayList<>();
                 names = new ArrayList<>();
+                phones = new ArrayList<>();
             }
             copy.add(department);
             ids.add(Convert.toStr(department.getDutyId()));
             names.add(department.getPersonName());
+            phones.add(department.getTelPhone());
             i++;
         }
         Map<String, Object> map = new HashMap<>();
         map.put("DepartMentDto", copy.get(0));
         map.put("kgyIds", ids);
         map.put("kgyNames", names);
+        map.put("phones", phones);
         maps.add(map);
 
         return maps;

RuoYi-Vue-v3.8.7/ruoyi-system/src/main/resources/mapper/system/AssetlogMapper.xml

@@ -85,95 +85,97 @@
         <result property="newplace" column="NewPlace" jdbcType="VARCHAR"/>
         <result property="tax" column="Tax" jdbcType="INTEGER"/>
         <result property="usefor" column="UseFor" jdbcType="VARCHAR"/>
+        <result property="telPhone" column="Telefon" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="queryById" resultMap="AssetlogMap">
-        select Id,
-               BatchId,
-               CodeId,
-               Created,
-               UserName,
-               UserId,
-               Name,
-               AssetNo,
-               MainAssetNo,
-               AssetType,
-               AssetTypeId,
-               Size,
-               Model,
-               Brand,
-               Buyed,
-               MadeAt,
-               AssetUnitId,
-               AssetUnit,
-               Quantity,
-               UnitPrice,
-               TotalPrice,
-               Company,
-               CompanyId,
-               Department,
-               DepartmentId,
-               SaveCompany,
-               SaveCompanyId,
-               SaveDepartment,
-               SaveDepartmentId,
-               Location,
-               LocationId,
-               Used,
-               UsedId,
-               Duty,
-               DutyId,
-               AssetState,
-               AssetStateId,
-               AssetSource,
-               AssetSourceId,
-               PostingDate,
-               PredictYear,
-               Discount,
-               SerialNumber,
-               IsChecked,
-               FinanceNo,
-               FinanceType,
-               OriginalNo,
-               FactoryNo,
-               Memo,
-               RepairAt,
-               TakeStock,
-               Gone,
-               state,
-               ScrapAt,
-               ScrapWay,
-               Photo,
-               Refuse,
-               Formula,
-               Guid,
-               CopyId,
-               ParentId,
-               Jiti,
-               Para1,
-               Para2,
-               Para3,
-               Para4,
-               Para5,
-               Para6,
-               Para7,
-               Para8,
-               ApprovalId,
-               Receive,
-               Prev_DutyId,
-               Prev_Duty,
-               Prev_Company,
-               Prev_Department,
-               Store,
-               BeforeDepreciation,
-               BeforeMonth,
-               NewPlace,
-               Tax,
-               UseFor
-
-        from AssetLog
-        where Id = #{id}
+        select a.Id,
+               a.BatchId,
+               a.CodeId,
+               a.Created,
+               a.UserName,
+               a.UserId,
+               a.Name,
+               a.AssetNo,
+               a.MainAssetNo,
+               a.AssetType,
+               a.AssetTypeId,
+               a.Size,
+               a.Model,
+               a.Brand,
+               a.Buyed,
+               a.MadeAt,
+               a.AssetUnitId,
+               a.AssetUnit,
+               a.Quantity,
+               a.UnitPrice,
+               a.TotalPrice,
+               a.Company,
+               a.CompanyId,
+               a.Department,
+               a.DepartmentId,
+               a.SaveCompany,
+               a.SaveCompanyId,
+               a.SaveDepartment,
+               a.SaveDepartmentId,
+               a.Location,
+               a.LocationId,
+               a.Used,
+               a.UsedId,
+               a.Duty,
+               a.DutyId,
+               a.AssetState,
+               a.AssetStateId,
+               a.AssetSource,
+               a.AssetSourceId,
+               a.PostingDate,
+               a.PredictYear,
+               a.Discount,
+               a.SerialNumber,
+               a.IsChecked,
+               a.FinanceNo,
+               a.FinanceType,
+               a.OriginalNo,
+               a.FactoryNo,
+               a.Memo,
+               a.RepairAt,
+               a.TakeStock,
+               a.Gone,
+               a.state,
+               a.ScrapAt,
+               a.ScrapWay,
+               a.Photo,
+               a.Refuse,
+               a.Formula,
+               a.Guid,
+               a.CopyId,
+               a.ParentId,
+               a.Jiti,
+               a.Para1,
+               a.Para2,
+               a.Para3,
+               a.Para4,
+               a.Para5,
+               a.Para6,
+               a.Para7,
+               a.Para8,
+               a.ApprovalId,
+               a.Receive,
+               a.Prev_DutyId,
+               a.Prev_Duty,
+               a.Prev_Company,
+               a.Prev_Department,
+               a.Store,
+               a.BeforeDepreciation,
+               a.BeforeMonth,
+               a.NewPlace,
+               a.Tax,
+               a.UseFor,
+               u.Telefon
+        from AssetLog a
+        left join Users u on a.UserId = u.Id
+        where a.Id = #{id}
     </select>
 
     <!--查询指定行数据-->

RuoYi-Vue-v3.8.7/ruoyi-system/src/main/resources/mapper/system/DepartmentMapper.xml

@@ -29,7 +29,7 @@
         <result property="personName" column="personName" jdbcType="VARCHAR"/>
         <result property="dutyId" column="dutyId" jdbcType="INTEGER"/>
         <result property="location" column="Localtion" jdbcType="VARCHAR"/>
-
+        <result property="telPhone" column="Telefon" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
@@ -195,7 +195,8 @@
     <select id="getDepartments" resultMap="vUserDepartmentMap">
         SELECT
         vudmt.CompanyId,vudmt.DepartmentId,vudmt.Company,vudmt.Name, mmb.Name as personName,vudmt.AccountId AS
-        dutyId,(SELECT TOP 1 Name FROM Location WHERE CompanyId = vudmt.CompanyId ORDER BY Id DESC)AS Localtion
+        dutyId,(SELECT TOP 1 Name FROM Location WHERE CompanyId = vudmt.CompanyId ORDER BY Id DESC)AS Localtion,
+        mmb.Telefon
         FROM
         v_UserDepartment AS vudmt
         LEFT JOIN Member AS mmb ON mmb.Id = vudmt.AccountId