Commit 99f2c699 by huluobin

# 更新

parent ad9adaef
......@@ -77,6 +77,7 @@ public class CostController {
resp.setLends(costDtoList);
return resp;
}
@ApiOperation("获取前端要打印的费用单列表")
@PostMapping("/list/print/list")
public PrintListResp printList(@RequestBody CostListPrintVo costListPrintVo) {
......@@ -97,14 +98,12 @@ public class CostController {
return CostResult.success((Page<CostDto>) costDaoPage.convert(CostDomain::castToDto));
}
@ApiOperation("获取借支单列表")
@GetMapping("/list/search/getLinkCost")
public List<CostDomain> getLinkCost() {
return costListSearchService.getLinkCost();
}
@ApiOperation("获取费用详情")
@PostMapping("/list/getCostDetail")
public CostResult<CostDto> getCostDetail(@RequestParam String costNo) {
......
......@@ -72,4 +72,6 @@ public class CostQueryPageReq extends BaseRequest {
private String typeName;
@ApiModelProperty("创建人id")
private Integer createUserid;
}
......@@ -295,7 +295,8 @@
<if test=" req.costForm!=null and req.costForm != ''">and t1.cost_form= #{req.costForm}</if>
<if test=" req.isLend!=null and req.isLend != ''">and t1.is_lend=#{req.isLend}</if>
<if test=" req.companyNo!=null and req.companyNo != ''">and t1.company_no=#{req.companyNo}</if>
<if test=" req.currentUserId!=null ">and (t1.create_userid=#{req.createUserid} or t.company_no is not null)</if>
<if test=" req.currentUserId!=null ">and (t1.create_userid=#{req.currentUserId} or t.company_no is not null)</if>
<if test=" req.createUserid!=null ">and t1.create_userid=#{req.createUserid}</if>
<if test=" req.costStatus!=null ">and find_in_set(t1.cost_status,#{req.costStatus})</if>
<if test=" req.lendStatus!=null ">and t1.lend_status=#{req.lendStatus}</if>
<if test=" req.isTax!=null ">and t1.is_tax=#{req.isTax}</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment