优化发送记录

java110-bean/src/main/java/com/java110/dto/marketLog/MarketLogDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.marketLog;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,16 +16,22 @@ import java.util.Date;
 public class MarketLogDto extends PageDto implements Serializable {
 
     private String personName;
-private String sendContent;
-private String sendWay;
-private String openId;
-private String logId;
-private String communityName;
-private String remark;
-private String ruleId;
-private String communityId;
-private String personTel;
-private String businessType;
+    private String personNameLike;
+    private String sendContent;
+    private String sendWay;
+    private String sendWayName;
+    private String openId;
+    private String logId;
+    private String communityName;
+    private String remark;
+    private String ruleId;
+    private String ruleName;
+    private String communityId;
+    private String personTel;
+    private String businessType;
+    private String businessTypeName;
+    private String startTime;
+    private String endTime;
 
 
     private Date createTime;
@@ -35,67 +42,88 @@ private String businessType;
     public String getPersonName() {
         return personName;
     }
-public void setPersonName(String personName) {
+
+    public void setPersonName(String personName) {
         this.personName = personName;
     }
-public String getSendContent() {
+
+    public String getSendContent() {
         return sendContent;
     }
-public void setSendContent(String sendContent) {
+
+    public void setSendContent(String sendContent) {
         this.sendContent = sendContent;
     }
-public String getSendWay() {
+
+    public String getSendWay() {
         return sendWay;
     }
-public void setSendWay(String sendWay) {
+
+    public void setSendWay(String sendWay) {
         this.sendWay = sendWay;
     }
-public String getOpenId() {
+
+    public String getOpenId() {
         return openId;
     }
-public void setOpenId(String openId) {
+
+    public void setOpenId(String openId) {
         this.openId = openId;
     }
-public String getLogId() {
+
+    public String getLogId() {
         return logId;
     }
-public void setLogId(String logId) {
+
+    public void setLogId(String logId) {
         this.logId = logId;
     }
-public String getCommunityName() {
+
+    public String getCommunityName() {
         return communityName;
     }
-public void setCommunityName(String communityName) {
+
+    public void setCommunityName(String communityName) {
         this.communityName = communityName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getPersonTel() {
+
+    public String getPersonTel() {
         return personTel;
     }
-public void setPersonTel(String personTel) {
+
+    public void setPersonTel(String personTel) {
         this.personTel = personTel;
     }
-public String getBusinessType() {
+
+    public String getBusinessType() {
         return businessType;
     }
-public void setBusinessType(String businessType) {
+
+    public void setBusinessType(String businessType) {
         this.businessType = businessType;
     }
 
@@ -115,4 +143,52 @@ public void setBusinessType(String businessType) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPersonNameLike() {
+        return personNameLike;
+    }
+
+    public void setPersonNameLike(String personNameLike) {
+        this.personNameLike = personNameLike;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getSendWayName() {
+        return sendWayName;
+    }
+
+    public void setSendWayName(String sendWayName) {
+        this.sendWayName = sendWayName;
+    }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
+
+    public String getBusinessTypeName() {
+        return businessTypeName;
+    }
+
+    public void setBusinessTypeName(String businessTypeName) {
+        this.businessTypeName = businessTypeName;
+    }
 }

java110-db/src/main/resources/mapper/common/MarketLogV1ServiceDaoImplMapper.xml

@@ -20,12 +20,25 @@
         select t.person_name,t.person_name personName,t.send_content,t.send_content sendContent,t.send_way,t.send_way
         sendWay,t.open_id,t.open_id openId,t.log_id,t.log_id logId,t.community_name,t.community_name
         communityName,t.status_cd,t.status_cd statusCd,t.remark,t.rule_id,t.rule_id ruleId,t.community_id,t.community_id
-        communityId,t.person_tel,t.person_tel personTel,t.business_type,t.business_type businessType
+        communityId,t.person_tel,t.person_tel personTel,t.business_type,t.business_type businessType,mr.`name` ruleName,
+        td.`name` sendWayName,td1.name businessTypeName
         from market_log t
+        left join market_rule mr on t.rule_id = mr.rule_id and mr.status_cd = '0'
+        LEFT JOIN t_dict td on td.status_cd = t.send_way and td.table_name = 'market_log' and td.table_columns = 'send_way'
+        LEFT JOIN t_dict td1 on td1.status_cd = t.business_type and td1.table_name = 'market_log' and td1.table_columns = 'business_type'
         where 1 =1
         <if test="personName !=null and personName != ''">
             and t.person_name= #{personName}
         </if>
+        <if test="personNameLike !=null and personNameLike != ''">
+            and t.person_name concat('%', #{personName},'%')
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt; #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt; #{endTime}
+        </if>
         <if test="sendContent !=null and sendContent != ''">
             and t.send_content= #{sendContent}
         </if>
@@ -118,6 +131,15 @@
         <if test="personName !=null and personName != ''">
             and t.person_name= #{personName}
         </if>
+        <if test="personNameLike !=null and personNameLike != ''">
+            and t.person_name concat('%', #{personName},'%')
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt; #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt; #{endTime}
+        </if>
         <if test="sendContent !=null and sendContent != ''">
             and t.send_content= #{sendContent}
         </if>