修改了排序

yxh

7 天以前 53e4e0a0fb2928d153230953c631af6c17e9c385

修改了排序

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -221,7 +221,7 @@
        Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() {
            @Override
            public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) {
                return o1.getApplyTime().compareTo(o2.getApplyTime());
                return o2.getApplyTime().compareTo(o1.getApplyTime());
            }
        });
        return getCustomDataTable(list, pageNum, pageSize);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java

@@ -10,6 +10,7 @@
import com.ruoyi.project.domain.ServiceFund;
import com.ruoyi.project.domain.ServiceFundtax;
import com.ruoyi.project.domain.vo.FundTaxVO;
import com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut;
import com.ruoyi.project.service.IServiceFundService;
import com.ruoyi.project.service.IServiceFundtaxService;
import io.swagger.annotations.Api;
@@ -46,10 +47,7 @@
    public TableDataInfo list(ServiceFundtax serviceFundtax) {
        startPage();
        List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
        Collections.sort(list, (sft1, sft2) -> {
            Long i = sft2.getId() - sft1.getId();
            return i.intValue();
        });
//        list.sort(Comparator.comparing(ServiceFundtax::getCreateTime, Comparator.nullsLast(Comparator.reverseOrder())));
        return getDataTable(list);
    }
//

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java

@@ -181,7 +181,7 @@
        Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
            @Override
            public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) {
                return o1.getApplyTime().compareTo(o2.getApplyTime());
                return o2.getApplyTime().compareTo(o1.getApplyTime());
            }
        });
        return getCustomDataTable(list, pageNum, pageSize);

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java

@@ -159,6 +159,7 @@
        if (StringUtils.isNotBlank(serviceFundtax.getUpdownremark())) {
            wrappers.eq(ServiceFundtax::getUpdownremark, serviceFundtax.getUpdownremark());
        }
        wrappers.orderByDesc(ServiceFundtax::getCreateTime);
        return this.list(wrappers);
    }


 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java

@@ -165,6 +165,7 @@
            wrappers.between(ServiceReimbursement::getCreateTime ,serviceReimbursement.getStarttime(),serviceReimbursement.getEndtime());
        }*/

        wrappers.orderByDesc(ServiceReimbursement::getApplyTime);
        return this.list(wrappers);
    }