新增接口

module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaOnFileService.java

@@ -222,6 +222,14 @@ public interface IOaOnFileService {
      */
     List<OaOnFileDTO> listFinishedUnOnFile();
 
+    /**
+     * 已完成未归档列表
+     *
+     * @param modelCategories 模型目录
+     * @return
+     */
+    List<OaOnFileDTO> listFinishedUnOnFileByModelCategories(List<String> modelCategories);
+
     /**
      * 分页列表
      *
@@ -293,5 +301,14 @@ public interface IOaOnFileService {
      */
     SuccessResultList<List<OaOnFileDTO>> listPageFinishedUnOnFile(ListPage page);
 
+    /**
+     * 已完成未归档分页列表
+     *
+     * @param modelCategories 模型目录
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<OaOnFileDTO>> listPageFinishedUnOnFileByModelCategories(List<String> modelCategories, ListPage page);
+
 
 }

module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaOnFileServiceImpl.java

@@ -244,6 +244,18 @@ public class OaOnFileServiceImpl extends DefaultBaseService implements IOaOnFile
         return listFinishedUnOnFile(new HashSet<>(processInstanceIds));
     }
 
+    @Override
+    public List<OaOnFileDTO> listFinishedUnOnFileByModelCategories(List<String> modelCategories) {
+        if (modelCategories == null || modelCategories.isEmpty()) {
+            return new ArrayList<>();
+        }
+        Map<String, Object> params = getHashMap(2);
+        params.put(KEY_FINISHED, ISystemConstant.IS_TRUE);
+        params.put("modelCategories", modelCategories);
+        List<String> processInstanceIds = oaOnFileDao.listUnOnFileProcessInstanceId(params);
+        return listFinishedUnOnFile(new HashSet<>(processInstanceIds));
+    }
+
     @Override
     public SuccessResultList<List<OaOnFileDTO>> listPage(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
@@ -310,6 +322,21 @@ public class OaOnFileServiceImpl extends DefaultBaseService implements IOaOnFile
         return new SuccessResultList<>(oaOnFileDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
     }
 
+    @Override
+    public SuccessResultList<List<OaOnFileDTO>> listPageFinishedUnOnFileByModelCategories(List<String> modelCategories, ListPage page) {
+        if (modelCategories == null || modelCategories.isEmpty()) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        Map<String, Object> params = getHashMap(2);
+        params.put(KEY_FINISHED, ISystemConstant.IS_TRUE);
+        params.put("modelCategories", modelCategories);
+        PageHelper.startPage(page.getPage(), page.getRows());
+        List<String> processInstanceIds = oaOnFileDao.listUnOnFileProcessInstanceId(params);
+        PageInfo<String> pageInfo = new PageInfo<>(processInstanceIds);
+        List<OaOnFileDTO> oaOnFileDTOs = listFinishedUnOnFile(new HashSet<>(processInstanceIds));
+        return new SuccessResultList<>(oaOnFileDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
+    }
+
     /**
      * 设置流程参数
      *

module-activiti/src/main/resources/mybatis/mapper/oa/oa-on-file-mapper.xml

@@ -297,6 +297,24 @@
                 t1.END_TIME_ != ''
             )
             </if>
+            <if test="modelCategories != null and modelCategories.size > 0">
+            AND
+                t1.PROC_DEF_ID_ IN (
+                    SELECT
+                        st1.ID_
+                    FROM
+                        act_re_procdef st1
+                    INNER JOIN
+                        act_re_model st2
+                    ON
+                        st1.DEPLOYMENT_ID_ = st2.DEPLOYMENT_ID_
+                    WHERE
+                        st2.CATEGOTY_ IN
+                        <foreach collection="modelCategories" index="index" open="(" separator="," close=")">
+                            #{modelCategories[${index}]}
+                        </foreach>
+                )
+            </if>
     </select>
 
     <!-- 统计 -->