Browse Source

添加预算IDS查询条件

contract
15989082884@163.com 2 years ago
parent
commit
0b8be6398f
  1. 6
      src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
  2. 3
      src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java

6
src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java

@ -57,6 +57,9 @@ public class TbsBudgetController {
@PreAuthorize("hasRole('tbs:budget:query')") @PreAuthorize("hasRole('tbs:budget:query')")
public R<List<TbsBudget>> getList(TbsBudgetSo param){ public R<List<TbsBudget>> getList(TbsBudgetSo param){
List<Long> budgetIds = tbsBudgetMapper.selectBudgetId(param); List<Long> budgetIds = tbsBudgetMapper.selectBudgetId(param);
if(param.getSelectIdList()!=null && param.getSelectIdList().size()>0){
budgetIds.addAll(param.getSelectIdList());
}
if(budgetIds.size()>0){ if(budgetIds.size()>0){
List<TbsBudget> list = tbsBudgetService.listByIds(budgetIds); List<TbsBudget> list = tbsBudgetService.listByIds(budgetIds);
return R.ok(list); return R.ok(list);
@ -73,6 +76,9 @@ public class TbsBudgetController {
@PreAuthorize("hasRole('tbs:budget:query')") @PreAuthorize("hasRole('tbs:budget:query')")
public R<PageVo<TbsBudgetVo>> getPage(TbsBudgetSo param){ public R<PageVo<TbsBudgetVo>> getPage(TbsBudgetSo param){
List<Long> budgetIds = tbsBudgetMapper.selectBudgetId(param); List<Long> budgetIds = tbsBudgetMapper.selectBudgetId(param);
if(param.getSelectIdList()!=null && param.getSelectIdList().size()>0){
budgetIds.addAll(param.getSelectIdList());
}
if(budgetIds.size()>0){ if(budgetIds.size()>0){
PageUtil.startPage(); PageUtil.startPage();
LambdaQueryWrapper<TbsBudget> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TbsBudget> lqw = new LambdaQueryWrapper<>();

3
src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java

@ -4,6 +4,7 @@ import java.time.LocalDate;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
@ -23,6 +24,8 @@ import javax.validation.constraints.NotBlank;
@Data @Data
public class TbsBudgetSo implements Serializable { public class TbsBudgetSo implements Serializable {
private List<Long> selectIdList;
/** 预算编码 */ /** 预算编码 */
private String budgetCode; private String budgetCode;

Loading…
Cancel
Save