Commit 2e88e6d9 by liyanlin

fix

parent 93c4b655
...@@ -217,7 +217,7 @@ public class CostController { ...@@ -217,7 +217,7 @@ public class CostController {
return CostResult.success(page); return CostResult.success(page);
} }
@ApiOperation("审核费用单列表") @ApiOperation("待我审核列表")
@GetMapping("/checkCostCount") @GetMapping("/checkCostCount")
public CostResult<Long> checkCostCount(CheckCostListReq req) { public CostResult<Long> checkCostCount(CheckCostListReq req) {
costService = CostServiceFactory.getCostService(); costService = CostServiceFactory.getCostService();
......
...@@ -316,11 +316,13 @@ public abstract class AbstractCostService implements CostService { ...@@ -316,11 +316,13 @@ public abstract class AbstractCostService implements CostService {
@Override @Override
public IPage<CostDto> checkCostAllList(AllCheckCostListReq req){ public IPage<CostDto> checkCostAllList(AllCheckCostListReq req){
if(req.getCostForm().equals(3)){ if(req.getCostForm() != null) {
req.setIsLend(1); if (req.getCostForm().equals(3)) {
} req.setIsLend(1);
if(req.getCostForm().equals(4)){ }
req.setIsLend(2); if (req.getCostForm().equals(4)) {
req.setIsLend(2);
}
} }
if(req.getCostStatusList()!=null && !req.getCostStatusList().isEmpty()){ if(req.getCostStatusList()!=null && !req.getCostStatusList().isEmpty()){
req.setCostStatusStr(StringUtils.join(req.getCostStatusList(),',')); req.setCostStatusStr(StringUtils.join(req.getCostStatusList(),','));
......
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