Commit a0e7fda127d16ee02242a03c1103650c7a138786

Authored by wangqian
1 parent d7b2cc6a

人员费用排序

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/mechanicalcost/MechanicalCostMapper.java
@@ -20,7 +20,7 @@ public interface MechanicalCostMapper extends BaseMapperX<MechanicalCostDO> { @@ -20,7 +20,7 @@ public interface MechanicalCostMapper extends BaseMapperX<MechanicalCostDO> {
20 default PageResult<MechanicalCostDO> selectPage(MechanicalCostPageReqVO reqVO) { 20 default PageResult<MechanicalCostDO> selectPage(MechanicalCostPageReqVO reqVO) {
21 return selectPage(reqVO, new LambdaQueryWrapperX<MechanicalCostDO>() 21 return selectPage(reqVO, new LambdaQueryWrapperX<MechanicalCostDO>()
22 .eqIfPresent(MechanicalCostDO::getMechType, reqVO.getMechType()) 22 .eqIfPresent(MechanicalCostDO::getMechType, reqVO.getMechType())
23 - .eqIfPresent(MechanicalCostDO::getMechCode, reqVO.getMechCode()) 23 + .likeIfPresent(MechanicalCostDO::getMechCode, reqVO.getMechCode())
24 .likeIfPresent(MechanicalCostDO::getMechName, reqVO.getMechName()) 24 .likeIfPresent(MechanicalCostDO::getMechName, reqVO.getMechName())
25 .eqIfPresent(MechanicalCostDO::getMechCategory, reqVO.getMechCategory()) 25 .eqIfPresent(MechanicalCostDO::getMechCategory, reqVO.getMechCategory())
26 .eqIfPresent(MechanicalCostDO::getUnitPrice, reqVO.getUnitPrice()) 26 .eqIfPresent(MechanicalCostDO::getUnitPrice, reqVO.getUnitPrice())
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/waterfee/WaterFeeMapper.java
@@ -20,8 +20,8 @@ public interface WaterFeeMapper extends BaseMapperX&lt;WaterFeeDO&gt; { @@ -20,8 +20,8 @@ public interface WaterFeeMapper extends BaseMapperX&lt;WaterFeeDO&gt; {
20 default PageResult<WaterFeeDO> selectPage(WaterFeePageReqVO reqVO) { 20 default PageResult<WaterFeeDO> selectPage(WaterFeePageReqVO reqVO) {
21 return selectPage(reqVO, new LambdaQueryWrapperX<WaterFeeDO>() 21 return selectPage(reqVO, new LambdaQueryWrapperX<WaterFeeDO>()
22 .eqIfPresent(WaterFeeDO::getFeeMonth, reqVO.getFeeMonth()) 22 .eqIfPresent(WaterFeeDO::getFeeMonth, reqVO.getFeeMonth())
23 - .eqIfPresent(WaterFeeDO::getMeterCode, reqVO.getMeterCode())  
24 - .eqIfPresent(WaterFeeDO::getMeterAddress, reqVO.getMeterAddress()) 23 + .likeIfPresent(WaterFeeDO::getMeterCode, reqVO.getMeterCode())
  24 + .likeIfPresent(WaterFeeDO::getMeterAddress, reqVO.getMeterAddress())
25 .eqIfPresent(WaterFeeDO::getMeterDoorplate, reqVO.getMeterDoorplate()) 25 .eqIfPresent(WaterFeeDO::getMeterDoorplate, reqVO.getMeterDoorplate())
26 .eqIfPresent(WaterFeeDO::getWaterUsage, reqVO.getWaterUsage()) 26 .eqIfPresent(WaterFeeDO::getWaterUsage, reqVO.getWaterUsage())
27 .eqIfPresent(WaterFeeDO::getTotalFee, reqVO.getTotalFee()) 27 .eqIfPresent(WaterFeeDO::getTotalFee, reqVO.getTotalFee())