修改办事事项管理筛选 bug

lidongdong

2022-10-19 49106a4e02629302f75d9e143fee429bca5facc4

修改办事事项管理筛选  bug

 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java

@@ -59,7 +59,7 @@
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "matterAndUser",required = false) String matterAndUser,
                                          @RequestParam(value = "keyword",required = false) String keyword,
                                          @RequestParam(value = "classifyGrade",required = false) String classifyGrade,
                                          @CurrentUser SysUser sysUser)
    {
@@ -67,9 +67,9 @@
        Assert.notNull(pageSize, "pageSize 不能为空");
        Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
                classifyGrade,ids);
        int num=iTransactionEventService.countNum(matterAndUser,classifyGrade,ids);
        int num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
        return getDataTable(list,num);
    }


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

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


 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java

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

    /**
     * 导办事物列表
     * @return
     */
    public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade,
    public List<TransactionEvent> selectConfigList(String keyword, String classifyGrade,
                                                   List<String> ids);

    /**
@@ -59,7 +59,7 @@
     * 统计数量
     * @return
     */
    public int countNum(String matterAndUser,String classifyGrade,List<String> ids);
    public int countNum(String keyword,String classifyGrade,List<String> ids);

    /**
     * 导办事务搜索

 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java

@@ -65,13 +65,13 @@

    @Override
    public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
                                                   String matterAndUser, String classifyGrade,List<String> ids) {
        return baseMapper.selectConfigList(page,  state, matterAndUser, classifyGrade,ids);
                                                   String keyword, String classifyGrade,List<String> ids) {
        return baseMapper.selectConfigList(page,  state, keyword, classifyGrade,ids);
    }

    @Override
    public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade, List<String> ids) {
        return baseMapper.selectConfigList(matterAndUser,classifyGrade,ids);
    public List<TransactionEvent> selectConfigList(String keyword, String classifyGrade, List<String> ids) {
        return baseMapper.selectConfigList(keyword,classifyGrade,ids);
    }

    @Override

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -152,8 +152,10 @@
    <select id="selectConfigList"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventList"/>
        <where>
            <if test="matterAndUser != null and matterAndUser != ''">
                AND associate_names like concat('%', #{matterAndUser}, '%') or matter_name like concat('%', #{matterAndUser}, '%')
            <if test="keyword != null and keyword != ''">
                AND (matter_name like concat('%', #{keyword}, '%')) or
                    (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
                    or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}
@@ -319,8 +321,10 @@
    <select id="countNum" resultType="integer">
        select count(id) from automessage_transaction_event
        <where>
            <if test="matterAndUser != null and matterAndUser != ''">
                AND associate_names like concat('%', #{matterAndUser}, '%') or matter_name like concat('%', #{matterAndUser}, '%')
            <if test="keyword != null and keyword != ''">
                AND (matter_name like concat('%', #{keyword}, '%')) or
                (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
                or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from classify_administration where classify_grade.id=classify_id) = #{classifyGrade}