Explorar el Código

修改产品录入查询条件

wks hace 2 años
padre
commit
c1b6cb51fb

+ 0 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -159,8 +159,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     public BasePageResult<SysUserAccount> queryByVo(SysUserAccountVo sysUserAccountVo) {
         Page<SysUserAccount> page = new Page<>(sysUserAccountVo.getPageNum(), sysUserAccountVo.getPageSize());
-        QueryWrapper<SysUserAccount> wrapper = new QueryWrapper<>();
-
         Page<SysUserAccount> sysUserAccountHistoryPage = baseMapper.queryPageOrder(sysUserAccountVo, page);
         return new BasePageResult<>(sysUserAccountVo.getPageNum(), page.getSize(), sysUserAccountHistoryPage.getTotal(), page.getPages(),
                 sysUserAccountHistoryPage.getRecords());

+ 3 - 3
src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -99,12 +99,12 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         if (agreementProductQueryVo.getCostStartDate() != null)
         {
             ptlAgreementProductCostsNewLambdaQueryWrapper
-                    .ge(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate());
+                    .le(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate());
         }
 
         if (agreementProductQueryVo.getCostsEndDate() != null) {
             ptlAgreementProductCostsNewLambdaQueryWrapper
-                    .le(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
+                    .ge(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
         }
         //是否有效  1失效  2 有效
         if(agreementProductQueryVo.getIsEffective() != null){
@@ -1426,4 +1426,4 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         });
         return pages;
     }
-}
+}