优化代码

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

@@ -114,12 +114,18 @@
         <if test="configId != null and configId != ''">
             inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         </if>
+        <if test="ownerId != null and ownerId != ''">
+            left join pay_fee_attrs pfa on pfa.fee_id = t.fee_id and pfa.spec_cd = '390007' and pfa.status_cd = '0'
+        </if>
         left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
         where 1 =1
         <if test="configId != null and configId != ''">
             and pf.config_id = #{configId}
             and pf.payer_obj_id = #{payerObjId}
         </if>
+        <if test="ownerId != null and ownerId != ''">
+            pfa.value = #{ownerId}
+        </if>
         <if test="primeRate !=null and primeRate != ''">
             and t.prime_rate= #{primeRate}
         </if>
@@ -215,11 +221,17 @@
         <if test="configId != null and configId != ''">
             inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         </if>
+        <if test="ownerId != null and ownerId != ''">
+            left join pay_fee_attrs pfa on pfa.fee_id = t.fee_id and pfa.spec_cd = '390007' and pfa.status_cd = '0'
+        </if>
         where 1 =1
         <if test="configId != null and configId != ''">
             and pf.config_id = #{configId}
             and pf.payer_obj_id = #{payerObjId}
         </if>
+        <if test="ownerId != null and ownerId != ''">
+            pfa.value = #{ownerId}
+        </if>
         <if test="primeRate !=null and primeRate != ''">
             and t.prime_rate= #{primeRate}
         </if>

service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java

@@ -61,19 +61,6 @@ public class QueryFeeDetailListener extends AbstractServiceApiDataFlowListener {
         ApiFeeDetailVo apiFeeDetailVo = new ApiFeeDetailVo();
         FeeDetailDto feeDetailDto = BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class);
 
-//        try {
-//            if (reqJson.containsKey("startTime")) {
-//                feeDetailDto.setStartTime(DateUtil.getDateFromString(reqJson.getString("startTime"), DateUtil.DATE_FORMATE_STRING_B));
-//            }
-//
-//            if (reqJson.containsKey("endTime")) {
-//                feeDetailDto.setStartTime(DateUtil.getDateFromString(reqJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_B));
-//            }
-//        } catch (Exception e) {
-//            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, e.getMessage() + "传入开始时间或结束时间格式错误 c");
-//        }
-
-
         int total = feeDetailInnerServiceSMOImpl.queryFeeDetailsCount(feeDetailDto);
         apiFeeDetailVo.setTotal(total);
         if (total > 0) {