Commit 2a9f8d48 authored by qiaozhanwei's avatar qiaozhanwei
Browse files

columns alias update

parent d973d50d

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class ProcessDefinitionMapperProvider { 
    public String queryByDefineId(Map<String, Object> parameter) {

        return new SQL() {

            {

                SELECT("pd.*,u.user_name,p.name as projectName");

                SELECT("pd.*,u.user_name,p.name as project_name");



                FROM(TABLE_NAME + " pd");

                JOIN("t_escheduler_user u ON pd.user_id = u.id");

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ public interface ProcessInstanceMapper { 
            @Result(property = "dependenceScheduleTimes", column = "dependence_schedule_times", javaType = String.class, jdbcType = JdbcType.VARCHAR),

            @Result(property = "duration", column = "duration", javaType = Long.class, jdbcType = JdbcType.BIGINT),

            @Result(property = "tenantCode", column = "tenant_code", javaType = String.class, jdbcType = JdbcType.VARCHAR),

            @Result(property = "queue", column = "queue", javaType = String.class, jdbcType = JdbcType.VARCHAR),

            @Result(property = "workerGroupId", column = "worker_group_id",  javaType = Integer.class, jdbcType = JdbcType.INTEGER),

            @Result(property = "timeout", column = "timeout",  javaType = Integer.class, jdbcType = JdbcType.INTEGER),

            @Result(property = "processInstancePriority", column = "process_instance_priority", javaType = Priority.class, typeHandler = EnumOrdinalTypeHandler.class, jdbcType = JdbcType.TINYINT)

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ public class ProcessInstanceMapperProvider { 
    public String queryDetailById(Map<String, Object> parameter) {

        return new SQL() {

            {

                SELECT("inst.*,q.queue_name as queue,t.tenant_code as tenantCode,UNIX_TIMESTAMP(inst.end_time)-UNIX_TIMESTAMP(inst.start_time) as duration");

                SELECT("inst.*,q.queue_name as queue,t.tenant_code,UNIX_TIMESTAMP(inst.end_time)-UNIX_TIMESTAMP(inst.start_time) as duration");



                FROM(TABLE_NAME + "  inst, t_escheduler_user u,t_escheduler_tenant t,t_escheduler_queue q");

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapper.java

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public interface ProjectMapper { 
            @Result(property = "userId", column = "user_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),

            @Result(property = "name", column = "name", javaType = String.class, jdbcType = JdbcType.VARCHAR),

            @Result(property = "desc", column = "desc", javaType = String.class, jdbcType = JdbcType.VARCHAR),

            @Result(property = "userName", column = "user_name", javaType = String.class, jdbcType = JdbcType.VARCHAR),

            @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),

            @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),

    })
@@ -82,6 +83,7 @@ public interface ProjectMapper { 
            @Result(property = "userId", column = "user_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),

            @Result(property = "name", column = "name", javaType = String.class, jdbcType = JdbcType.VARCHAR),

            @Result(property = "desc", column = "desc", javaType = String.class, jdbcType = JdbcType.VARCHAR),

            @Result(property = "userName", column = "user_name", javaType = String.class, jdbcType = JdbcType.VARCHAR),

            @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),

            @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),

    })

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapperProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class ProjectMapperProvider { 
    public String queryById(Map<String, Object> parameter) {

        return new SQL() {{

            SELECT("p.user_id");

            SELECT("u.user_name as userName");

            SELECT("u.user_name");

            SELECT("p.*");



            FROM(TABLE_NAME + " p");
@@ -114,7 +114,7 @@ public class ProjectMapperProvider { 
    public String queryByName(Map<String, Object> parameter) {

        return new SQL() {{

            SELECT("p.user_id");

            SELECT("u.user_name as userName");

            SELECT("u.user_name");

            SELECT("p.*");



            FROM(TABLE_NAME + " p");