Echarts报表开发

src/main/java/com/ygj/yuemum/domain/distributionchannel/DcQueryReport.java

@@ -1,50 +1,68 @@
-package com.ygj.yuemum.domain.distributionchannel;
-
-public class DcQueryReport {
-
-    private String start_date;
-    private String end_date;
-    private Integer xul_event;
-    private Integer page;
-    private Integer limit;
-
-    public Integer getXul_event() {
-        return xul_event;
-    }
-
-    public void setXul_event(Integer xul_event) {
-        this.xul_event = xul_event;
-    }
-
-    public String getStart_date() {
-        return start_date;
-    }
-
-    public void setStart_date(String start_date) {
-        this.start_date = start_date;
-    }
-
-    public String getEnd_date() {
-        return end_date;
-    }
-
-    public void setEnd_date(String end_date) {
-        this.end_date = end_date;
-    }
-
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
+package com.ygj.yuemum.domain.distributionchannel;
+
+public class DcQueryReport {
+
+    private String start_date;
+    private String end_date;
+    private Integer xul_event;
+    private String xul_phone;
+    private String xul_introducer_phone;
+    private Integer page;
+    private Integer limit;
+
+    public String getXul_phone() {
+        return xul_phone;
+    }
+
+    public void setXul_phone(String xul_phone) {
+        this.xul_phone = xul_phone;
+    }
+
+    public String getXul_introducer_phone() {
+        return xul_introducer_phone;
+    }
+
+    public void setXul_introducer_phone(String xul_introducer_phone) {
+        this.xul_introducer_phone = xul_introducer_phone;
+    }
+
+    public Integer getXul_event() {
+        return xul_event;
+    }
+
+    public void setXul_event(Integer xul_event) {
+        this.xul_event = xul_event;
+    }
+
+    public String getStart_date() {
+        return start_date;
+    }
+
+    public void setStart_date(String start_date) {
+        this.start_date = start_date;
+    }
+
+    public String getEnd_date() {
+        return end_date;
+    }
+
+    public void setEnd_date(String end_date) {
+        this.end_date = end_date;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
 }

src/main/resources/mybatis/mapper/distributionchannel/DcIntroduceLogMapper.xml

@@ -174,9 +174,16 @@
         WHERE
            ta.xul_introducer_phone != ''
            and ta.xul_event = #{xul_event,jdbcType=INTEGER}
+           AND tb.xul_event = #{xul_event,jdbcType=INTEGER}
         <if test="start_date != null and start_date != ''">
             and ta.xul_date &gt;= #{start_date,jdbcType=DATE}
         </if>
+        <if test="xul_phone != null and xul_phone != ''">
+            and ta.xul_phone like "%"#{xul_phone,jdbcType=VARCHAR}"%"
+        </if>
+        <if test="xul_introducer_phone != null and xul_introducer_phone != ''">
+            and ta.xul_introducer_phone like "%"#{xul_introducer_phone,jdbcType=VARCHAR}"%"
+        </if>
         <if test="end_date != null and end_date != ''">
             and ta.xul_date &lt;= #{end_date,jdbcType=DATE}
         </if>