lidongdong
2022-11-15 3779dfea2f925873c22b2e45fe3998095fb6c75a
Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
2个文件已修改
8 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/TransactionEventMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
@@ -201,7 +201,7 @@
    @ApiModelProperty("操作指引附件url")
    private String operationalGuidelineUrl;
   /**
    /**
     * 操作指引视频url
     */
    @ApiModelProperty("操作指引视频url")
flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -104,6 +104,12 @@
            transaction_area_name,
            classify_ids,
            department_ids,
            (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT
                 substring_index(substring_index(department_ids,',', b.help_topic_id + 1), ',', -1) result
             FROM
                 mysql.help_topic b
             where
                     b.help_topic_id < (LENGTH(department_ids) - LENGTH(REPLACE(department_ids, ',', '')) + 1))) as departmentNames,
            (IF((select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)='2',
                (select classify_name from automessage_classify_administration where automessage_classify_administration.id=(select parent_id from
                automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)),