优化代码

java110-bean/src/main/java/com/java110/dto/reportCustomComponentRel/ReportCustomComponentRelDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.reportCustomComponentRel;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.reportCustomComponent.ReportCustomComponentDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +14,7 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class ReportCustomComponentRelDto extends PageDto implements Serializable {
+public class ReportCustomComponentRelDto extends ReportCustomComponentDto implements Serializable {
 
     private String relId;
     private String componentId;

java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml

@@ -18,7 +18,9 @@
     <!-- 查询报表组件关系信息 add by wuxw 2018-07-03 -->
     <select id="getReportCustomComponentRelInfo" parameterType="Map" resultType="Map">
         select t.rel_id,t.rel_id relId,t.component_id,t.component_id componentId,t.status_cd,t.status_cd
-        statusCd,t.custom_id,t.custom_id customId,t.seq,cc.`name` componentName,t.create_time createTime
+        statusCd,t.custom_id,t.custom_id customId,t.seq,cc.`name` componentName,t.create_time createTime,
+        cc.component_type componentType,cc.java_script javaScript,cc.component_group
+        componentGroup,cc.query_model queryModel,cc.component_sql componentSql
         from report_custom_component_rel t
         left join report_custom_component cc on t.component_id = cc.component_id and cc.status_cd = '0'
         where 1 =1