From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/task/TbillTask.java | 104 ---------------------------------------------------
1 files changed, 1 insertions(+), 103 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/task/TbillTask.java b/ruoyi-admin/src/main/java/com/ruoyi/web/task/TbillTask.java
index bfb5688..163b191 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/task/TbillTask.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/task/TbillTask.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.task;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.query.TBillQuery;
@@ -25,110 +26,7 @@
@Autowired
TContractService tContractService;
- public void generateBill(){
- try {
- int index = 1;
- int rows = 20;
- long pages = 0;
- TContractQuery query = new TContractQuery();
- query.setPageSize(rows);
- query.setStatus(4);
- Calendar c = Calendar.getInstance();
- Date time = c.getTime();
- do {
- query.setPageNum(index);
- PageInfo<TContract> pageinfo = tContractService.contractList(query);
- if (pages==0){
- pages = pageinfo.getPages();
- }
- if (pageinfo.getRecords()!=null && pageinfo.getRecords().size()>0){
- pageinfo.getRecords().forEach(tContract -> {
- //todo 生成账单
-
- });
-
- }
- index++;
- }while (index<=pages);
- }catch (Exception e){
- log.error("");
- }
-
- }
-
- /**
- * 判断账单是否到期
- */
- public void checkBillOverdue(){
- try {
- int index = 1;
- int rows = 20;
- long pages = 0;
- TBillQuery query = new TBillQuery();
- query.setPageSize(rows);
- //查询未缴费的
- query.setPayFeesStatus(1);
- Calendar c = Calendar.getInstance();
- Date time = c.getTime();
- do {
- query.setPageNum(index);
- PageInfo<TBill> pageinfo = tBillService.queryPage(query);
- if (pages==0){
- pages = pageinfo.getPages();
- }
- if (pageinfo.getRecords()!=null && pageinfo.getRecords().size()>0){
- pageinfo.getRecords().forEach(tBill -> {
-
- //todo 生成账单
-
- });
-
- }
- index++;
- }while (index<=pages);
- }catch (Exception e){
- log.error("");
- }
-
- }
-
-
- /**
- * 计算违约金
- */
- public void caculatePenaltyFee(){
- try {
- int index = 1;
- int rows = 20;
- long pages = 0;
- TBillQuery query = new TBillQuery();
- query.setPageSize(rows);
- //查询已逾期的
- query.setPayFeesStatus(4);
- Calendar c = Calendar.getInstance();
- Date time = c.getTime();
- do {
- query.setPageNum(index);
- PageInfo<TContract> pageinfo = tContractService.contractList(query);
- if (pages==0){
- pages = pageinfo.getPages();
- }
- if (pageinfo.getRecords()!=null && pageinfo.getRecords().size()>0){
- pageinfo.getRecords().forEach(tContract -> {
-
- //todo 生成账单
-
- });
-
- }
- index++;
- }while (index<=pages);
- }catch (Exception e){
- log.error("");
- }
-
- }
--
Gitblit v1.7.1