add system

java110-db/src/main/resources/mapper/common/CarInoutPaymentV1ServiceDaoImplMapper.xml

@@ -101,13 +101,15 @@
 
     </update>
 
-    <!-- 查询车辆支付数量 add by wuxw 2018-07-03 -->
+    <!-- 查询车辆支付数量 add by wuxw 2018-07-03 这两个注释 速度太慢
+            left join t_dict td on ci.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
+        left join t_dict td1 on t.pay_type = td1.status_cd and td1.table_columns='pay_type' and td1.table_name = 'car_inout_payment'
+    -->
     <select id="queryCarInoutPaymentsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from car_inout_payment t
         left join car_inout ci on t.inout_id = ci.inout_id and ci.status_cd = '0' and t.community_id = ci.community_id
-        left join t_dict td on ci.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
-        left join t_dict td1 on t.pay_type = td1.status_cd and td1.table_columns='pay_type' and td1.table_name = 'car_inout_payment'
+
         where 1 =1
         <if test="realCharge !=null and realCharge != ''">
             and t.real_charge= #{realCharge}

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

@@ -15,14 +15,15 @@
     </insert>
 
     <select id="queryReportOwnerMonthPayFees" parameterType="Map" resultType="Map">
-        select t.pf_year pfYear,t.pf_month pfMonth ,t.amount,t.fee_id feeId
-        from report_owner_pay_fee t
+        select t.detail_year pfYear,t.detail_month pfMonth,t.fee_id feeId,t.received_amount amount
+        from pay_fee_detail_month t
         where t.status_cd = '0'
+        and t.detail_id != '-1'
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>
         <if test="pfYear !=null and pfYear != ''">
-            and t.pf_year= #{pfYear}
+            and t.detail_year= #{pfYear}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -33,6 +34,7 @@
                 #{item}
             </foreach>
         </if>
+
     </select>
 
 

service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java

@@ -212,53 +212,54 @@ public class ListFeeCmd extends Cmd {
 
     private void freshFeeAttrs(List<ApiFeeDataVo> fees, List<FeeDto> feeDtos) {
         String link = "";
-        for (FeeDto feeDto : feeDtos) {
-            if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //房屋
-                OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
-                ownerRoomRelDto.setRoomId(feeDto.getPayerObjId());
-                List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
-                if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
-                    continue;
-                }
-                OwnerDto ownerDto = new OwnerDto();
-                ownerDto.setMemberId(ownerRoomRelDtos.get(0).getOwnerId());
-                List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
-                Assert.listOnlyOne(ownerDtos, "查询业主错误！");
-                link = ownerDtos.get(0).getLink();
-            } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
-                OwnerCarDto ownerCarDto = new OwnerCarDto();
-                ownerCarDto.setMemberId(feeDto.getPayerObjId());
-                List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
-                Assert.listOnlyOne(ownerCarDtos, "查询业主车辆表错误！");
-                OwnerDto ownerDto = new OwnerDto();
-                ownerDto.setMemberId(ownerCarDtos.get(0).getOwnerId());
-                List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
-                Assert.listOnlyOne(ownerDtos, "查询业主错误！");
-                link = ownerDtos.get(0).getLink();
-            }
-            FeeAttrDto feeAttrDto = new FeeAttrDto();
-            feeAttrDto.setFeeId(feeDto.getFeeId());
-            List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
-            if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
-                continue;
-            }
-            for (FeeAttrDto feeAttr : feeAttrDtos) {
-                if (!FeeAttrDto.SPEC_CD_OWNER_LINK.equals(feeAttr.getSpecCd())) { //联系方式
-                    continue;
-                }
-                if (feeAttr.getValue().equals(link)) {
-                    continue;
-                }
-                FeeAttrPo feeAttrPo = new FeeAttrPo();
-                feeAttrPo.setAttrId(feeAttr.getAttrId());
-                feeAttrPo.setValue(link);
-                int flag = feeAttrInnerServiceSMOImpl.updateFeeAttr(feeAttrPo);
-                if (flag < 1) {
-                    throw new CmdException("更新业主联系方式失败");
-                }
-
-            }
-        }
+        //todo 影响查询性能 注释 by wuxw
+//        for (FeeDto feeDto : feeDtos) {
+//            if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //房屋
+//                OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+//                ownerRoomRelDto.setRoomId(feeDto.getPayerObjId());
+//                List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+//                if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
+//                    continue;
+//                }
+//                OwnerDto ownerDto = new OwnerDto();
+//                ownerDto.setMemberId(ownerRoomRelDtos.get(0).getOwnerId());
+//                List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+//                Assert.listOnlyOne(ownerDtos, "查询业主错误！");
+//                link = ownerDtos.get(0).getLink();
+//            } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
+//                OwnerCarDto ownerCarDto = new OwnerCarDto();
+//                ownerCarDto.setMemberId(feeDto.getPayerObjId());
+//                List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+//                Assert.listOnlyOne(ownerCarDtos, "查询业主车辆表错误！");
+//                OwnerDto ownerDto = new OwnerDto();
+//                ownerDto.setMemberId(ownerCarDtos.get(0).getOwnerId());
+//                List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+//                Assert.listOnlyOne(ownerDtos, "查询业主错误！");
+//                link = ownerDtos.get(0).getLink();
+//            }
+//            FeeAttrDto feeAttrDto = new FeeAttrDto();
+//            feeAttrDto.setFeeId(feeDto.getFeeId());
+//            List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
+//            if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
+//                continue;
+//            }
+//            for (FeeAttrDto feeAttr : feeAttrDtos) {
+//                if (!FeeAttrDto.SPEC_CD_OWNER_LINK.equals(feeAttr.getSpecCd())) { //联系方式
+//                    continue;
+//                }
+//                if (feeAttr.getValue().equals(link)) {
+//                    continue;
+//                }
+//                FeeAttrPo feeAttrPo = new FeeAttrPo();
+//                feeAttrPo.setAttrId(feeAttr.getAttrId());
+//                feeAttrPo.setValue(link);
+//                int flag = feeAttrInnerServiceSMOImpl.updateFeeAttr(feeAttrPo);
+//                if (flag < 1) {
+//                    throw new CmdException("更新业主联系方式失败");
+//                }
+//
+//            }
+//        }
         for (ApiFeeDataVo apiFeeDataVo : fees) {
             for (FeeDto feeDto : feeDtos) {
                 if (apiFeeDataVo.getFeeId().equals(feeDto.getFeeId())) {