leon 4 роки тому
батько
коміт
333ed7e394

+ 2 - 0
src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java

@@ -10,6 +10,8 @@ public class PostBasePageHandle {
     private Integer groupId;
     private Integer stationId;
     private Integer mobileId;
+    private Integer createUid;
+    private Integer title;
     private String name;
     public Integer getPage() {
         return page;

+ 2 - 1
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashTaskTemplateMapper.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper.pangu;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate;
 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 FosterwxCashTaskTemplateMapper extends BaseMapper<FosterwxCashTaskTemplate> {
-    public List<FosterwxCashTaskTemplate> getList(Page<FosterwxCashTaskTemplate> pageObj);
+    public List<FosterwxCashTaskTemplate> getList(Page<FosterwxCashTaskTemplate> pageObj, @Param("params")PostBasePageHandle handle);
 }

+ 10 - 1
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashTaskTemplateMapper.xml

@@ -19,7 +19,16 @@
         id, template_name, template_type, del_flg, create_uid, update_uid, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate">
-        SELECT * FROM pan_fosterwx_cash_task_template where del_flg = 1
+        SELECT A.* FROM pan_fosterwx_cash_task_template as A
+        <if test="params.title != null">
+            left join (select template_id,title from pan_fosterwx_cash_task_list where title like concat('%',#{params.title},'%') group by template_id,title) as B
+            on B.template_id = A.id
+        </if>
+        where A.del_flg = 1
+        <if test="params.name != null">and A.template_name like concat('%',#{params.name},'%')</if>
+        <if test="params.createUid != null">and A.create_uid = #{params.createUid}</if>
+        <if test="params.id != null">and A.id = #{params.id}</if>
+        <if test="params.title != null">and B.title is not null</if>
         order by id desc
     </select>
 </mapper>

+ 6 - 0
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashOasBoxServiceImpl.java

@@ -84,6 +84,9 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
         if (list == null || list.size() <= 0) {
             return null;
         }
+        if (list.size() == 1){
+            return list.get(0);
+        }
         int max = list.size() - 1;
         int min = 0;
         Random random = new Random();
@@ -107,6 +110,9 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
         if (list == null || list.size() <= 0) {
             return null;
         }
+        if (list.size() == 1){
+            return list.get(0);
+        }
         int max = list.size() - 1;
         int min = 0;
         Random random = new Random();

+ 1 - 1
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashTaskTemplateServiceImpl.java

@@ -40,7 +40,7 @@ public class FosterwxCashTaskTemplateServiceImpl extends ServiceImpl<FosterwxCas
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxCashTaskTemplate> pageObj = new Page<FosterwxCashTaskTemplate>(page, pagesize);
-        List<FosterwxCashTaskTemplate> list = fosterwxCashTaskTemplateMapper.getList(pageObj);
+        List<FosterwxCashTaskTemplate> list = fosterwxCashTaskTemplateMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxCashTaskTemplate>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());