代码冲突解决

2023-10-18 18:19:14 +08:00
parent 1c6544fea7
commit 7980d2880d
3 changed files with 85 additions and 207 deletions
@@ -55,16 +55,9 @@ public interface CaseApplicationMapper {
     */
    void updatePayType(CaseConfirmPayDTO payDTO);

-    /**
-     * 查询部门长案件
-     * @param caseApplication
-     * @return
-     */
-    List<CaseApplication> selectDeptHeadCaseApplicationList(@Param("caseApplication") CaseApplication caseApplication, @Param("statusList")List<Integer> caseStatusList);

    ToDoCount selectAdminCaseToDoCount();

-    ToDoCount selectDeptHeadCaseToDoCount( @Param("statusList")List<Integer> caseStatusList);

    ToDoCount selectTodoCountByRole(CaseApplication caseApplication);
 }