softdel公共接口修复

src/main/java/com/mokamrp/privates/controller/BaseController.java

@@ -68,7 +68,7 @@ public class BaseController<T> {
             // 通过反射创建model的实例
             save = clazz.newInstance();
             Class<? extends Object> clazzUpdate = save.getClass();
-            Method setDelFlg = clazzUpdate.getMethod("delFlg", Integer.class);
+            Method setDelFlg = clazzUpdate.getMethod("setDelFlg", Integer.class);
             setDelFlg.invoke(save,0);
         } catch (Exception e) {
             throw new RuntimeException(e);

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskTemplateController.java

@@ -101,7 +101,8 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
         }else{
             //.企微
             for (FosterwxCashTaskTemplate fosterwxCashTaskTemplate : res.getList()){
-                List<FosterwxCashWorkwxTaskList> taskList =  fosterwxCashWorkwxTaskCatalogService.getTaskByTemplateId(fosterwxCashTaskTemplate.getId());
+                postBasePageHandle.setTemplateId(fosterwxCashTaskTemplate.getId());
+                List<FosterwxCashWorkwxTaskList> taskList =  fosterwxCashWorkwxTaskCatalogService.getTaskList(postBasePageHandle);
                 fosterwxCashTaskTemplate.setWorkwxTaskList(taskList);
             }
         }

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashWorkwxTaskCatalogMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
 import org.springframework.stereotype.Component;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -19,6 +20,9 @@ import java.util.List;
  */
 @Component
 public interface FosterwxCashWorkwxTaskCatalogMapper extends BaseMapper<FosterwxCashWorkwxTaskCatalog> {
-    public List<FosterwxCashWorkwxTaskCatalog> getList(Page<FosterwxCashWorkwxTaskCatalog> pageObj, @Param("params")PostBasePageHandle handle);
-    public List<FosterwxCashWorkwxTaskList>getTaskByTemplateId(@Param("templateId") Integer templateId);
+    public List<FosterwxCashWorkwxTaskCatalog> getList(Page<FosterwxCashWorkwxTaskCatalog> pageObj, @Param("params") PostBasePageHandle handle);
+
+    public List<FosterwxCashWorkwxTaskList> getTaskByTemplateId(@Param("templateId") Integer templateId);
+
+    public List<FosterwxCashWorkwxTaskList> getTaskList(@Param("params") PostBasePageHandle handle);
 }

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashWorkwxTaskCatalogMapper.xml

@@ -22,6 +22,7 @@
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog">
         SELECT * FROM pan_fosterwx_cash_workwx_task_catalog
         <where>
+            and del_flg = 1
             <if test="params.templateId != null">and template_id = #{params.templateId}</if>
         </where>
     </select>
@@ -36,4 +37,17 @@
         and A.template_id = #{templateId}
         order by send_at desc
     </select>
+
+    <select id="getTaskList"
+            resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
+        select A.catalog_name,
+               A.send_at,
+               B.*
+        from pan_fosterwx_cash_workwx_task_catalog as A
+                 left join pan_fosterwx_cash_workwx_task_list as B on A.id = B.catalog_id
+        where A.del_flg = 1
+        <if test="params.templateId != null">and A.template_id = #{params.templateId}</if>
+        <if test="params.title != null">and A.title = #{params.title}</if>
+        order by send_at desc
+    </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashWorkwxTaskListMapper.xml

@@ -42,6 +42,7 @@
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
         SELECT *  FROM pan_fosterwx_cash_workwx_task_list
         <where>
+            and del_flg = 1
             <if test="params.templateId != null">and template_id = #{params.templateId}</if>
             <if test="params.catalogId != null">and catalog_id = #{params.catalogId}</if>
         </where>

src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashWorkwxTaskCatalogService.java

@@ -21,4 +21,6 @@ public interface FosterwxCashWorkwxTaskCatalogService extends IService<FosterwxC
     public ResHandle<List<FosterwxCashWorkwxTaskCatalog>> getList(PostBasePageHandle handle);
 
     public List<FosterwxCashWorkwxTaskList> getTaskByTemplateId(Integer templateId);
+
+    public List<FosterwxCashWorkwxTaskList> getTaskList(PostBasePageHandle handle);
 }

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashWorkwxTaskCatalogServiceImpl.java

@@ -42,10 +42,25 @@ public class FosterwxCashWorkwxTaskCatalogServiceImpl extends ServiceImpl<Foster
         return res;
     }
 
+    /**
+     * 通过模板ID获取具体的目录和任务 陆秋成专用
+     * @param templateId
+     * @return
+     */
     public List<FosterwxCashWorkwxTaskList> getTaskByTemplateId(Integer templateId) {
         List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskCatalogMapper.getTaskByTemplateId(templateId);
         return list;
     }
 
+    /**
+     * 查看目录和任务列表 模板查看界面使用
+     * @param handle
+     * @return
+     */
+    public List<FosterwxCashWorkwxTaskList> getTaskList (PostBasePageHandle handle) {
+        List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskCatalogMapper.getTaskList(handle);
+        return list;
+    }
+
 
 }