Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditPathsActsController.java

@@ -82,6 +82,8 @@ public class AuditPathsActsController extends BladeController {
 	}
 
 	@GetMapping("listLevelsByActId")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "feign接口专用,前端勿调", notes = "feign接口专用,前端勿调")
     public List<AuditPathsLevels> listLevelsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId, @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus)
 	{
 		AuditPathsActs pathsActs = auditPathsActsService.getOne(new LambdaQueryWrapper<AuditPathsActs>().eq(AuditPathsActs::getActId, actId).eq(AuditPathsActs::getFidStatus,fidStatus).eq(AuditPathsActs::getTenantId,AuthUtil.getTenantId()));
@@ -91,6 +93,8 @@ public class AuditPathsActsController extends BladeController {
 	}
 
 	@GetMapping("getActsByActId")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "feign接口专用,前端勿调", notes = "feign接口专用,前端勿调")
 	public AuditPathsActs getActsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId,@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus)
 	{
 		LambdaQueryWrapper<AuditPathsActs> auditPathsActsLambdaQueryWrapper=new LambdaQueryWrapper<>();

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -454,8 +454,28 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	public void passCancel(Long settlementId)
 	{
 		//todo 删除申请记录
+        LambdaQueryWrapper<Settlement> settlementLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		settlementLambdaQueryWrapper
+			.eq(Settlement::getId,settlementId)
+			.eq(Settlement::getTenantId,AuthUtil.getTenantId());
+		Settlement settlement = baseMapper.selectOne(settlementLambdaQueryWrapper);
+		if(settlement == null)
+		{
+			throw new SecurityException("审批取消失败");
+		}
 
-		//todo 修改原单据状态
+		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		itemsLambdaQueryWrapper.eq(Items::getPid,settlementId);
+		List<Items> itemsList = itemsMapper.selectList(itemsLambdaQueryWrapper);
+		//删除财务申请子表
+		if(CollectionUtils.isNotEmpty(itemsList))
+		{
+			itemsList.forEach(e->{
+				itemsMapper.deleteById(e.getId());
+			});
+		}
+		//删除财务申请主表
+		baseMapper.deleteById(settlementId);
 	}