Browse Source

优化代码

Your Name 2 years ago
parent
commit
1516bf652b

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/reportFee/ReportOweFeeDto.java

@@ -23,6 +23,7 @@ public class ReportOweFeeDto extends PageDto implements Serializable {
     private String oweId;
     private String ownerId;
     private String feeId;
+    private String[] feeIds;
     private String amountOwed;
     private String payerObjName;
     private String ownerName;
@@ -273,4 +274,12 @@ public class ReportOweFeeDto extends PageDto implements Serializable {
     public void setItemTotalOweAmounts(List<ReportOweFeeItemDto> itemTotalOweAmounts) {
         this.itemTotalOweAmounts = itemTotalOweAmounts;
     }
+
+    public String[] getFeeIds() {
+        return feeIds;
+    }
+
+    public void setFeeIds(String[] feeIds) {
+        this.feeIds = feeIds;
+    }
 }

+ 6 - 0
java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml

@@ -385,6 +385,12 @@
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>
+        <if test="feeIds !=null">
+            and t.fee_id in
+            <foreach collection="feeIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="amountOwed !=null and amountOwed != ''">
             and t.amount_owed= #{amountOwed}
         </if>

+ 11 - 0
service-job/src/main/java/com/java110/job/adapt/fee/OweFeeCallableAdapt.java

@@ -220,6 +220,17 @@ public class OweFeeCallableAdapt extends DatabusAdaptImpl {
         if (data.containsKey("feeId")) {
             reportOweFeeDto.setFeeId(data.getString("feeId"));
         }
+        List<String> feeIds = new ArrayList<>();
+
+        if (data.containsKey("feeIds")) {
+            JSONArray feeIdAs = data.getJSONArray("feeIds");
+            for (int feeIndex = 0; feeIndex < feeIdAs.size(); feeIndex++) {
+                feeIds.add(feeIdAs.getString(feeIndex));
+            }
+            if (feeIds.size() > 0) {
+                reportOweFeeDto.setFeeIds(feeIds.toArray(new String[feeIds.size()]));
+            }
+        }
         List<String> configIdss = new ArrayList<>();
         if (data.containsKey("configIds")) {
             JSONArray configIds = data.getJSONArray("configIds");