数据库迁移修改

lidongdong

2022-09-23 1ed527ab5a90464e768fb4e9df3b1b730a3ffc16

数据库迁移修改

 flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java

@@ -43,9 +43,19 @@
    @ApiModelProperty("分类id")
    private String classifyId;

    /**
     * 所属分类等级
     */
    @TableField(exist = false)
    @ApiModelProperty("所属分类等级")
    private String classifyName;

    /**
     * 部门名称
     */
    @TableField(exist = false)
    @ApiModelProperty("部门名称")
    private String departmentName;
    /**
     * 事项名称
     */

 flower_city/src/main/resources/application.properties

@@ -3,6 +3,18 @@
spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://localhost:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8




#datasource:
#type: com.alibaba.druid.pool.DruidDataSource
#driverClassName: com.mysql.cj.jdbc.Driver
#url: jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
#username: root
#password: nahanMysqlPwd&&RemoteRemote2019nahan


server.port=8080
#server.port=8088

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

@@ -27,8 +27,6 @@
        <result property="departmentId"      column="department_id"      />
        <result property="stairId"      column="stair_id"      />
        <result property="secondLevelId"      column="second_level_id"      />


        <result property="departmentName"      column="department_name"      />
        <result property="departmentArea"      column="department_area"      />
        <result property="leisureState"      column="leisure_state"      />
@@ -36,9 +34,6 @@
        <result property="masterNames"      column="master_names"      />
        <result property="transactionIds"      column="transaction_ids"      />
        <result property="transactionNames"      column="transaction_names"      />



    </resultMap>

    <sql id="selectSysUserVo">
@@ -50,6 +45,7 @@
            phonenumber,
            sex,
            avatar,
            password,
            salt,
            status,
            del_flag,
@@ -60,19 +56,19 @@
            create_time,
            update_by,
            update_time,
            remark,
            role_ids,
            data_permission,
            department_id,
            stair_id,
            second_level_id,
            (select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name,
            department_area,
            leisure_state,
            master_ids,
            master_names,
            transaction_ids,
            transaction_names,
            remark
            (select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name
        FROM
            automessage_sys_user
    </sql>

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

@@ -82,6 +82,8 @@
            common_problem_url,
            common_problem_name,
            operational_guideline_video_url,
            (select classify_name from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id) as classifyName,
            (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_transaction_event.department_id) as departmentName,
            concat(
            (select classify_name from  automessage_classify_administration  where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
            '>',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)
@@ -96,7 +98,8 @@
            department_id,
            department_area,
            classify_id,
            (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id) as classifyName,
            (select classify_name from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id) as classifyName,
            (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_transaction_event.department_id) as departmentName,
            matter_name,
            associate_ids,
            associate_names,