优化代码

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

@@ -37,6 +37,12 @@
             and pf.payer_obj_id = #{carId}
             and pf.payer_obj_type = '6666'
         </if>
+        <if test="payerObjId !=null and payerObjId != ''">
+            and pf.payer_obj_id = #{payerObjId}
+        </if>
+        <if test="payerObjType !=null and payerObjType != ''">
+            and pf.payer_obj_type = #{payerObjType}
+        </if>
         <if test="state !=null and state != ''">
             and (pfa.state is null
             or pfa.state = #{state})
@@ -100,6 +106,16 @@
             and pf.payer_obj_id = #{carId}
             and pf.payer_obj_type = '6666'
         </if>
+        <if test="payerObjId !=null and payerObjId != ''">
+            and pf.payer_obj_id = #{payerObjId}
+        </if>
+        <if test="payerObjType !=null and payerObjType != ''">
+            and pf.payer_obj_type = #{payerObjType}
+        </if>
+        <if test="state !=null and state != ''">
+            and (pfa.state is null
+            or pfa.state = #{state})
+        </if>
         <if test="state !=null and state != ''">
             and (pfa.state is null
             or pfa.state = #{state})

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

@@ -33,7 +33,7 @@
     <!-- 查询 费用 -->
     <select id="getFees" parameterType="com.java110.dto.report.ReportFeeDto"
             resultType="com.java110.dto.report.ReportFeeDto">
-        select pfc.fee_name feeName,pfc.start_time configStartTime,pfc.end_time configEndTime,pfc.config_id configId,pfc.fee_type_cd feeTypeCd,
+                select pfc.fee_name feeName,pfc.start_time configStartTime,pfc.end_time configEndTime,pfc.config_id configId,pfc.fee_type_cd feeTypeCd,
         pfc.additional_amount additionalAmount,pfc.bill_type billType,pfc.computing_formula computingFormula,pfc.payment_cd paymentCd,
         pfc.payment_cycle paymentCycle,pfc.square_price squarePrice,pfc.fee_flag feeFlag,t.payer_obj_id payerObjId,t.payer_obj_type payerObjType,
         t.amount,t.create_time createTime,t.end_time endTime,t.fee_id feeId,t.income_obj_id incomeObjId,t.start_time startTime,t.state,

service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java

@@ -39,7 +39,7 @@ public class PayFeeAuditApi {
     @RequestMapping(value = "/savePayFeeAudit", method = RequestMethod.POST)
     public ResponseEntity<String> savePayFeeAudit(@RequestBody JSONObject reqJson,
                                                   @RequestHeader(value = "user-id") String userId,
-                                                  @RequestHeader(value="user-name")String userName) {
+                                                  @RequestHeader(value = "user-name") String userName) {
 
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
         Assert.hasKeyAndValue(reqJson, "feeId", "请求报文中未包含feeId");
@@ -105,12 +105,19 @@ public class PayFeeAuditApi {
      */
     @RequestMapping(value = "/queryPayFeeAudit", method = RequestMethod.GET)
     public ResponseEntity<String> queryPayFeeAudit(@RequestParam(value = "communityId") String communityId,
+                                                   @RequestParam(value = "payObjType", required = false) String payObjType,
+                                                   @RequestParam(value = "payerObjId", required = false) String payerObjId,
+                                                   @RequestParam(value = "state", required = false) String state,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row) {
+
         PayFeeAuditDto payFeeAuditDto = new PayFeeAuditDto();
         payFeeAuditDto.setPage(page);
         payFeeAuditDto.setRow(row);
         payFeeAuditDto.setCommunityId(communityId);
+        payFeeAuditDto.setState(state);
+        payFeeAuditDto.setPayerObjType(payObjType);
+        payFeeAuditDto.setPayerObjId(payerObjId);
         return getPayFeeAuditBMOImpl.get(payFeeAuditDto);
     }
 }

service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java

@@ -78,6 +78,9 @@ public class GetPayFeeAuditBMOImpl implements IGetPayFeeAuditBMO {
 
             bIds.add(payFeeAuditDto.getbId());
         }
+        if (bIds.size() < 1) {
+            return;
+        }
         BusinessDto businessDto = new BusinessDto();
         businessDto.setbIds(bIds.toArray(new String[bIds.size()]));
         List<OrderDto> orderDtos = orderInnerServiceSMOImpl.queryOrderByBId(businessDto);