|
|
@@ -50,13 +50,11 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
|
|
|
pbCseFeeobjupdateMPJLambdaWrapper
|
|
|
.disableSubLogicDel()
|
|
|
.distinct()
|
|
|
- .select("ifnull(t2.name,t.specname) as specname")
|
|
|
+ .selectAs(PbCseFeeobjupdate::getSpecname, PbCseFeeobjupdate::getSpecname)
|
|
|
.selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
|
|
|
.selectAs(PbCseFeeobjupdate::getResourcename, PbCseFeeobjupdate::getResourcename)
|
|
|
.selectAs(PbCseFeeobjupdate::getQuartername, PbCseFeeobjupdate::getQuartername)
|
|
|
.selectAs(PbCseFeeobjupdate::getSex, PbCseFeeobjupdate::getSex)
|
|
|
- .leftJoin(BaseMajorSet.class, BaseMajorSet::getName, PbCseFeeobjupdate::getSpecname)
|
|
|
- .leftJoin(BaseMajorCategor.class, BaseMajorCategor::getId, BaseMajorSet::getMajorCategorId)
|
|
|
.eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
|
|
|
;
|
|
|
|