Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-15 8f777d784ee51a7e6ad99e16072c86fea0d39ae3

Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev

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

@@ -122,7 +122,7 @@
                user.setRoleIds("2");
            }
            user.setUserType("2");
            user.setIsDivisionHead("1");
            user.setIsDivisionHead(config.getIsDivisionHead());
            user.setStatus(config.getStatus());
            user.setUpdateTime(LocalDateTime.now());
            //提示用户名或密码错误
@@ -140,7 +140,7 @@
        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
        config.setUserId(Snowflake.getId()+"");
        config.setIsDivisionHead("1");
        config.setIsDivisionHead(config.getIsDivisionHead());
        return toAjax(IUserService.insertConfig(config));
    }


 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")
@@ -273,4 +273,12 @@
    @ApiModelProperty(name = "classifyIds", value = "前端使用")
    private String classifyIds;


    @ApiModelProperty(name = "departmentIds", value = "所属部门列")
    private String departmentIds;

    @TableField(exist = false)
    @ApiModelProperty(name = "departmentNames", value = "所属部门列名称集合")
    private String departmentNames;

}

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

@@ -48,6 +48,7 @@
        <id     property="transactionAreaUrl"      column="transaction_area_url"      />
        <id     property="transactionAreaName"      column="transaction_area_name"      />
        <id     property="classifyIds"      column="classify_ids"      />
        <id     property="departmentIds"      column="department_ids"      />

    </resultMap>

@@ -102,6 +103,13 @@
            transaction_area_url,
            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 &lt; (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)),
@@ -138,6 +146,13 @@
            associate_names,
            transaction_num,
            browse_num,
            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 &lt; (LENGTH(department_ids) - LENGTH(REPLACE(department_ids, ',', '')) + 1))) as departmentNames,
            create_time,
            update_time
        FROM
@@ -239,6 +254,7 @@
        <if test="transactionAreaUrl != null ">transaction_area_url,</if>
        <if test="transactionAreaName != null ">transaction_area_name,</if>
        <if test="classifyIds != null ">classify_ids,</if>
        <if test="departmentIds != null ">department_ids,</if>
        update_time,
        create_time
        )values(
@@ -281,6 +297,7 @@
        <if test="transactionAreaUrl != null ">#{transactionAreaUrl},</if>
        <if test="transactionAreaName != null ">#{transactionAreaName},</if>
        <if test="classifyIds != null ">#{classifyIds},</if>
        <if test="departmentIds != null ">#{departmentIds},</if>
        sysdate(),
        sysdate()
        )
@@ -328,6 +345,7 @@
            <if test="transactionAreaUrl != null ">transaction_area_url=#{transactionAreaUrl},</if>
            <if test="transactionAreaName != null ">transaction_area_name=#{transactionAreaName},</if>
            <if test="classifyIds != null ">classify_ids=#{classifyIds},</if>
            <if test="departmentIds != null ">department_ids=#{departmentIds},</if>
            update_time=sysdate()
        </set>
        where  id= #{id}