Merge branch 'LeoN' into test

src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java

@@ -3,6 +3,7 @@ package com.mokamrp.privates.entity;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -29,8 +30,11 @@ public class PostBasePageHandle {
     private Integer materialId;
     private Integer tagId;
     private String domain;
+    private String content;
     private LocalDate startDate;
     private LocalDate endDate;
+    private LocalDateTime startDateTime;
+    private LocalDateTime endDateTime;
     public Integer getPage() {
         return page;
     }

src/main/java/com/mokamrp/privates/mapper/WorkComplainH5RecordMapper.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.pojo.WorkComplainH5Record;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,5 +18,5 @@ import java.util.List;
  */
 @Component
 public interface WorkComplainH5RecordMapper extends BaseMapper<WorkComplainH5Record> {
-    public List<WorkComplainH5Record> getList(Page<WorkComplainH5Record> pageObj);
+    public List<WorkComplainH5Record> getList(Page<WorkComplainH5Record> pageObj, @Param("params")PostBasePageHandle handle);
 }

src/main/java/com/mokamrp/privates/mapper/WorkComplainH5RecordMapper.xml

@@ -18,5 +18,11 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pojo.WorkComplainH5Record">
         SELECT * FROM private_work_complain_h5_record
+        <where>
+            <if test="params.type != null">and complain_type = #{params.type}</if>
+            <if test="params.content != null">and content like concat('%',#{params.content},'%')</if>
+            <if test="params.startDate != null and params.endDate != null">and create_at between #{params.startDate} and #{params.endDate}</if>
+        </where>
+        order by create_at desc
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkComplainH5TypeMapper.xml

@@ -17,5 +17,6 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pojo.WorkComplainH5Type">
         SELECT * FROM private_work_complain_h5_type
+        order by seq asc
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/data/H5ComplaintBtnClickMapper.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper.data;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.mokamrp.privates.mapper.data.pojo.H5ComplaintBtnClick;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@ import java.util.List;
  * @since 2021-11-30
  */
 @Component
+@DS("datadb")
 public interface H5ComplaintBtnClickMapper extends BaseMapper<H5ComplaintBtnClick> {
     public List<H5ComplaintBtnClick> getList(Page<H5ComplaintBtnClick> pageObj);
 }

src/main/java/com/mokamrp/privates/mapper/data/H5ComplaintOpenMapper.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper.data;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.data.pojo.H5ComplaintOpen;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,6 +18,7 @@ import java.util.List;
  * @since 2021-11-30
  */
 @Component
+@DS("datadb")
 public interface H5ComplaintOpenMapper extends BaseMapper<H5ComplaintOpen> {
     public List<H5ComplaintOpen> getList(Page<H5ComplaintOpen> pageObj, @Param("params")PostBasePageHandle postBasePageHandle);
 }

src/main/java/com/mokamrp/privates/mapper/data/H5ComplaintOpenMapper.xml

@@ -16,13 +16,13 @@
         id, page_show, domain, ip, date
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.data.pojo.H5ComplaintOpen">
-        SELECT A.*,B.submit_cnt FROM workwx_h5_complaint_open as A
-        left join (select date,domain,SUM(submit_btn_click) as submit_cnt from workwx_h5_complaint_btn_click group by date,domain)
-            as B on A.date = B.date and A.domain = B.domain
-        group by A.date,A.domain
+        select T.* from (SELECT A.*,B.submit_cnt FROM workwx_h5_complaint_open as A
+                        left join (select date,domain,SUM(submit_btn_click) as submit_cnt from workwx_h5_complaint_btn_click group by date,domain)
+                        as B on A.date = B.date and A.domain = B.domain
+        group by A.date,A.domain) as T
         <where>
-            <if test="params.domain != null">and A.domain = #{params.domain}</if>
-            <if test="params.startDate != null and params.endDate != null">and A.date between #{params.startDate} and #{params.endDate}</if>
+            <if test="params.domain != null">and T.domain = #{params.domain}</if>
+            <if test="params.startDate != null and params.endDate != null">and T.date between #{params.startDate} and #{params.endDate}</if>
         </where>
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/service/data/impl/H5ComplaintBtnClickServiceImpl.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.service.data.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.mokamrp.privates.mapper.data.pojo.H5ComplaintBtnClick;
 import com.mokamrp.privates.mapper.data.H5ComplaintBtnClickMapper;
 import com.mokamrp.privates.service.data.H5ComplaintBtnClickService;
@@ -21,6 +22,7 @@ import java.util.*;
  * @since 2021-11-30
  */
 @Service
+@DS("datadb")
 public class H5ComplaintBtnClickServiceImpl extends ServiceImpl<H5ComplaintBtnClickMapper, H5ComplaintBtnClick> implements H5ComplaintBtnClickService {
 
     @Autowired

src/main/java/com/mokamrp/privates/service/data/impl/H5ComplaintOpenServiceImpl.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.service.data.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.mokamrp.privates.mapper.data.pojo.H5ComplaintOpen;
 import com.mokamrp.privates.mapper.data.H5ComplaintOpenMapper;
 import com.mokamrp.privates.service.data.H5ComplaintOpenService;
@@ -21,6 +22,7 @@ import java.util.*;
  * @since 2021-11-30
  */
 @Service
+@DS("datadb")
 public class H5ComplaintOpenServiceImpl extends ServiceImpl<H5ComplaintOpenMapper, H5ComplaintOpen> implements H5ComplaintOpenService {
 
     @Autowired

src/main/java/com/mokamrp/privates/service/impl/WorkComplainH5RecordServiceImpl.java

@@ -34,7 +34,7 @@ public class WorkComplainH5RecordServiceImpl extends ServiceImpl<WorkComplainH5R
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<WorkComplainH5Record> pageObj = new Page<WorkComplainH5Record>(page, pagesize);
-        List<WorkComplainH5Record> list = workComplainH5RecordMapper.getList(pageObj);
+        List<WorkComplainH5Record> list = workComplainH5RecordMapper.getList(pageObj,handle);
         ResHandle<List<WorkComplainH5Record>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());