njs 1 year ago
parent
commit
da160fd4df

+ 9 - 1
suishenbang-system/src/main/java/com/dgtly/system/domain/AlertConfiguration.java

@@ -79,7 +79,15 @@ public class AlertConfiguration extends BaseEntity
         this.alertContent = alertContent;
         this.alertContent = alertContent;
     }
     }
 
 
-    public String getAlertContent() 
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getAlertContent()
     {
     {
         return alertContent;
         return alertContent;
     }
     }

+ 11 - 1
suishenbang-system/src/main/resources/mapper/system/AlertConfigurationMapper.xml

@@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="alertStatus"    column="alert_status"    />
         <result property="alertStatus"    column="alert_status"    />
         <result property="salesLevel"    column="sales_level"    />
         <result property="salesLevel"    column="sales_level"    />
         <result property="orgCode"    column="org_code"    />
         <result property="orgCode"    column="org_code"    />
+        <result property="orgName"    column="org_name"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectAlertConfigurationVo">
     <sql id="selectAlertConfigurationVo">
-        select alert_id, create_by, create_time, update_by, update_time, is_delete, alert_content, alert_start_time, alert_end_time, alert_num, user_type, alert_status,sales_level,org_code from alert_configuration
+        select alert_id, create_by, create_time, update_by, update_time, is_delete, alert_content, alert_start_time, alert_end_time, alert_num, user_type, alert_status,sales_level,org_code,org_name from alert_configuration
     </sql>
     </sql>
 
 
     <select id="selectAlertConfigurationList" parameterType="AlertConfiguration" resultMap="AlertConfigurationResult">
     <select id="selectAlertConfigurationList" parameterType="AlertConfiguration" resultMap="AlertConfigurationResult">
@@ -73,6 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alertNum != null ">alert_num,</if>
             <if test="alertNum != null ">alert_num,</if>
             <if test="userType != null  and userType != ''">user_type,</if>
             <if test="userType != null  and userType != ''">user_type,</if>
             <if test="alertStatus != null  and alertStatus != ''">alert_status,</if>
             <if test="alertStatus != null  and alertStatus != ''">alert_status,</if>
+            <if test="salesLevel != null  and salesLevel != ''">sales_level,</if>
+            <if test="orgCode != null  and orgCode != ''">org_code,</if>
+            <if test="orgName != null  and orgName != ''">org_name,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
@@ -86,6 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alertNum != null ">#{alertNum},</if>
             <if test="alertNum != null ">#{alertNum},</if>
             <if test="userType != null  and userType != ''">#{userType},</if>
             <if test="userType != null  and userType != ''">#{userType},</if>
             <if test="alertStatus != null  and alertStatus != ''">#{alertStatus},</if>
             <if test="alertStatus != null  and alertStatus != ''">#{alertStatus},</if>
+            <if test="salesLevel != null  and salesLevel != ''">#{salesLevel},</if>
+            <if test="orgCode != null  and orgCode != ''">#{orgCode},</if>
+            <if test="orgName != null  and orgName != ''">#{orgName},</if>
          </trim>
          </trim>
     </insert>
     </insert>
 
 
@@ -103,6 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alertNum != null ">alert_num = #{alertNum},</if>
             <if test="alertNum != null ">alert_num = #{alertNum},</if>
             <if test="userType != null  and userType != ''">user_type = #{userType},</if>
             <if test="userType != null  and userType != ''">user_type = #{userType},</if>
             <if test="alertStatus != null  and alertStatus != ''">alert_status = #{alertStatus},</if>
             <if test="alertStatus != null  and alertStatus != ''">alert_status = #{alertStatus},</if>
+            <if test="salesLevel != null  and salesLevel != ''">sales_level = #{salesLevel},</if>
+            <if test="orgCode != null  and orgCode != ''">org_code = #{orgCode},</if>
+            <if test="orgName != null  and orgName != ''">org_name = #{orgName},</if>
         </trim>
         </trim>
         where alert_id = #{alertId}
         where alert_id = #{alertId}
     </update>
     </update>