Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-12-08 5e7892cd0921111dfbaf84196f2593f8045d1c11

 flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java

@@ -24,9 +24,10 @@
     * @return
     */
    public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
                                                   @Param("matterAndUser") String matterAndUser,
                                                   @Param("keyword") String keyword,
                                                   @Param("classifyGrade") String classifyGrade,
                                                   @Param("ids") List<String> ids);




@@ -35,7 +36,7 @@
     * @param
     * @return
     */
    public List<TransactionEvent> selectConfigList(@Param("matterAndUser") String matterAndUser,
    public List<TransactionEvent> selectConfigList(@Param("keyword") String keyword,
                                                   @Param("classifyGrade") String classifyGrade,
                                                   @Param("ids") List<String> ids);

@@ -65,7 +66,7 @@
     * @param
     * @return
     */
    public int countNum(@Param("matterAndUser") String matterAndUser,
    public int countNum(@Param("keyword") String keyword,
                        @Param("classifyGrade") String classifyGrade,
                        @Param("ids") List<String> ids);

@@ -178,6 +179,13 @@
    List<TransactionEvent> selectListByIds(String[] list);

    /**
     * 根据分类筛选数据
     * @param ids
     * @return
     */
    List<TransactionEvent> selectClassifyList(List<String> ids);

    /**
     * 根据部门判断是否有事项名称重复
     */
    String selectDataIfExist(@Param("departmentId") String departmentId,