lidongdong
2022-10-25 ad23714cfdf2f5e8e763e290880fd704c60361f0
修改办事指南根据分类id刷选  bug
7个文件已修改
67 ■■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/SysUserMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/TransactionEventMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -266,6 +266,19 @@
    }
    /**
     * 办事指南根据分类id筛选
     * @return
     */
    @ApiOperation(value = "办事指南根据分类id筛选",response = ResultData.class)
    @GetMapping("/selectClassifyList")
    @Authorization
    public TableDataInfo<TransactionEvent> selectClassifyList(@RequestParam("ids") List<String> ids)
    {
        return getDataTable(iTransactionEventService.selectClassifyList(ids));
    }
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
@@ -260,4 +260,11 @@
    @ApiModelProperty("是否是部门领导(1是  2不是)")
    private String isDivisionHead;
    @ApiModelProperty("办理事项ids")
    private String mattersIds;
    @ApiModelProperty("办理事项名称")
    private String mattersNames;
}
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
@@ -178,6 +178,13 @@
    List<TransactionEvent> selectListByIds(String[] list);
    /**
     * 根据分类筛选数据
     * @param ids
     * @return
     */
    List<TransactionEvent> selectClassifyList(List<String> ids);
    /**
     * 根据部门判断是否有事项名称重复
     */
    String selectDataIfExist(@Param("departmentId") String departmentId,
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
@@ -144,4 +144,11 @@
    List<String> selectclassifyId(String classifyId);
    /**
     * 根据分类筛选数据
     * @param ids
     * @return
     */
    List<TransactionEvent> selectClassifyList(List<String> ids);
}
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -190,6 +190,11 @@
        return baseMapper.selectclassifyId(classifyId);
    }
    @Override
    public List<TransactionEvent> selectClassifyList(List<String> ids) {
        return baseMapper.selectClassifyList(ids);
    }
    @Override
    public int countNumByMatterName(String matterName) {
flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -37,6 +37,7 @@
        <result property="openid"      column="openid"      />
        <result property="transactionNum"      column="transaction_num"      />
        <result property="isDivisionHead"      column="is_division_head"      />
        <result property="mattersIds"      column="matters_ids"      />
    </resultMap>
    <sql id="selectSysUserVo">
@@ -66,6 +67,14 @@
            department_id,
            stair_id,
            second_level_id,
            matters_ids,
            (SELECT GROUP_CONCAT(matter_name) FROM automessage_transaction_event WHERE id in (SELECT
              substring_index(substring_index(matters_ids,',', b.help_topic_id + 1), ',', -1) result
          FROM
              mysql.help_topic b
          where
                  b.help_topic_id &lt; (LENGTH(matters_ids) - LENGTH(REPLACE(matters_ids, ',', '')) + 1))) as mattersNames,
            concat(
                    IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select city from automessage_organization_chart
                            where automessage_organization_chart.id=department_id)),''),
@@ -232,6 +241,7 @@
        <if test="transactionNames != null and transactionNames != '' ">,transaction_names</if>
        <if test="openid != null and openid != '' ">,openid</if>
        <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head</if>
        <if test="mattersIds != null and mattersIds != '' ">,matters_ids</if>
        )values(
        sysdate()
        <if test="userId != null and userId != '' ">,#{userId}</if>
@@ -266,6 +276,7 @@
        <if test="transactionNames != null and transactionNames != '' ">,#{transactionNames}</if>
        <if test="openid != null and openid != '' ">,#{openid}</if>
        <if test="isDivisionHead != null and isDivisionHead != '' ">,#{isDivisionHead}</if>
        <if test="mattersIds != null and mattersIds != '' ">,#{mattersIds}</if>
        )
    </insert>
@@ -304,6 +315,7 @@
            <if test="transactionNames != null and transactionNames != '' ">,transaction_names=#{transactionNames}</if>
            <if test="openid != null and openid != '' ">,openid=#{openid}</if>
            <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head=#{isDivisionHead}</if>
            <if test="mattersIds != null and mattersIds != '' ">,matters_ids=#{mattersIds}</if>
            ,update_time=sysdate()
        </set>
        where user_id= #{userId}
flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -171,6 +171,22 @@
        order by create_time desc
    </select>
    <!-- 根据分类筛选数据 -->
    <select id="selectClassifyList"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventList"/>
        <where>
            <if test="ids != null">
                and classify_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
        order by create_time desc
    </select>
    <select id="selectListByIds"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventList"/>
        WHERE id IN