优化代码

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

@@ -42,6 +42,8 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
 
     private String payOrderId;
 
+    private String orderBy;
+
 
     public String getArea() {
         return area;
@@ -219,4 +221,12 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     public void setPayOrderId(String payOrderId) {
         this.payOrderId = payOrderId;
     }
+
+    public String getOrderBy() {
+        return orderBy;
+    }
+
+    public void setOrderBy(String orderBy) {
+        this.orderBy = orderBy;
+    }
 }

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

@@ -93,7 +93,13 @@
         <if test="cycle !=null and cycle != ''">
             and t.cycle= #{cycle}
         </if>
-        order by t.create_time desc
+        <if test="orderBy !=null and orderBy != ''">
+            order by t.fee_name, t.${orderBy}
+        </if>
+        <if test="orderBy ==null or orderBy == ''">
+            order by t.create_time desc
+        </if>
+
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

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

@@ -272,6 +272,7 @@ public class FeeReceiptApi {
                                                         @RequestParam(value = "receiptId", required = false) String receiptId,
                                                         @RequestParam(value = "receiptIds", required = false) String receiptIds,
                                                         @RequestParam(value = "detailIds", required = false) String detailIds,
+                                                        @RequestParam(value = "orderBy", required = false) String orderBy,
                                                         @RequestParam(value = "page") int page,
                                                         @RequestParam(value = "row") int row) {
         FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -279,6 +280,7 @@ public class FeeReceiptApi {
         feeReceiptDetailDto.setRow(row);
         feeReceiptDetailDto.setCommunityId(communityId);
         feeReceiptDetailDto.setReceiptId(receiptId);
+        feeReceiptDetailDto.setOrderBy(orderBy);
         if (!StringUtil.isEmpty(receiptIds)) {
             feeReceiptDetailDto.setReceiptIds(receiptIds.split(","));
         }

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

@@ -79,6 +79,13 @@ public class FeeReceiptDetailInnerServiceSMOImpl extends BaseServiceSMO implemen
             feeReceiptDetailDto.setPage((page - 1) * feeReceiptDetailDto.getRow());
         }
 
+        switch (feeReceiptDetailDto.getOrderBy()){
+            case "start_time":
+                break;
+            default:
+                feeReceiptDetailDto.setOrderBy("");
+        }
+
         List<FeeReceiptDetailDto> feeReceiptDetails = BeanConvertUtil.covertBeanList(feeReceiptDetailServiceDaoImpl.getFeeReceiptDetailInfo(BeanConvertUtil.beanCovertMap(feeReceiptDetailDto)), FeeReceiptDetailDto.class);
 
         return feeReceiptDetails;