浏览代码

fix:跨年系统有一些年份获取方式不对

(cherry picked from commit 30b6879711f8a7898a6708694ce48db7a4babfbe)
ly 9 月之前
父节点
当前提交
f39dae58c3

+ 0 - 1
src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundConfirmController.java

@@ -178,7 +178,6 @@ public class BizHousingFundConfirmController extends BaseController {
         setTenantId(conditions);
         startPage();
         startOrderBy();
-        conditions.setYear(String.valueOf(nwoYear));
         List<BizHousingFundConfirm> list = housingFundConfirmService.getListByBean(conditions);
         if (!list.isEmpty()) {
             Map<String, Object> detailConditions = new HashMap<>();

+ 0 - 2
src/main/java/cn/ezhizao/project/business/keepAccounts/controller/BizFinancialKeepAccountController.java

@@ -128,12 +128,10 @@ public class BizFinancialKeepAccountController extends BaseController {
     public TableDataInfo getList(BizFinancialKeepAccount conditions) throws NoSuchFieldException, IllegalAccessException {
         String chooseYear = conditions.getYear();
         int nwoYear = LocalDate.now().getYear();
-        conditions.setYear(String.valueOf(nwoYear));
         setTenantId(conditions);
         startPage();
         startOrderBy();
         conditions.setIsZero(0);
-        conditions.setYear(String.valueOf(nwoYear));
         List<BizFinancialKeepAccount> list = financialKeepAccountService.getList(conditions);
         if (!list.isEmpty()) {
             BizFinancialKeepAccountDetail detailConditions = new BizFinancialKeepAccountDetail();

+ 0 - 1
src/main/java/cn/ezhizao/project/business/receiveTicket/controller/BizFinancialReceiveTicketController.java

@@ -88,7 +88,6 @@ public class BizFinancialReceiveTicketController extends BaseController {
         startPage();
         startOrderBy();
         bizFinancialReceiveTicket.setIsZero(0);
-        bizFinancialReceiveTicket.setYear(String.valueOf(nwoYear));
         List<BizFinancialReceiveTicket> list = bizFinancialReceiveTicketService.getList(bizFinancialReceiveTicket);
         if (!list.isEmpty()) {
             if (!chooseYear.equals(nwoYear)){

+ 0 - 1
src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryController.java

@@ -166,7 +166,6 @@ public class BizFinancialSalaryController extends BaseController {
         setTenantId(bizFinancialSalary);
         startPage();
         startOrderBy();
-        bizFinancialSalary.setYear(String.valueOf(nwoYear));
         bizFinancialSalary.setIsZero(0);
 
         List<BizFinancialSalary> list = bizFinancialSalaryService.getList(bizFinancialSalary);

+ 0 - 1
src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryZeroController.java

@@ -125,7 +125,6 @@ public class BizFinancialSalaryZeroController extends BaseController {
         startPage();
         startOrderBy();
         bizFinancialSalary.setIsZero(1);
-        bizFinancialSalary.setYear(String.valueOf(nwoYear));
         List<BizFinancialSalary> list = bizFinancialSalaryService.getList(bizFinancialSalary);
         if (!list.isEmpty()) {
             if (!chooseYear.equals(nwoYear)) {

+ 0 - 1
src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityConfirmController.java

@@ -183,7 +183,6 @@ public class SocialSecurityConfirmController extends BaseController {
         setTenantId(conditions);
         startPage();
         startOrderBy();
-        conditions.setYear(String.valueOf(nwoYear));
         List<BizSocialSecurityConfirm> list = socialSecurityConfirmService.getListByBean(conditions);
         if (!list.isEmpty()) {
             BizSocialSecurityConfirmDetail detailConditions = new BizSocialSecurityConfirmDetail();