修改CfgId获取逻辑
parent
52b33369fe
commit
bb1ccc5f75
|
@ -79,8 +79,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
|
|||
attWhere.setYear(year);
|
||||
}
|
||||
List<SurProjectAttendanceData> 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<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
|
||||
for(SurProjectAttendanceData it :list){
|
||||
it.setDays(1l);
|
||||
|
@ -105,8 +108,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
|
|||
attWhere.setYear(year);
|
||||
}
|
||||
List<SurProjectAttendanceData> 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<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
|
||||
for(SurProjectAttendanceData it :list){
|
||||
it.setDays(1l);
|
||||
|
@ -132,8 +138,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
|
|||
attWhere.setYear(year);
|
||||
}
|
||||
List<SurProjectAttendanceData> 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<SurProjectAttendanceUnitpay> 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<SurProjectAttendanceData> 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<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
|
||||
for(SurProjectAttendanceData it :list){
|
||||
it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
|
||||
|
@ -185,7 +197,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
|
|||
}
|
||||
List<SurProjectAttendanceData> 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<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
|
||||
List<ExportAttendancDay> exportList=new ArrayList<ExportAttendancDay>();
|
||||
for(SurProjectAttendanceData it :list){
|
||||
|
@ -216,7 +232,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
|
|||
}
|
||||
List<SurProjectAttendanceData> 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<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
|
||||
List<ExportAttendancMonth> exportList=new ArrayList<>();
|
||||
for(SurProjectAttendanceData it :list){
|
||||
|
@ -242,7 +262,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
|
|||
}
|
||||
List<SurProjectAttendanceData> 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<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
|
||||
List<ExportAttendancMonth> exportList=new ArrayList<>();
|
||||
for(SurProjectAttendanceData it :list){
|
||||
|
@ -269,7 +293,11 @@ public class SurProjectAttendanceUnitpayController extends BaseController
|
|||
}
|
||||
List<SurProjectAttendanceData> 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<SurProjectAttendanceUnitpay> payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
|
||||
List<ExportAttendancDay> exportList=new ArrayList<ExportAttendancDay>();
|
||||
for(SurProjectAttendanceData it :list){
|
||||
|
|
Loading…
Reference in New Issue