提交代码

blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -124,5 +124,7 @@ public class AuditProecess implements Serializable {
 		@ApiModelProperty(value = "第几次提交审批")
 		private Integer times;
 
+		private Long srcBillId;
+
 
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java

@@ -102,5 +102,6 @@ public class Tenant extends BaseEntity {
 	@ApiModelProperty(value = "授权码")
 	private String licenseKey;
 
+	private Integer billType;
 
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/Settlement.java

@@ -223,5 +223,7 @@ public class Settlement  implements Serializable {
 	@ApiModelProperty(value = "财务D或者C")
 	private String dc;
 
+	private Long srcBillId;
+
 
 }

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

@@ -94,7 +94,7 @@ public class AuditPathsController extends BladeController {
 	 @PostMapping("/modify")
 	 @ApiOperationSupport(order = 3)
 	 @ApiOperation(value = "新增或编辑-审批流配置", notes = "传入auditPaths")
-		public R modify(@Valid @RequestBody AuditPaths auditPaths)
+		public R modify(@RequestBody AuditPaths auditPaths)
 	 {
 			return R.data(auditPathsService.modify(auditPaths));
 	 }

blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -135,5 +135,6 @@ public class AuditProecess implements Serializable {
 		@TableField(exist = false)
 	    private Integer operate;
 
+		private Long srcBillId;
 
 }

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditPathsServiceImpl.java

@@ -106,7 +106,7 @@ public class AuditPathsServiceImpl extends ServiceImpl<AuditPathsMapper, AuditPa
 			baseMapper.updateById(auditPaths);
 			auditPathsLevels.forEach(lt->{
                 //新增
-				if(lt.getId()!=null)
+				if(lt.getId()==null)
 				{
 					lt.setPathId(auditPaths.getId());
 					lt.setTenantId(AuthUtil.getTenantId());

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -70,6 +70,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			auditProecess.setBillId(auditProecessDTO.getBillId());
 			//绑定业务主办编号
 			auditProecess.setBillNo(auditProecessDTO.getBillNo());
+			auditProecess.setSrcBillId(auditProecessDTO.getSrcBillId());
 			auditProecess.setPathId(e.getPathId());
 			auditProecess.setLevelId(e.getLevelId());
 			auditProecess.setSendUserId(auditProecessDTO.getSendUserId());
@@ -125,6 +126,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			//通过
             if(operate==1)
             {
+				auditProecess.setAuditStatus("A");
                 //查询下一级,开启待审
 				LambdaQueryWrapper<AuditProecess> auditProecessLambdaQueryWrapper=new LambdaQueryWrapper<>();
 				auditProecessLambdaQueryWrapper
@@ -144,8 +146,9 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
             //不通过
 			else if(operate==2)
 			{
+				auditProecess.setAuditStatus("B");
               //todo 调用feign取消
-				financeClient.passCancel(auditProecess.getBillId());
+				financeClient.passCancel(auditProecess.getSrcBillId());
 			}
 
 		}
@@ -156,13 +159,15 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			if(operate==1)
 			{
 				//todo 调用feign直接通过
-				financeClient.passCheck(auditProecess.getBillId());
+				auditProecess.setAuditStatus("A");
+				financeClient.passCheck(auditProecess.getSrcBillId());
 			}
 			//不通过
 			else if(operate==2)
 			{
 				//todo 调用feign取消
-				financeClient.passCancel(auditProecess.getBillId());
+				auditProecess.setAuditStatus("B");
+				financeClient.passCancel(auditProecess.getSrcBillId());
 			}
 		}
 		else

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

@@ -24,6 +24,7 @@ import org.springblade.check.dto.AuditProecessDTO;
 import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.check.feign.ICheckClient;
+import org.springblade.core.tool.api.R;
 import org.springblade.finance.dto.SettlementDTO;
 import org.springblade.finance.entity.Acc;
 import org.springblade.finance.entity.Files;
@@ -335,6 +336,11 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		   settlement.setTenantId(AuthUtil.getTenantId());
 		   settlement.setCreateUser(AuthUtil.getUserId());
 		   settlement.setStatus(0);
+		   if(itemsList.get(0).getSrcParentId()==null)
+		   {
+		   	 throw new SecurityException("业务未绑定成功");
+		   }
+		   settlement.setSrcBillId(itemsList.get(0).getSrcParentId());
 		   settlement.setCheckStatus("未请核");
 		   baseMapper.insert(settlement);
 
@@ -384,29 +390,37 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@Transactional
 	public void check(Settlement settlement)
 	{
-          //判断是否有审批流,如果审批流已开启就进入审批流,否则直接走申请通过
+		Settlement selectOne = baseMapper.selectById(settlement.getId());
+		//判断是否有审批流,如果审批流已开启就进入审批流,否则直接走申请通过
 		  AuditPathsActs pathsActs = iCheckClient.getActsByActId(1, "check_status");
 		  //没开启审批流直接走 通过流程
           if(pathsActs==null || pathsActs.getIsEnable()==2)
           {
-             this.passCheck(settlement.getId());
+             this.passCheck(selectOne.getId());
 		  }
           //如果开启审批流了, 就直接创建审批业务
           else
 		  {
+			  selectOne.setCheckStatus("审核中");
+			  baseMapper.updateById(selectOne);
 		  	  //获取审批级次
 			  List<AuditPathsLevels> auditPathsLevels = iCheckClient.listLevelsByActId(1, "check_status");
 
 			  AuditProecessDTO auditProecessDTO=new AuditProecessDTO();
 			  auditProecessDTO.setPathsLevelsList(auditPathsLevels);
 			  auditProecessDTO.setActId(1);
-			  auditProecessDTO.setBillId(settlement.getId());
-			  auditProecessDTO.setBillNo(settlement.getSrcOrderno());
+			  auditProecessDTO.setSrcBillId(selectOne.getId());
+			  auditProecessDTO.setBillId(selectOne.getSrcBillId());
+			  auditProecessDTO.setBillNo(selectOne.getSrcOrderno());
 			  auditProecessDTO.setSendUserId(AuthUtil.getUserId());
 			  auditProecessDTO.setSendName(AuthUtil.getUserName());
 			  auditProecessDTO.setSendTime(new Date());
-			  auditProecessDTO.setSendMsg(settlement.getRemark());
-			  iCheckClient.createFinanceProcess(auditProecessDTO);
+			  auditProecessDTO.setSendMsg(selectOne.getRemark());
+			  R financeProcess = iCheckClient.createFinanceProcess(auditProecessDTO);
+			  if(!financeProcess.isSuccess())
+			  {
+			  	throw new SecurityException("操作失败,请联系管理员");
+			  }
 		  }
 	}