From bb1ccc5f753eea0c670db159dc54a276013a28c5 Mon Sep 17 00:00:00 2001 From: lijun Date: Mon, 2 Dec 2024 22:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9CfgId=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SurProjectAttendanceUnitpayController.java | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java index eacd1f06..9589942b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java @@ -79,8 +79,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController attWhere.setYear(year); } List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByDate(attWhere); + if(list.size()==0){ + return getDataTable(list); + } SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay(); - payWhere.setCfgId(attWhere.getCfgid()); + payWhere.setCfgId(list.get(0).getCfgid()); List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere); for(SurProjectAttendanceData it :list){ it.setDays(1l); @@ -105,8 +108,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController attWhere.setYear(year); } List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(attWhere); + if(list.size()==0){ + return getDataTable(list); + } SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay(); - payWhere.setCfgId(attWhere.getCfgid()); + payWhere.setCfgId(list.get(0).getCfgid()); List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere); for(SurProjectAttendanceData it :list){ it.setDays(1l); @@ -132,8 +138,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController attWhere.setYear(year); } List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere); + if(list.size()==0){ + return getDataTable(list); + } SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay(); - payWhere.setCfgId(attWhere.getCfgid()); + payWhere.setCfgId(list.get(0).getCfgid()); List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere); for(SurProjectAttendanceData it :list){ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it)); @@ -158,8 +167,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController attWhere.setYear(year); } List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere); + if(list.size()==0){ + return getDataTable(list); + } SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay(); - payWhere.setCfgId(attWhere.getCfgid()); + payWhere.setCfgId(list.get(0).getCfgid()); List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere); for(SurProjectAttendanceData it :list){ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it)); @@ -185,7 +197,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController } List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByDate(attWhere); SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay(); - payWhere.setCfgId(attWhere.getCfgid()); + if(list.size()>0){ + payWhere.setCfgId(list.get(0).getCfgid()); + }else { + payWhere.setCfgId(attWhere.getCfgid()); + } List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere); List exportList=new ArrayList(); for(SurProjectAttendanceData it :list){ @@ -216,7 +232,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController } List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere); SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay(); - payWhere.setCfgId(attWhere.getCfgid()); + if(list.size()>0){ + payWhere.setCfgId(list.get(0).getCfgid()); + }else { + payWhere.setCfgId(attWhere.getCfgid()); + } List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere); List exportList=new ArrayList<>(); for(SurProjectAttendanceData it :list){ @@ -242,7 +262,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController } List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere); SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay(); - payWhere.setCfgId(attWhere.getCfgid()); + if(list.size()>0){ + payWhere.setCfgId(list.get(0).getCfgid()); + }else { + payWhere.setCfgId(attWhere.getCfgid()); + } List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere); List exportList=new ArrayList<>(); for(SurProjectAttendanceData it :list){ @@ -269,7 +293,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController } List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(attWhere); SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay(); - payWhere.setCfgId(attWhere.getCfgid()); + if(list.size()>0){ + payWhere.setCfgId(list.get(0).getCfgid()); + }else { + payWhere.setCfgId(attWhere.getCfgid()); + } List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere); List exportList=new ArrayList(); for(SurProjectAttendanceData it :list){