yousongbo 3 týždňov pred
rodič
commit
574ef12a40

+ 47 - 0
suishenbang-system/src/main/java/com/dgtly/system/domain/SysMagnetLog.java

@@ -72,6 +72,53 @@ public class SysMagnetLog extends BaseEntity
     @Excel(name = "移动端/电脑端")
     private String whatEndStr;
 
+
+    //shopCode服务商编码,salesOfficeName大区,salesCompanyName公司,subOfficeName销售部
+    @Excel(name = "服务商编码")
+    private String shopCode;
+
+    @Excel(name = "大区名称")
+    private String salesOfficeName;
+
+    @Excel(name = "公司名称")
+    private String salesCompanyName;
+
+    @Excel(name = "销售部名称")
+    private String subOfficeName;
+
+
+    public String getShopCode() {
+        return shopCode;
+    }
+
+    public void setShopCode(String shopCode) {
+        this.shopCode = shopCode;
+    }
+
+    public String getSalesOfficeName() {
+        return salesOfficeName;
+    }
+
+    public void setSalesOfficeName(String salesOfficeName) {
+        this.salesOfficeName = salesOfficeName;
+    }
+
+    public String getSalesCompanyName() {
+        return salesCompanyName;
+    }
+
+    public void setSalesCompanyName(String salesCompanyName) {
+        this.salesCompanyName = salesCompanyName;
+    }
+
+    public String getSubOfficeName() {
+        return subOfficeName;
+    }
+
+    public void setSubOfficeName(String subOfficeName) {
+        this.subOfficeName = subOfficeName;
+    }
+
     public Long getId() {
         return id;
     }

+ 17 - 1
suishenbang-system/src/main/resources/mapper/system/SysMagnetLogMapper.xml

@@ -21,10 +21,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="whatEndStr"    column="whatEndStr"    />
         <result property="loginName"    column="login_name"    />
         <result property="sapEmployeeId"    column="sap_employee_id"    />
+        <result property="shopCode"    column="shop_code"    />
+        <result property="salesOfficeName"    column="sales_office_name"    />
+        <result property="salesCompanyName"    column="sales_company_name"    />
+        <result property="subOfficeName"    column="subOffice_name"    />
     </resultMap>
 
     <sql id="selectSysMagnetLogVo">
-        select id, user_id, user_name, login_name,sap_employee_id,org_code, org_name, level, magnet_name, create_by, create_time, update_by, update_time,stay_duration,what_end from sys_magnet_log
+        select id, user_id, user_name, login_name,sap_employee_id,org_code, org_name, level, magnet_name, create_by, create_time, update_by, update_time,stay_duration,what_end,shop_code,sales_office_name,sales_company_name,subOffice_name from sys_magnet_log
     </sql>
 
     <select id="selectSysMagnetLogList" parameterType="SysMagnetLog" resultMap="SysMagnetLogResult">
@@ -77,6 +81,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null ">update_time,</if>
             <if test="stayDuration != null">stay_duration,</if>
             <if test="whatEnd != null ">what_end,</if>
+            <if test="shopCode != null  and shopCode != ''">shop_code,</if>
+            <if test="salesOfficeName != null ">sales_office_name,</if>
+            <if test="salesCompanyName != null">sales_company_name,</if>
+            <if test="subOfficeName != null ">subOffice_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null ">#{userId},</if>
@@ -91,6 +99,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null ">#{createTime},</if>
             <if test="stayDuration != null">#{stayDuration},</if>
             <if test="whatEnd != null ">#{whatEnd},</if>
+            <if test="shopCode != null  and shopCode != ''">#{shopCode},</if>
+            <if test="salesOfficeName != null ">#{salesOfficeName},</if>
+            <if test="salesCompanyName != null">#{salesCompanyName},</if>
+            <if test="subOfficeName != null ">#{subOfficeName},</if>
          </trim>
     </insert>
 
@@ -111,6 +123,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null ">update_time = #{updateTime},</if>
             <if test="stayDuration != null">stay_duration=#{stayDuration},</if>
             <if test="whatEnd != null ">what_end=#{whatEnd},</if>
+            <if test="shopCode != null  and shopCode != ''">shop_code = #{shopCode},</if>
+            <if test="salesOfficeName != null ">sales_office_name = #{salesOfficeName},</if>
+            <if test="salesCompanyName != null">sales_company_name=#{salesCompanyName},</if>
+            <if test="subOfficeName != null ">subOffice_name=#{subOfficeName},</if>
         </trim>
         where id = #{id}
     </update>

+ 4 - 0
suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -199,6 +199,10 @@ public class WxPortalController extends ApiBaseController {
         sysMagnetLog.setLevel(obj.getString("level"));
         sysMagnetLog.setMagnetName(obj.getString("magnetName"));
         sysMagnetLog.setWhatEnd(obj.getLong("whatEnd"));
+        sysMagnetLog.setSalesCompanyName(obj.getString("salesCompanyName") == null ? "" : obj.getString("salesCompanyName"));
+        sysMagnetLog.setSalesOfficeName(obj.getString("salesOfficeName") == null ? "" : obj.getString("salesOfficeName"));
+        sysMagnetLog.setSubOfficeName(obj.getString("subOfficeName") == null ? "" : obj.getString("subOfficeName"));
+        sysMagnetLog.setShopCode(obj.getString("shopCode") == null ? "" : obj.getString("shopCode"));
         return toAjax(sysMagnetLogService.insertSysMagnetLog(sysMagnetLog));
     }