From 6bf8b48e9d689ab90864bc2ee0e6ebeae3a4c1fa Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 04 八月 2022 10:06:47 +0800
Subject: [PATCH] 1.优化报表缴费明细统计问题2、优化调查问卷投票问题3、优化投诉咨询问题3、优化业主新增用户联系地址4、增加定时任务根据身份证号自动更新年龄5、优化缴费清单

---
 java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml
index ea76ced..67869a6 100644
--- a/java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml
@@ -19,13 +19,16 @@
     <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,
-        cc.component_type componentType,cc.java_script javaScript,cc.component_group
-        componentGroup,cc.query_model queryModel,cc.component_sql componentSql
+        cc.component_type componentType,cc.component_group
+        componentGroup,cc.query_model queryModel
         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
         <if test="relId !=null and relId != ''">
             and t.rel_id= #{relId}
+        </if>
+        <if test="componentType !=null and componentType != ''">
+            and cc.component_type= #{componentType}
         </if>
         <if test="componentId !=null and componentId != ''">
             and t.component_id= #{componentId}
@@ -73,10 +76,14 @@
     <select id="queryReportCustomComponentRelsCount" parameterType="Map" resultType="Map">
         select count(1) count
         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
         <if test="relId !=null and relId != ''">
             and t.rel_id= #{relId}
         </if>
+        <if test="componentType !=null and componentType != ''">
+            and cc.component_type= #{componentType}
+        </if>
         <if test="componentId !=null and componentId != ''">
             and t.component_id= #{componentId}
         </if>

--
Gitblit v1.8.0