wuxw hace 1 año
padre
commit
21cbdcfe5f

+ 7 - 18
java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml

@@ -381,35 +381,24 @@
     <select id="getFeeRoomCount" parameterType="Map" resultType="Map">
         select count(1) feeRoomCount
         from (
-        select t.payer_obj_id
-        from report_owe_fee t
-        inner join building_room br on t.payer_obj_id = br.room_id and br.status_cd = '0'
-        left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
+        select t.room_id
+        from building_room t
+        left join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
+        inner join pay_fee pf on pf.payer_obj_id = t.room_id and pf.payer_obj_type = '3333' and pf.status_cd = '0' and pf.state = '2008001'
         <if test="feeTypeCd != null and feeTypeCd != ''">
             left join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
         </if>
         where
         1=1
-        and t.payer_obj_type = '3333'
         and t.community_id=  #{communityId}
-        and t.end_time &lt; #{endDate}
         <if test="floorId != null and floorId != ''">
             and bu.floor_id = #{floorId}
         </if>
         <if test="configId != null and configId != ''">
-            and t.config_id = #{configId}
-        </if>
-        <if test="objName != null and objName != ''">
-            and t.payer_obj_name like concat('%',#{objName},'%')
-        </if>
-        <if test="ownerName != null and ownerName != ''">
-            and t.owner_name like concat('%',#{ownerName},'%')
-        </if>
-        <if test="link != null and link != ''">
-            and t.owner_tel = #{link}
+            and pf.config_id = #{configId}
         </if>
         <if test="configIds !=null ">
-            and t.config_id in
+            and pf.config_id in
             <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
@@ -417,7 +406,7 @@
         <if test="feeTypeCd != null and feeTypeCd != ''">
             and pfc.fee_type_cd = #{feeTypeCd}
         </if>
-        group by t.payer_obj_id
+        group by t.room_id
         ) a
     </select>
 

+ 1 - 1
springboot/src/main/resources/application-debug.yml

@@ -29,7 +29,7 @@ spring:
   activiti:
     database-schema-update: false
   datasource:
-    url: jdbc:mysql://192.168.100.108:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://118.182.119.121:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
     username: TT
     password: hc12345678
     type: com.alibaba.druid.pool.DruidDataSource