|
@@ -42,7 +42,7 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
|
|
|
String firstDayOfMonthStr;
|
|
String firstDayOfMonthStr;
|
|
|
String lastDayOfMonthStr;
|
|
String lastDayOfMonthStr;
|
|
|
if(dto.getYearMonth() != null && !dto.getYearMonth().equals("")){
|
|
if(dto.getYearMonth() != null && !dto.getYearMonth().equals("")){
|
|
|
- LocalDate date = LocalDate.parse(dto.getYearMonth()); // 假设给定日期为2022年9月15日
|
|
|
|
|
|
|
+ LocalDate date = LocalDate.parse(dto.getYearMonth() + "-01"); // 假设给定日期为2022年9月15日
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
// 获取月份的第一天
|
|
// 获取月份的第一天
|
|
|
LocalDate firstDayOfMonth = date.withDayOfMonth(1);
|
|
LocalDate firstDayOfMonth = date.withDayOfMonth(1);
|
|
@@ -65,6 +65,7 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
|
|
|
MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateByYearMonth = new MPJLambdaWrapper<>();
|
|
MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateByYearMonth = new MPJLambdaWrapper<>();
|
|
|
pbCseFeeobjupdateByYearMonth
|
|
pbCseFeeobjupdateByYearMonth
|
|
|
.distinct()
|
|
.distinct()
|
|
|
|
|
+ .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
|
|
|
.select("ifnull(t.graduations,'未知') as graduations")
|
|
.select("ifnull(t.graduations,'未知') as graduations")
|
|
|
.selectAs(PbCseFeeobjupdate::getCratetime, PbCseFeeobjupdate::getCratetime)
|
|
.selectAs(PbCseFeeobjupdate::getCratetime, PbCseFeeobjupdate::getCratetime)
|
|
|
.eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
|
|
.eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
|
|
@@ -104,6 +105,7 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
|
|
|
pbCseFeeobjupdateMPJLambdaWrapper
|
|
pbCseFeeobjupdateMPJLambdaWrapper
|
|
|
.distinct()
|
|
.distinct()
|
|
|
.select("ifnull(t2.name,t.specname) as specname")
|
|
.select("ifnull(t2.name,t.specname) as specname")
|
|
|
|
|
+ .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
|
|
|
.selectAs(PbCseFeeobjupdate::getSpecname, PbCseFeeobjupdate::getSpecname)
|
|
.selectAs(PbCseFeeobjupdate::getSpecname, PbCseFeeobjupdate::getSpecname)
|
|
|
.selectAs(PbCseFeeobjupdate::getResourcename, PbCseFeeobjupdate::getResourcename)
|
|
.selectAs(PbCseFeeobjupdate::getResourcename, PbCseFeeobjupdate::getResourcename)
|
|
|
.selectAs(PbCseFeeobjupdate::getQuartername, PbCseFeeobjupdate::getQuartername)
|
|
.selectAs(PbCseFeeobjupdate::getQuartername, PbCseFeeobjupdate::getQuartername)
|