优化代码

java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -84,6 +84,8 @@ public class FeeDto extends PageDto implements Serializable {
 
     private String ownerTel;
 
+    private String ownerId;
+
 
     private Date createTime;
 
@@ -538,4 +540,12 @@ public class FeeDto extends PageDto implements Serializable {
     public void setReceivedAmountSwitch(String receivedAmountSwitch) {
         this.receivedAmountSwitch = receivedAmountSwitch;
     }
+
+    public String getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
 }

java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml

@@ -156,10 +156,16 @@
         LEFT JOIN pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002' and pfa.status_cd = '0'
         left join import_fee_detail ifd on t.fee_id = ifd.fee_id and ifd.status_cd = '0' and t.fee_flag = '2006012'
         LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and mw.community_id = t.community_id
+        <if test="ownerId != null and ownerId != ''">
+            LEFT JOIN pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390007' and pfa.status_cd = '0'
+        </if>
         where 1 =1
         <if test="amount !=null and amount != ''">
             and t.amount= #{amount}
         </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and pfa.value= #{ownerId}
+        </if>
         <if test="incomeObjId !=null and incomeObjId != ''">
             and t.income_obj_id= #{incomeObjId}
         </if>
@@ -276,6 +282,9 @@
     <select id="queryFeesCount" parameterType="Map" resultType="Map">
         select count(1) count
         from pay_fee t,pay_fee_config pfc,t_dict td1,t_dict td2,t_dict td3,t_dict td4
+        <if test="ownerId != null and ownerId != ''">
+            ,pay_fee_attrs pfa
+        </if>
         where 1 =1
         and t.fee_type_cd = pfc.fee_type_cd
         and t.config_id = pfc.config_id
@@ -292,6 +301,12 @@
         and pfc.bill_type = td4.status_cd
         and td4.table_name = 'pay_fee_config'
         and td4.table_columns = 'bill_type'
+        <if test="ownerId != null and ownerId != ''">
+            and t.fee_id = pfa.fee_id
+            and pfa.spec_cd = '390007'
+            and pfa.status_cd = '0'
+            and pfa.value= #{ownerId}
+        </if>
         <if test="amount !=null and amount != ''">
             and t.amount= #{amount}
         </if>
@@ -472,7 +487,8 @@
             inner join bill b on t.bill_id = b.bill_id and b.community_id = t.community_id and b.cur_bill = #{curBill}
         </if>
         left join pay_fee pf on t.fee_id = pf.fee_id and t.community_id = pf.community_id and pf.status_cd = '0'
-        left join t_dict td on pf.fee_type_cd = td.status_cd and td.table_name = 'pay_fee_config' and td.table_columns = 'fee_type_cd'
+        left join t_dict td on pf.fee_type_cd = td.status_cd and td.table_name = 'pay_fee_config' and td.table_columns =
+        'fee_type_cd'
         where 1 =1
         <if test="oweId !=null and oweId != ''">
             and t.owe_id= #{oweId}

service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java

@@ -5,8 +5,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.fee.*;
-import com.java110.dto.user.UserDto;
+import com.java110.dto.fee.BillDto;
+import com.java110.dto.fee.BillOweFeeDto;
+import com.java110.dto.fee.FeeAttrDto;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.fee.FeeDto;
 import com.java110.fee.dao.IFeeAttrServiceDao;
 import com.java110.fee.dao.IFeeServiceDao;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
@@ -65,12 +68,12 @@ public class FeeInnerServiceSMOImpl extends BaseServiceSMO implements IFeeInnerS
             return fees;
         }
 
-        String[] userIds = getUserIds(fees);
-        //根据 userId 查询用户信息
-        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+//        String[] userIds = getUserIds(fees);
+//        //根据 userId 查询用户信息
+//        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
 
         for (FeeDto fee : fees) {
-            refreshFee(fee, users);
+            refreshFee(fee);
         }
 
         List<String> feeIds = new ArrayList<>();
@@ -111,15 +114,15 @@ public class FeeInnerServiceSMOImpl extends BaseServiceSMO implements IFeeInnerS
     /**
      * 从用户列表中查询用户，将用户中的信息 刷新到 floor对象中
      *
-     * @param fee   小区费用信息
-     * @param users 用户列表
+     * @param fee 小区费用信息
+     *            //@param users 用户列表
      */
-    private void refreshFee(FeeDto fee, List<UserDto> users) {
-        for (UserDto user : users) {
-            if (fee.getUserId().equals(user.getUserId())) {
-                BeanConvertUtil.covertBean(user, fee);
-            }
-        }
+    private void refreshFee(FeeDto fee) {
+//        for (UserDto user : users) {
+//            if (fee.getUserId().equals(user.getUserId())) {
+//                BeanConvertUtil.covertBean(user, fee);
+//            }
+//        }
 
         if (!StringUtil.isEmpty(fee.getImportFeeName())) {
             //fee.setFeeName(fee.getImportFeeName() + "(" + fee.getFeeName() + ")");