Forráskód Böngészése

优化 营销文本 代码

wuxw 3 éve%!(EXTRA string=óta)
szülő
commit
455ecfccca

+ 36 - 10
java110-bean/src/main/java/com/java110/dto/marketText/MarketTextDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.marketText;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,9 +16,11 @@ import java.util.Date;
 public class MarketTextDto extends PageDto implements Serializable {
 
     private String textId;
-private String sendRate;
-private String name;
-private String textContent;
+    private String sendRate;
+    private String name;
+    private String textContent;
+    private String smsId;
+    private String smsName;
 
 
     private Date createTime;
@@ -28,25 +31,32 @@ private String textContent;
     public String getTextId() {
         return textId;
     }
-public void setTextId(String textId) {
+
+    public void setTextId(String textId) {
         this.textId = textId;
     }
-public String getSendRate() {
+
+    public String getSendRate() {
         return sendRate;
     }
-public void setSendRate(String sendRate) {
+
+    public void setSendRate(String sendRate) {
         this.sendRate = sendRate;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getTextContent() {
+
+    public String getTextContent() {
         return textContent;
     }
-public void setTextContent(String textContent) {
+
+    public void setTextContent(String textContent) {
         this.textContent = textContent;
     }
 
@@ -66,4 +76,20 @@ public void setTextContent(String textContent) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getSmsId() {
+        return smsId;
+    }
+
+    public void setSmsId(String smsId) {
+        this.smsId = smsId;
+    }
+
+    public String getSmsName() {
+        return smsName;
+    }
+
+    public void setSmsName(String smsName) {
+        this.smsName = smsName;
+    }
 }

+ 33 - 15
java110-bean/src/main/java/com/java110/po/marketText/MarketTextPo.java

@@ -17,6 +17,7 @@ package com.java110.po.marketText;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述: Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2022-10-24 17:09:18 mail: 928255095@qq.com
@@ -28,41 +29,58 @@ import java.util.Date;
 public class MarketTextPo implements Serializable {
 
     private String textId;
-private String sendRate;
-private String name;
-private String textContent;
-private String statusCd = "0";
-public String getTextId() {
+    private String sendRate;
+    private String name;
+    private String textContent;
+    private String statusCd = "0";
+
+    private String smsId;
+
+    public String getTextId() {
         return textId;
     }
-public void setTextId(String textId) {
+
+    public void setTextId(String textId) {
         this.textId = textId;
     }
-public String getSendRate() {
+
+    public String getSendRate() {
         return sendRate;
     }
-public void setSendRate(String sendRate) {
+
+    public void setSendRate(String sendRate) {
         this.sendRate = sendRate;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getTextContent() {
+
+    public String getTextContent() {
         return textContent;
     }
-public void setTextContent(String textContent) {
+
+    public void setTextContent(String textContent) {
         this.textContent = textContent;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
 
+    public String getSmsId() {
+        return smsId;
+    }
 
-
+    public void setSmsId(String smsId) {
+        this.smsId = smsId;
+    }
 }

+ 13 - 3
java110-db/src/main/resources/mapper/common/MarketTextV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存营销文本信息 add by wuxw 2018-07-03 -->
     <insert id="saveMarketTextInfo" parameterType="Map">
         insert into market_text(
-        text_id,send_rate,name,text_content
+        text_id,send_rate,name,text_content,sms_id
         ) values (
-        #{textId},#{sendRate},#{name},#{textContent}
+        #{textId},#{sendRate},#{name},#{textContent},#{smsId}
         )
     </insert>
 
@@ -18,8 +18,9 @@
     <!-- 查询营销文本信息 add by wuxw 2018-07-03 -->
     <select id="getMarketTextInfo" parameterType="Map" resultType="Map">
         select t.text_id,t.text_id textId,t.send_rate,t.send_rate sendRate,t.name,t.text_content,t.text_content
-        textContent,t.status_cd,t.status_cd statusCd
+        textContent,t.status_cd,t.status_cd statusCd,t.sms_id smsId,ms.sms_name smsName,t.create_time createTime
         from market_text t
+        left join market_sms ms on t.sms_id = ms.sms_id and ms.status_cd = '0'
         where 1 =1
         <if test="textId !=null and textId != ''">
             and t.text_id= #{textId}
@@ -33,6 +34,9 @@
         <if test="textContent !=null and textContent != ''">
             and t.text_content= #{textContent}
         </if>
+        <if test="smsId !=null and smsId != ''">
+            and t.sms_id= #{smsId}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -59,6 +63,9 @@
         <if test="textContent !=null and textContent != ''">
             , t.text_content= #{textContent}
         </if>
+        <if test="smsId !=null and smsId != ''">
+            , t.sms_id= #{smsId}
+        </if>
         where 1=1
         <if test="textId !=null and textId != ''">
             and t.text_id= #{textId}
@@ -83,6 +90,9 @@
         <if test="textContent !=null and textContent != ''">
             and t.text_content= #{textContent}
         </if>
+        <if test="smsId !=null and smsId != ''">
+            and t.sms_id= #{smsId}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>