Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

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

@@ -24,7 +24,18 @@
     * @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);



    /**
     * 导办事物列表 (部分也)
     * @param
     * @return
     */
    public List<TransactionEvent> selectConfigList(@Param("keyword") String keyword,
                                                   @Param("classifyGrade") String classifyGrade,
                                                   @Param("ids") List<String> ids);

@@ -54,7 +65,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);

@@ -70,7 +81,14 @@
     * @param matterName
     * @return
     */
    List<TransactionEvent> queryMatterNameList(String matterName);
    List<TransactionEvent> queryMatterNameList(@Param("matterName") String matterName,@Param("classifyId") String classifyId);

    /**
     * 导办事务搜索(不带分页)(关联词)
     * @param associateNames
     * @return
     */
    List<TransactionEvent> queryAssociateNamesList(@Param("associateNames") String associateNames,@Param("classifyId") String classifyId);

    /**
     * 导办事务搜索统计数量
@@ -159,11 +177,24 @@
     */
    List<TransactionEvent> selectListByIds(String[] list);

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

    /**
     * 获取统计数据  首页用  勿动
     * 根据办事分类获取办事指南
     */
    int countStatisticsNum(List<String> classifyIds);
    List<String> selectclassifyId(String classifyId);


    /**
     * 根据关联词导办事务搜索搜索(不分页)(去重用于小程序)
     * @param keyWord
     * @return
     */
    List<Search>  selectSearchAssociateDistinct( String keyWord);